From 8d0754aeb80f2b3e3e8a4fe477d02b4629661bc1 Mon Sep 17 00:00:00 2001 From: cagache Date: Thu, 1 Mar 2018 10:45:19 +0200 Subject: [PATCH 1/2] RM-5296 Warn When Declassification Date exceeds Time Frame --- .../src/main/java/org/alfresco/rest/core/v0/BaseAPI.java | 3 +++ .../main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java index 4feb2dac87..26a4793488 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java @@ -576,6 +576,9 @@ public abstract class BaseAPI SHELF, BOX, FILE, + ORIGINATOR, + ORIGINATING_ORGANIZATION, + PUBLICATION_DATE } public enum RETENTION_SCHEDULE diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java index d2f664e73c..d0580c90b3 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java @@ -345,6 +345,10 @@ public class RMRolesAndActionsAPI extends BaseAPI addPropertyToRequest(requestParams, "prop_cm_title", properties, RMProperty.TITLE); addPropertyToRequest(requestParams, "prop_cm_description", properties, RMProperty.DESCRIPTION); addPropertyToRequest(requestParams, "prop_cm_author", properties, RMProperty.AUTHOR); + addPropertyToRequest(requestParams, "prop_dod_originator", properties, RMProperty.ORIGINATOR); + addPropertyToRequest(requestParams, "prop_dod_originatingOrganization", properties, RMProperty + .ORIGINATING_ORGANIZATION); + addPropertyToRequest(requestParams, "prop_dod_publicationDate", properties, RMProperty.PUBLICATION_DATE); return doPostJsonRequest(username, password, SC_OK, requestParams, MessageFormat.format(UPDATE_METADATA_API, "{0}", itemNodeRef)); } From 296b3a6c4bff4140649607438dc097824782726e Mon Sep 17 00:00:00 2001 From: Tom Page Date: Fri, 2 Mar 2018 09:24:28 +0000 Subject: [PATCH 2/2] RM-6125 More useful builder for creating RM site. Add a private constructor so that Lombok will generate a builder including the site title and description (which come from a superclass). --- .../alfresco/rest/rm/community/model/site/RMSite.java | 10 +++++++++- .../alfresco/rest/rm/community/site/RMSiteTests.java | 4 +--- .../alfresco/rest/rm/community/utils/RMSiteUtil.java | 5 +---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java index 4d5f4de025..30246f6ebb 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java @@ -42,7 +42,6 @@ import lombok.NoArgsConstructor; * @author Rodica Sutu * @since 2.6 */ -@Builder @Data @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @@ -51,4 +50,13 @@ public class RMSite extends RestSiteModel { @JsonProperty (required = true) private RMSiteCompliance compliance; + + /** Private constructor allowing Lombok to include superclass fields in the builder. */ + @Builder + private RMSite(String title, String description, RMSiteCompliance compliance) + { + this.setTitle(title); + this.setDescription(description); + this.compliance = compliance; + } } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java index 3c3bac0f3e..dabffcc356 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java @@ -238,9 +238,7 @@ public class RMSiteTests extends BaseRMRestTest createRMSiteIfNotExists(); // Create RM site model - RMSite rmSiteToUpdate = RMSite.builder().build(); - rmSiteToUpdate.setTitle(NEW_TITLE); - rmSiteToUpdate.setDescription(NEW_DESCRIPTION); + RMSite rmSiteToUpdate = RMSite.builder().title(NEW_TITLE).description(NEW_DESCRIPTION).build(); // Create the RM site getRestAPIFactory().getRMSiteAPI(getDataUser().createRandomTestUser("testUser")).updateRMSite(rmSiteToUpdate); diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java index 9852b07a92..fa4b5f72c0 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java @@ -60,10 +60,7 @@ public class RMSiteUtil */ public static RMSite createRMSiteModel(RMSiteCompliance compliance, String title, String description) { - RMSite rmSiteModel = RMSite.builder().compliance(compliance).build(); - rmSiteModel.setTitle(title); - rmSiteModel.setDescription(description); - return rmSiteModel; + return RMSite.builder().compliance(compliance).title(title).description(description).build(); } /**