From 2faf6dbff66b3f64ba9332496e5c593b05c038d0 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Fri, 2 Mar 2018 09:24:28 +0000
Subject: [PATCH] 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();
     }
 
     /**