From 23c98eaa082f0507b6911bd05e697fe07404df7f Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 15 Nov 2018 14:39:49 +0000 Subject: [PATCH] RM-6141 Revert change of how a user is a member of the RM site. The user should be an RM User, not a site manager. Also revert a couple of changes that were done to make this work. Minor tweaks to use constants rather than member variables. (cherry picked from commit b284ba90388ef360f5321826e292ec43bf2e5197) --- .../java/org/alfresco/rest/rm/community/model/site/RMSite.java | 3 +-- .../java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java | 2 +- 2 files changed, 2 insertions(+), 3 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 3fa3518be0..7abae8755d 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 @@ -53,9 +53,8 @@ public class RMSite extends RestSiteModel /** Private constructor allowing Lombok to include superclass fields in the builder. */ @Builder - private RMSite(String id, String title, String description, RMSiteCompliance compliance) + private RMSite(String title, String description, RMSiteCompliance compliance) { - this.setId(id); 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/utils/RMSiteUtil.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java index bbea049fbb..b3574a0fcb 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,7 +60,7 @@ public class RMSiteUtil */ public static RMSite createRMSiteModel(RMSiteCompliance compliance, String title, String description) { - return RMSite.builder().id(RM_ID).compliance(compliance).title(title).description(description).build(); + return RMSite.builder().compliance(compliance).title(title).description(description).build(); } /**