Merge remote-tracking branch 'origin/feature/RM-4396_UseModelInsteadJsonObject' into feature/RM-4396_Lombok_UseModelInsteadJsonObject

Conflicts:
	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponent.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/FilePlanTests.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordCategoryTest.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/UnfiledRecordsFolderTests.java

rm-automation/rm-automation-community-rest-api/pom.xml

@@ -14,6 +14,8 @@
    <properties>
       <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
       <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
+      <tas.restapi.version>5.2.0-0</tas.restapi.version>
+      <fluent.json.version>2.0.0</fluent.json.version>
    </properties>
 
    <build>
@@ -34,18 +36,18 @@
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
-         <version>2.0.0</version>
+         <version>${tas.restapi.version}</version>
       </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
-         <version>2.0.0</version>
+         <version>${tas.restapi.version}</version>
          <type>test-jar</type>
       </dependency>
       <dependency>
          <groupId>org.jglue.fluent-json</groupId>
          <artifactId>fluent-json</artifactId>
-         <version>2.0.0</version>
+         <version>${fluent.json.version}</version>
       </dependency>
       <dependency>
         <groupId>org.projectlombok</groupId>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponent.java

@@ -93,6 +93,7 @@ public class FilePlanComponent
 
     @JsonProperty (value = ALLOWABLE_OPERATIONS)
     private List<String> allowableOperations;
+
     private FilePlanComponentPath path;
 
     @JsonProperty (required = true)

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java

@@ -58,13 +58,16 @@ public class PojoUtility
             //return the json object
             return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(model);
 
-        } catch (JsonGenerationException e)
+        }
+        catch (JsonGenerationException e)
         {
             return e.toString();
-        } catch (JsonMappingException e)
+        }
+        catch (JsonMappingException e)
         {
             return e.toString();
-        } catch (IOException e)
+        }
+        catch (IOException e)
         {
             return e.toString();
         }

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java

@@ -61,7 +61,8 @@ import org.testng.annotations.BeforeClass;
  * @since 2.6
  */
 @Configuration
-@PropertySource("classpath:default.properties")
+@PropertySource(value = {"classpath:default.properties", "classpath:config.properties"})
+@PropertySource(value = "classpath:module.properties", ignoreResourceNotFound = true)
 @PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true)
 public class BaseRestTest extends RestTest
 {

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java

@@ -104,7 +104,7 @@ public class RecordFolderTests extends BaseRestTest
         // Create the record folder
         FilePlanComponent folder = filePlanComponentAPI.createFilePlanComponent(recordFolder, filePlanComponent.getId());
 
-        //filePlanComponentAPI.createFilePlanComponent(recordFolderProperties, filePlanComponent.getId());
+
         filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(CREATED);
 
         // Check folder has been created  within the category created
@@ -247,7 +247,6 @@ public class RecordFolderTests extends BaseRestTest
         assertNotNull(folderUpdated.getProperties().getReviewPeriod().getPeriodType());
         assertNotNull(folderUpdated.getProperties().getReviewPeriod().getExpression());
 
-
     }
 
     /**

rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties

@@ -0,0 +1,2 @@
+alfresco.server=localhost
+rest.rmPath=alfresco/api/-default-/public/ig/versions/1

rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties

@@ -1,25 +0,0 @@
-#########################################################################
-#           Original property values from default.properties            #
-#########################################################################
-
-# Dataprep related
-alfresco.scheme=http
-alfresco.server=localhost
-alfresco.port=8080
-
-# Credentials
-admin.user=admin
-admin.password=admin
-
-# Rest related
-rest.basePath=alfresco/api/-default-/public/alfresco/versions/1
-rest.workflowPath=alfresco/api/-default-/public/workflow/versions/1
-
-# Database Section
-db.url = jdbc:mysql://${alfresco.server}:3306/alfresco
-db.username = alfresco
-db.password = alfresco
-
-#########################################################################
-
-rest.rmPath=alfresco/api/-default-/public/ig/versions/1