inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/RM-6106_ViewAddExemptions_Automate_AC' of git.alfresco.com:records-management/records-management into feature/RM-6106_ViewAddExemptions_Automate_AC

Browse Source 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
This commit is contained in:
Rodica Sutu
2018-03-05 15:37:40 +02:00
parent 04af88ee51 492822e64d
commit 40042b0cf5
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
View File

@@ -576,6 +576,9 @@ public abstract class BaseAPI
SHELF, SHELF,
BOX, BOX,
FILE, FILE,
ORIGINATOR,
ORIGINATING_ORGANIZATION,
PUBLICATION_DATE
} }
public enum RETENTION_SCHEDULE public enum RETENTION_SCHEDULE

10
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java
View File

@@ -42,7 +42,6 @@ import lombok.NoArgsConstructor;
* @author Rodica Sutu * @author Rodica Sutu
* @since 2.6 * @since 2.6
*/ */
@Builder
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@@ -51,4 +50,13 @@ public class RMSite extends RestSiteModel
{ {
@JsonProperty (required = true) @JsonProperty (required = true)
private RMSiteCompliance compliance; 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;
}
} }

4
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
View File

@@ -345,6 +345,10 @@ public class RMRolesAndActionsAPI extends BaseAPI
addPropertyToRequest(requestParams, "prop_cm_title", properties, RMProperty.TITLE); addPropertyToRequest(requestParams, "prop_cm_title", properties, RMProperty.TITLE);
addPropertyToRequest(requestParams, "prop_cm_description", properties, RMProperty.DESCRIPTION); addPropertyToRequest(requestParams, "prop_cm_description", properties, RMProperty.DESCRIPTION);
addPropertyToRequest(requestParams, "prop_cm_author", properties, RMProperty.AUTHOR); 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)); return doPostJsonRequest(username, password, SC_OK, requestParams, MessageFormat.format(UPDATE_METADATA_API, "{0}", itemNodeRef));
} }

4
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java
View File

@@ -238,9 +238,7 @@ public class RMSiteTests extends BaseRMRestTest
createRMSiteIfNotExists(); createRMSiteIfNotExists();
// Create RM site model // Create RM site model
RMSite rmSiteToUpdate = RMSite.builder().build(); RMSite rmSiteToUpdate = RMSite.builder().title(NEW_TITLE).description(NEW_DESCRIPTION).build();
rmSiteToUpdate.setTitle(NEW_TITLE);
rmSiteToUpdate.setDescription(NEW_DESCRIPTION);
// Create the RM site // Create the RM site
getRestAPIFactory().getRMSiteAPI(getDataUser().createRandomTestUser("testUser")).updateRMSite(rmSiteToUpdate); getRestAPIFactory().getRMSiteAPI(getDataUser().createRandomTestUser("testUser")).updateRMSite(rmSiteToUpdate);

5
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java
View File

@@ -60,10 +60,7 @@ public class RMSiteUtil
*/ */
public static RMSite createRMSiteModel(RMSiteCompliance compliance, String title, String description) public static RMSite createRMSiteModel(RMSiteCompliance compliance, String title, String description)
{ {
RMSite rmSiteModel = RMSite.builder().compliance(compliance).build(); return RMSite.builder().compliance(compliance).title(title).description(description).build();
rmSiteModel.setTitle(title);
rmSiteModel.setDescription(description);
return rmSiteModel;
} }
/** /**