[maven-release-plugin][skip ci] prepare release v1.113

* ACS-3280 Move assertThat() and and() to defaults in interface.

Update ftl so that any future generated models will use the defaults too.

* ACS-3280 Revert changes to collections.

They have a different hierarchy and so need a different refactor.

* ACS-3280 Make RestCompanyModel work the same as all the other models.

packaging/tests/tas-restapi/pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>restapi</artifactId>
     <name>alfresco-tas-restapi</name>
-    <version>1.111</version>
+    <version>1.113</version>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
@@ -67,7 +67,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-tas-restapi.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-tas-restapi.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-tas-restapi</url>
-        <tag>v1.111</tag>
+        <tag>v1.113</tag>
     </scm>
 
     <issueManagement>

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/IRestModel.java

@@ -28,7 +28,5 @@ package org.alfresco.rest.core;
 import org.alfresco.rest.core.assertion.IModelAssertion;
 
 public interface IRestModel<Model> extends IModelAssertion<Model> {
-
-  public Model onModel();
- 
+    Model onModel();
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestModels.java

@@ -30,14 +30,14 @@ import static org.alfresco.utility.report.log.Step.STEP;
 import java.util.List;
 import java.util.Random;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.assertion.IModelsCollectionAssertion;
 import org.alfresco.rest.core.assertion.ModelsCollectionAssertion;
 import org.alfresco.rest.exception.EmptyRestModelCollectionException;
 import org.alfresco.rest.model.RestPaginationModel;
 import org.alfresco.rest.model.RestSiteModelsCollection;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Map multiple entries of JSON response to a class <T>
  * 
@@ -119,7 +119,7 @@ public abstract class RestModels<Model, ModelCollection> implements IRestModelsC
     @Override    
     public ModelsCollectionAssertion<RestModels<Model, ModelCollection>> assertThat()
     {      
-        return new ModelsCollectionAssertion<RestModels<Model, ModelCollection>>(this);
+        return new ModelsCollectionAssertion<>(this);
     }
     
     @Override    

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/assertion/IModelAssertion.java

@@ -4,30 +4,36 @@
  * %%
  * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
  * provided under the following open source license terms:
- * 
+ *
  * Alfresco is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Alfresco is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
 package org.alfresco.rest.core.assertion;
 
-public interface IModelAssertion<Model> 
+public interface IModelAssertion<Model>
 {
-  public ModelAssertion<Model> and();
-  
-  public ModelAssertion<Model> assertThat();
+    default ModelAssertion<Model> assertThat()
+    {
+        return new ModelAssertion<>(this);
+    }
+
+    default ModelAssertion<Model> and()
+    {
+        return assertThat();
+    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/assertion/IModelsCollectionAssertion.java

@@ -31,5 +31,9 @@ public interface IModelsCollectionAssertion<ModelCollection> {
 
   public ModelsCollectionAssertion assertThat();
 
-  public ModelCollection when();
+  @SuppressWarnings("unchecked")
+  default ModelCollection when()
+  {
+    return (ModelCollection) this;
+  }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestAbstractClassModel.java

@@ -25,13 +25,13 @@
  */
 package org.alfresco.rest.model;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestAbstractClassModel extends TestModel implements IRestModel<RestAbstractClassModel>
 {
     @JsonProperty(value = "entry")
@@ -164,20 +164,4 @@ public class RestAbstractClassModel extends TestModel implements IRestModel<Rest
     {
         this.modelInfo = modelInfo;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestAbstractClassModel> assertThat()
-    {
-      return new ModelAssertion<RestAbstractClassModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestAbstractClassModel> and()
-    {
-      return assertThat();
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestActionBodyExecTemplateModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.Objects;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-14 13:22' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestActionBodyExecTemplateModel extends TestModel implements IRestModel<RestActionBodyExecTemplateModel>
 {
-    @Override
-    public ModelAssertion<RestActionBodyExecTemplateModel> assertThat()
-    {
-        return new ModelAssertion<RestActionBodyExecTemplateModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestActionBodyExecTemplateModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestActionBodyExecTemplateModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestActionDefinitionModel.java

@@ -26,11 +26,12 @@
 package org.alfresco.rest.model;
 
 import java.util.List;
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestActionDefinitionModel extends TestModel implements IRestModel<RestActionDefinitionModel>
 {
     
@@ -125,18 +126,6 @@ public class RestActionDefinitionModel extends TestModel implements IRestModel<R
         this.parameterDefinitions = parameterDefinitions;
     }
 
-    @Override
-    public ModelAssertion<RestActionDefinitionModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestActionDefinitionModel> assertThat()
-    {
-        return new ModelAssertion<RestActionDefinitionModel>(this);
-    }
-
     @Override
     public RestActionDefinitionModel onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestActivityModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * 
  * @author Cristina Axinte
@@ -159,17 +158,4 @@ public class RestActivityModel extends TestModel implements IRestModel<RestActiv
     {
         this.activitySummary = activitySummary;
     }
-
-    @Override
-    public ModelAssertion<RestActivityModel> and() 
-    {     
-      return assertThat();
-    }    
-    
-    @Override
-    public ModelAssertion<RestActivityModel> assertThat() 
-    {     
-      return new ModelAssertion<RestActivityModel>(this);
-    }    
-     
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestActivitySummaryModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.model.TestModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * 
  * "activitySummary": {
@@ -142,14 +141,4 @@ public class RestActivitySummaryModel extends TestModel implements IRestModel<Re
     {
         this.objectId = objectId;
     }
-    
-    @Override
-    public ModelAssertion<RestActivitySummaryModel> and() {
-        return assertThat();
-    }   
-    
-    @Override
-    public ModelAssertion<RestActivitySummaryModel> assertThat() {
-        return new ModelAssertion<RestActivitySummaryModel>(this);
-    }   
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestAggregateModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestAggregateModel extends TestModel implements IRestModel<RestAggregateModel>
 {
     @JsonProperty(value = "aggregate")
@@ -65,16 +64,4 @@ public class RestAggregateModel extends TestModel implements IRestModel<RestAggr
     {
         this.average = average;
     }
-    
-    @Override
-    public ModelAssertion<RestAggregateModel> and() 
-    {      
-      return assertThat();
-    }   
-    
-    @Override
-    public ModelAssertion<RestAggregateModel> assertThat() 
-    {      
-      return new ModelAssertion<RestAggregateModel>(this);
-    }   
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestArchiveContentRequestModel.java

@@ -31,12 +31,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'dedwards' on '2021-12-16 08:32' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -44,18 +43,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestArchiveContentRequestModel extends TestModel implements IRestModel<RestArchiveContentRequestModel>
 {
-    @Override
-    public ModelAssertion<RestArchiveContentRequestModel> assertThat()
-    {
-        return new ModelAssertion<RestArchiveContentRequestModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestArchiveContentRequestModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestArchiveContentRequestModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestAuditAppModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'aepure' on '2017-06-29 15:31' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestAuditAppModel extends TestModel implements IRestModel<RestAuditAppModel>
 {
-    @Override
-    public ModelAssertion<RestAuditAppModel> assertThat()
-    {
-        return new ModelAssertion<RestAuditAppModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestAuditAppModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestAuditAppModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestAuditEntryModel.java

@@ -27,26 +27,13 @@ package org.alfresco.rest.model;
 
 import java.util.Map;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestAuditEntryModel extends TestModel implements IRestModel<RestAuditEntryModel>
 {
-    @Override
-    public ModelAssertion<RestAuditEntryModel> assertThat()
-    {
-        return new ModelAssertion<RestAuditEntryModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestAuditEntryModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestAuditEntryModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCandidateModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestCandidateModel extends TestModel implements IRestModel<RestCandidateModel>
 {
     @JsonProperty(value = "entry")
@@ -69,16 +68,4 @@ public class RestCandidateModel extends TestModel implements IRestModel<RestCand
     {
         this.candidateId = candidateId;
     }
-
-    @Override
-    public ModelAssertion<RestCandidateModel> and() 
-    {      
-        return assertThat();
-    }   
-    
-    @Override
-    public ModelAssertion<RestCandidateModel> assertThat() 
-    {      
-      return new ModelAssertion<RestCandidateModel>(this);
-    } 
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCommentModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestCommentModel extends TestModel implements IRestModel<RestCommentModel>
 {
     @JsonProperty(value = "entry")
@@ -141,17 +140,4 @@ public class RestCommentModel extends TestModel implements IRestModel<RestCommen
     {
         this.id = id;
     }
-    
-    @Override
-    public ModelAssertion<RestCommentModel> and() 
-    {      
-        return assertThat();
-    }   
-    
-    @Override
-    public ModelAssertion<RestCommentModel> assertThat() 
-    {      
-      return new ModelAssertion<RestCommentModel>(this);
-    }   
-    
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCompanyModel.java

@@ -25,7 +25,9 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.assertion.ModelAssertion;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.core.IRestModel;
 import org.alfresco.utility.model.TestModel;
 
 /**
@@ -40,8 +42,10 @@ import org.alfresco.utility.model.TestModel;
       "email": "qLZ41D2QnXQcqySNK09J@yahoo.com"
     }
  */
-public class RestCompanyModel extends TestModel
+public class RestCompanyModel extends TestModel implements IRestModel<RestCompanyModel>
 {
+    @JsonProperty (value = "entry")
+    RestCompanyModel model;
     private String organization;
     private String address1;
     private String address2;
@@ -51,16 +55,12 @@ public class RestCompanyModel extends TestModel
     private String fax;
     private String email;
 
-    public ModelAssertion<RestCompanyModel> assertThat()
+    @Override
+    public RestCompanyModel onModel()
     {
-        return new ModelAssertion<RestCompanyModel>(this);
+        return model;
     }
 
-    public ModelAssertion<RestCompanyModel> and()
-    {
-        return assertThat();
-    }
-    
     public String getOrganization()
     {
         return organization;
@@ -140,5 +140,4 @@ public class RestCompanyModel extends TestModel
     {
         this.email = email;
     }
-
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCompositeConditionDefinitionModel.java

@@ -28,12 +28,11 @@ package org.alfresco.rest.model;
 import java.util.List;
 import java.util.Objects;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -41,18 +40,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestCompositeConditionDefinitionModel extends TestModel implements IRestModel<RestCompositeConditionDefinitionModel>
 {
-    @Override
-    public ModelAssertion<RestCompositeConditionDefinitionModel> assertThat()
-    {
-        return new ModelAssertion<RestCompositeConditionDefinitionModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestCompositeConditionDefinitionModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestCompositeConditionDefinitionModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestContentStorageInfoModel.java

@@ -33,12 +33,11 @@ package org.alfresco.rest.model;
 
 import java.util.Map;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'dedwards' on '2021-12-16 08:32' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -46,18 +45,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestContentStorageInfoModel extends TestModel implements IRestModel<RestContentStorageInfoModel>
 {
-    @Override
-    public ModelAssertion<RestContentStorageInfoModel> assertThat()
-    {
-        return new ModelAssertion<RestContentStorageInfoModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestContentStorageInfoModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestContentStorageInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCustomAspectModel.java

@@ -28,31 +28,18 @@ package org.alfresco.rest.model;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.CustomAspectModel;
 import org.alfresco.utility.model.CustomAspectPropertiesModel;
 import org.testng.Assert;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * @author Bogdan Bocancea
  */
 public class RestCustomAspectModel extends CustomAspectModel implements IRestModel<RestCustomAspectModel>
 {
-    @Override
-    public ModelAssertion<RestCustomAspectModel> assertThat()
-    {
-        return new ModelAssertion<RestCustomAspectModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestCustomAspectModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestCustomAspectModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCustomModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.CustomContentModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.CustomContentModel;
+
 /**
  * @author Bogdan Bocancea
  */
@@ -39,18 +38,6 @@ public class RestCustomModel extends CustomContentModel implements IRestModel<Re
     @JsonProperty(value = "entry")
     RestCustomModel model;
     
-    @Override
-    public ModelAssertion<RestCustomModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestCustomModel> assertThat()
-    {
-        return new ModelAssertion<>(this);
-    }
-
     @Override
     public RestCustomModel onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCustomTypeModel.java

@@ -25,14 +25,14 @@
  */
 package org.alfresco.rest.model;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.CustomAspectPropertiesModel;
 import org.alfresco.utility.model.TestModel;
 
-import java.util.List;
-
 /**
  * @author Bogdan Bocancea
  */
@@ -80,18 +80,6 @@ public class RestCustomTypeModel extends TestModel implements IRestModel<RestCus
         return model;
     }
 
-    @Override
-    public ModelAssertion<RestCustomTypeModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestCustomTypeModel> assertThat()
-    {
-        return new ModelAssertion<RestCustomTypeModel>(this);
-    }
-
     public String getName()
     {
         return name;

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestDeploymentModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Handles single Deployment Entry JSON response
  *  "entry": {
@@ -108,16 +107,4 @@ public class RestDeploymentModel extends TestModel implements IRestModel<RestDep
     {
         this.deployedAt = deployedAt;
     }
-
-    @Override
-    public ModelAssertion<RestDeploymentModel> and() 
-    {      
-        return assertThat();
-    }  
-    
-    @Override
-    public ModelAssertion<RestDeploymentModel> assertThat() 
-    {      
-      return new ModelAssertion<>(this);
-    }   
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestDiscoveryModel.java

@@ -25,26 +25,13 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestDiscoveryModel extends TestModel implements IRestModel<RestDiscoveryModel>
 {
-    @Override
-    public ModelAssertion<RestDiscoveryModel> assertThat()
-    {
-        return new ModelAssertion<RestDiscoveryModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestDiscoveryModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestDiscoveryModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestDownloadsModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /*
  * Handles responses for GET /downloads/{downloadId} and POST /downloads rest calls
  * E.g
@@ -48,18 +47,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class RestDownloadsModel extends TestModel implements IRestModel<RestDownloadsModel>
 {
-    @Override
-    public ModelAssertion<RestDownloadsModel> assertThat()
-    {
-        return new ModelAssertion<RestDownloadsModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestDownloadsModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestDownloadsModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestEntitlementsInfoModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'aforascu' on '2018-01-10 16:02' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestEntitlementsInfoModel extends TestModel implements IRestModel<RestEntitlementsInfoModel>
 {
-    @Override
-    public ModelAssertion<RestEntitlementsInfoModel> assertThat()
-    {
-        return new ModelAssertion<RestEntitlementsInfoModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestEntitlementsInfoModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestEntitlementsInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestFavoriteSiteModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestFavoriteSiteModel extends TestModel implements IRestModel<RestFavoriteSiteModel>
 {
     @JsonProperty(value = "entry")
@@ -52,16 +51,4 @@ public class RestFavoriteSiteModel extends TestModel implements IRestModel<RestF
     {
         this.id = id;
     }
-    
-    @Override
-    public ModelAssertion<RestFavoriteSiteModel> and() 
-    {     
-        return assertThat();
-    }    
-    
-    @Override
-    public ModelAssertion<RestFavoriteSiteModel> assertThat() 
-    {     
-      return new ModelAssertion<RestFavoriteSiteModel>(this);
-    }    
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestFileModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Handles single Folder JSON responses
  * Example:
@@ -270,16 +269,4 @@ public class RestFileModel extends TestModel implements IRestModel<RestFileModel
     {
         this.path = path;
     }
-
-    @Override
-    public ModelAssertion<RestFileModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestFileModel> assertThat()
-    {
-        return new ModelAssertion<RestFileModel>(this);
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestFolderModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Handles single Folder JSON responses
  * Example:
@@ -217,16 +216,4 @@ public class RestFolderModel extends TestModel implements IRestModel<RestFolderM
     {
         this.path = path;
     }
-
-    @Override
-    public ModelAssertion<RestFolderModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestFolderModel> assertThat()
-    {
-        return new ModelAssertion<RestFolderModel>(this);
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestFormModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Handles single representation of a Start Form Model
  * * "entry": {
@@ -133,20 +132,4 @@ public class RestFormModel extends TestModel implements IRestModel<RestFormModel
     {
         this.required = required;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestFormModel> and()
-    {
-        return assertThat();
-    }
-    
-    @Override
-    public ModelAssertion<RestFormModel> assertThat()
-    {
-      return new ModelAssertion<RestFormModel>(this);
-    }
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGenericBucketModel.java

@@ -27,13 +27,12 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.rest.search.RestGenericMetricModel;
 import org.alfresco.utility.model.TestModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Generated by 'msuzuki' on '2017-05-15 13:08' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -41,18 +40,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestGenericBucketModel extends TestModel implements IRestModel<RestGenericBucketModel>
 {
-    @Override
-    public ModelAssertion<RestGenericBucketModel> assertThat()
-    {
-        return new ModelAssertion<RestGenericBucketModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestGenericBucketModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestGenericBucketModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupMember.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestGroupMember extends TestModel implements IRestModel<RestGroupMember>
 {
     @JsonProperty(required = true)
@@ -43,19 +42,6 @@ public class RestGroupMember extends TestModel implements IRestModel<RestGroupMe
     @JsonProperty(value = "entry")
     RestGroupMember model;
 
-
-    @Override
-    public ModelAssertion<RestGroupMember> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestGroupMember> assertThat()
-    {
-        return new ModelAssertion<RestGroupMember>(this);
-    }
-
     @Override
     public RestGroupMember onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.ArrayList;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestGroupsModel extends TestModel implements IRestModel<RestGroupsModel>
 {
     @JsonProperty(required = true)
@@ -50,19 +49,6 @@ public class RestGroupsModel extends TestModel implements IRestModel<RestGroupsM
     @JsonProperty(value = "entry")
     RestGroupsModel model;
 
-
-    @Override
-    public ModelAssertion<RestGroupsModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestGroupsModel> assertThat()
-    {
-        return new ModelAssertion<RestGroupsModel>(this);
-    }
-
     @Override
     public RestGroupsModel onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestHtmlResponse.java

@@ -27,12 +27,10 @@ package org.alfresco.rest.model;
 
 import static org.alfresco.utility.report.log.Step.STEP;
 
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.Utility;
-import org.testng.Assert;
-
 import io.restassured.http.Headers;
 import io.restassured.response.ResponseBody;
+import org.alfresco.utility.Utility;
+import org.testng.Assert;
 
 /**
  * Created by Claudia Agache on 10/13/2016.
@@ -68,21 +66,6 @@ public class RestHtmlResponse
         Assert.assertFalse(body.toString().isEmpty(), "Body should not be empty.");
     }
 
-    /**
-     * DSL for assertion on this rest model
-     * 
-     * @return
-     */
-    public ModelAssertion<RestHtmlResponse> assertThat()
-    {
-        return new ModelAssertion<RestHtmlResponse>(this);
-    }
-
-    public ModelAssertion<RestHtmlResponse> and()
-    {
-        return assertThat();
-    }
-    
     /**
      * Assetion that a html element with specific html path has the specified value
      * 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestItemModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * 
  "entry": {
@@ -130,16 +129,4 @@ public class RestItemModel extends TestModel implements IRestModel<RestItemModel
     {
         this.modifiedAt = modifiedAt;
     }
-    
-    @Override
-    public ModelAssertion<RestItemModel> and() 
-    {      
-      return assertThat();
-    }
-    
-    @Override
-    public ModelAssertion<RestItemModel> assertThat() 
-    {      
-      return new ModelAssertion<RestItemModel>(this);
-    }
 }    

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestLicenseInfoModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'aforascu' on '2018-01-10 16:02' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestLicenseInfoModel extends TestModel implements IRestModel<RestLicenseInfoModel>
 {
-    @Override
-    public ModelAssertion<RestLicenseInfoModel> assertThat()
-    {
-        return new ModelAssertion<RestLicenseInfoModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestLicenseInfoModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestLicenseInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestLinkedRuleSetBodyCreateModel.java

@@ -25,14 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -40,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestLinkedRuleSetBodyCreateModel extends TestModel implements IRestModel<RestLinkedRuleSetBodyCreateModel>
 {
-    @Override
-    public ModelAssertion<RestLinkedRuleSetBodyCreateModel> assertThat()
-    {
-        return new ModelAssertion<RestLinkedRuleSetBodyCreateModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestLinkedRuleSetBodyCreateModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestLinkedRuleSetBodyCreateModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestModuleInfoModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'aforascu' on '2018-01-10 16:02' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestModuleInfoModel extends TestModel implements IRestModel<RestModuleInfoModel>
 {
-    @Override
-    public ModelAssertion<RestModuleInfoModel> assertThat()
-    {
-        return new ModelAssertion<RestModuleInfoModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestModuleInfoModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestModuleInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNetworkModel.java

@@ -27,13 +27,12 @@ package org.alfresco.rest.model;
 
 import static org.alfresco.utility.report.log.Step.STEP;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.UserModel;
 import org.testng.Assert;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Created by Cristina Axinte on 9/26/2016.
  * 
@@ -89,20 +88,4 @@ public class RestNetworkModel extends RestPersonNetworkModel implements IRestMod
 
         return this;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestNetworkModel> and() 
-    {
-      return assertThat();
-    }
-   
-    @Override
-    public ModelAssertion<RestNetworkModel> assertThat() 
-    {
-      return new ModelAssertion<RestNetworkModel>(this);
-    }
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNetworkQuotaModel.java

@@ -25,30 +25,17 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'pbrodner' on '2016-12-19 14:12' from 'Alfresco Core REST API' swagger file
  * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
  */
 public class RestNetworkQuotaModel extends TestModel implements IRestModel<RestNetworkQuotaModel>
 {
-    @Override
-    public ModelAssertion<RestNetworkQuotaModel> assertThat()
-    {
-        return new ModelAssertion<RestNetworkQuotaModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestNetworkQuotaModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestNetworkQuotaModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNodeAssocTargetModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestNodeAssocTargetModel extends TestModel implements IRestModel<RestNodeAssocTargetModel>
 {
     @JsonProperty(value = "aggregate")
@@ -77,17 +76,4 @@ public class RestNodeAssocTargetModel extends TestModel implements IRestModel<Re
     {
         this.assocType = assocType;
     }
-
-    @Override
-    public ModelAssertion<RestNodeAssocTargetModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestNodeAssocTargetModel> assertThat()
-    {
-        return new ModelAssertion<RestNodeAssocTargetModel>(this);
-    }
-
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNodeAssociationModel.java

@@ -27,29 +27,16 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Created by Andrei Forascu on 30/08/2017.
  */
 public class RestNodeAssociationModel extends TestModel implements IRestModel<RestNodeAssociationModel>
 {
-    @Override
-    public ModelAssertion<RestNodeAssociationModel> assertThat()
-    {
-        return new ModelAssertion<RestNodeAssociationModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestNodeAssociationModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestNodeAssociationModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNodeAssociationTypeModel.java

@@ -25,29 +25,16 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Represents an association between two nodes
  */
 public class RestNodeAssociationTypeModel extends TestModel implements IRestModel<RestNodeAssociationTypeModel>
 {
-    @Override
-    public ModelAssertion<RestNodeAssociationTypeModel> assertThat()
-    {
-        return new ModelAssertion<RestNodeAssociationTypeModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestNodeAssociationTypeModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestNodeAssociationTypeModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNodeBodyModel.java

@@ -27,30 +27,17 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated from 'Alfresco Core REST API' swagger file
  * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
  */
 public class RestNodeBodyModel extends TestModel implements IRestModel<RestNodeBodyModel>
 {
-    @Override
-    public ModelAssertion<RestNodeBodyModel> assertThat()
-    {
-        return new ModelAssertion<RestNodeBodyModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestNodeBodyModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestNodeBodyModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNodeChildAssociationModel.java

@@ -25,26 +25,13 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestNodeChildAssociationModel extends TestModel implements IRestModel<RestNodeChildAssociationModel>
 {
-    @Override
-    public ModelAssertion<RestNodeChildAssociationModel> assertThat()
-    {
-        return new ModelAssertion<RestNodeChildAssociationModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestNodeChildAssociationModel> and()
-    {
-        return assertThat();
-    }
-
     @Override
     public RestNodeChildAssociationModel onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestNodeModel.java

@@ -27,30 +27,17 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated from 'Alfresco Core REST API' swagger file
  * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
  */
 public class RestNodeModel extends TestModel implements IRestModel<RestNodeModel>
 {
-    @Override
-    public ModelAssertion<RestNodeModel> assertThat()
-    {
-        return new ModelAssertion<RestNodeModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestNodeModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestNodeModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPaginationModel.java

@@ -26,7 +26,6 @@
 package org.alfresco.rest.model;
 
 import org.alfresco.rest.core.assertion.IModelAssertion;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 
 /**
@@ -107,16 +106,4 @@ public class RestPaginationModel extends TestModel implements IModelAssertion<Re
     {
         this.maxItems = maxItems;
     }
-
-    @Override
-    public ModelAssertion<RestPaginationModel> assertThat()
-    {
-      return new ModelAssertion<>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestPaginationModel> and()
-    {
-      return assertThat();
-    }
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestParameterDefinitionModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestParameterDefinitionModel extends TestModel implements IRestModel<RestParameterDefinitionModel>
 {
     private String name;
@@ -113,18 +112,6 @@ public class RestParameterDefinitionModel extends TestModel implements IRestMode
     @JsonProperty(value = "entry")
     RestParameterDefinitionModel parameterDefinitionModel;
 
-    @Override
-    public ModelAssertion<RestParameterDefinitionModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestParameterDefinitionModel> assertThat()
-    {
-        return new ModelAssertion<RestParameterDefinitionModel>(this);
-    }
-
     @Override
     public RestParameterDefinitionModel onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonFavoritesModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestPersonFavoritesModel extends TestModel implements IRestModel<RestPersonFavoritesModel>
 {
     @JsonProperty(value = "entry")
@@ -87,17 +86,4 @@ public class RestPersonFavoritesModel extends TestModel implements IRestModel<Re
     {
         this.createdAt = createdAt;
     }
-
-    @Override
-    public ModelAssertion<RestPersonFavoritesModel> assertThat() 
-    {      
-      return new ModelAssertion<>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestPersonFavoritesModel> and() 
-    {      
-      return assertThat();
-    }
-
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonModel.java

@@ -28,36 +28,17 @@ package org.alfresco.rest.model;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
 import org.alfresco.rest.core.assertion.IModelAssertion;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Person Model implementation
  */
 public class RestPersonModel extends TestModel implements IModelAssertion<RestPersonModel>, IRestModel<RestPersonModel>
 {
-    /**
-     * DSL for assertion on this rest model
-     * 
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestPersonModel> assertThat()
-    {
-        return new ModelAssertion<RestPersonModel>(this);
-    }
-   
-
-    @Override
-    public ModelAssertion<RestPersonModel> and()
-    {
-        return assertThat();
-    }
-    
     @JsonProperty(value = "entry")
     RestPersonModel personModel;
     

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPreferenceModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Handles Pagination JSON
  *
@@ -74,16 +73,4 @@ public class RestPreferenceModel extends TestModel implements IRestModel<RestPre
     {
         this.id = id;
     }
-   
-    @Override
-    public ModelAssertion<RestPreferenceModel> assertThat() 
-    {      
-      return new ModelAssertion<RestPreferenceModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestPreferenceModel> and() 
-    {      
-      return assertThat();
-    }
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestProcessDefinitionModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Handles single Process Definition Entry JSON response
  * "entry": {
@@ -169,18 +168,5 @@ public class RestProcessDefinitionModel extends TestModel implements IRestModel<
     {
         this.version = version;
     }
- 
-    
-    @Override
-    public ModelAssertion<RestProcessDefinitionModel> and() 
-    {      
-      return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestProcessDefinitionModel> assertThat() 
-    {      
-      return new ModelAssertion<RestProcessDefinitionModel>(this);
-    }
 }
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestProcessModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
 import org.alfresco.rest.core.assertion.IModelAssertion;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.ProcessModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Handles single Process Entry JSON response
  * "entry": {
@@ -126,22 +125,6 @@ public class RestProcessModel extends ProcessModel implements IRestModel<RestPro
         this.startedAt = startedAt;
     }
 
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestProcessModel> assertThat() 
-    {
-      return new ModelAssertion<RestProcessModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestProcessModel> and() 
-    {
-      return assertThat();
-    }
-
     public String getDurationInMs()
     {
         return durationInMs;

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestProcessVariableModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.model.TestModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 public class RestProcessVariableModel extends TestModel implements IRestModel<RestProcessVariableModel>
 {  
     private String name;
@@ -93,18 +92,4 @@ public class RestProcessVariableModel extends TestModel implements IRestModel<Re
     public static RestProcessVariableModel getRandomProcessVariableModel(String variableType){
         return new RestProcessVariableModel(RandomData.getRandomName("name"), RandomData.getRandomName("value"), variableType);    
     }
-    
-    
-    @Override
-    public ModelAssertion<RestProcessVariableModel> assertThat() 
-    {      
-      return new ModelAssertion<RestProcessVariableModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestProcessVariableModel> and() 
-    {      
-      return assertThat();
-    }
-    
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRatingModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestRatingModel extends TestModel implements IRestModel<RestRatingModel>
 {
     @JsonProperty(value = "entry")
@@ -88,16 +87,4 @@ public class RestRatingModel extends TestModel implements IRestModel<RestRatingM
     {
         this.myRating = myRating;
     }
-
-    @Override
-    public ModelAssertion<RestRatingModel> assertThat() 
-    {      
-      return new ModelAssertion<>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRatingModel> and() 
-    {      
-      return assertThat();
-    }
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRenditionInfoModel.java

@@ -25,30 +25,19 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * @author cmocanu 
  * Base Path
  *         {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
  */
 
-public class RestRenditionInfoModel extends TestModel implements IRestModel<RestRenditionInfoModel> {
-
-	@Override
-	public ModelAssertion<RestRenditionInfoModel> and() {
-		return assertThat();
-	}
-
-	@Override
-	public ModelAssertion<RestRenditionInfoModel> assertThat() {
-		return new ModelAssertion<RestRenditionInfoModel>(this);
-	}
-
+public class RestRenditionInfoModel extends TestModel implements IRestModel<RestRenditionInfoModel>
+{
 	@JsonProperty(value = "entry")
 	RestRenditionInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRepositoryInfoModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'aforascu' on '2018-01-10 16:02' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRepositoryInfoModel extends TestModel implements IRestModel<RestRepositoryInfoModel>
 {
-    @Override
-    public ModelAssertion<RestRepositoryInfoModel> assertThat()
-    {
-        return new ModelAssertion<RestRepositoryInfoModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRepositoryInfoModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRepositoryInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRequestRangesModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'msuzuki' on '2017-05-15 10:58' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestRangesModel extends TestModel implements IRestModel<RestRequestRangesModel>
 {
-    @Override
-    public ModelAssertion<RestRequestRangesModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestRangesModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestRangesModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestRangesModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRequestSpellcheckModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'msuzuki' on '2017-02-28 16:04' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestSpellcheckModel extends TestModel implements IRestModel<RestRequestSpellcheckModel>
 {
-    @Override
-    public ModelAssertion<RestRequestSpellcheckModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestSpellcheckModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestSpellcheckModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestSpellcheckModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRestoreArchivedContentRequestModel.java

@@ -31,12 +31,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'dedwards' on '2021-12-16 08:32' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -44,18 +43,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRestoreArchivedContentRequestModel extends TestModel implements IRestModel<RestRestoreArchivedContentRequestModel>
 {
-    @Override
-    public ModelAssertion<RestRestoreArchivedContentRequestModel> assertThat()
-    {
-        return new ModelAssertion<RestRestoreArchivedContentRequestModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRestoreArchivedContentRequestModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRestoreArchivedContentRequestModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleBodyModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRuleBodyModel extends TestModel implements IRestModel<RestRuleBodyModel>
 {
-    @Override
-    public ModelAssertion<RestRuleBodyModel> assertThat()
-    {
-        return new ModelAssertion<RestRuleBodyModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRuleBodyModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRuleBodyModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleModel.java

@@ -28,12 +28,11 @@ package org.alfresco.rest.model;
 import java.util.List;
 import java.util.Objects;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -41,18 +40,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRuleModel extends TestModel implements IRestModel<RestRuleModel>
 {
-    @Override
-    public ModelAssertion<RestRuleModel> assertThat()
-    {
-        return new ModelAssertion<RestRuleModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRuleModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRuleModel model;
 
@@ -255,9 +242,10 @@ If the field is omitted then the rule will apply to all nodes.
         if (o == null || getClass() != o.getClass())
             return false;
         RestRuleModel ruleModel = (RestRuleModel) o;
-        return enabled == ruleModel.enabled && cascade == ruleModel.cascade && asynchronous == ruleModel.asynchronous && Objects.equals(id, ruleModel.id) && name.equals(
-            ruleModel.name) && Objects.equals(description, ruleModel.description) && Objects.equals(errorScript, ruleModel.errorScript) && Objects.equals(
-            isShared, ruleModel.isShared) && Objects.equals(triggers, ruleModel.triggers) && Objects.equals(conditions, ruleModel.conditions) && actions.equals(ruleModel.actions);
+        return enabled == ruleModel.enabled && cascade == ruleModel.cascade && asynchronous == ruleModel.asynchronous && Objects.equals(id, ruleModel.id) && Objects.equals(
+            name, ruleModel.name) && Objects.equals(description, ruleModel.description) && Objects.equals(errorScript, ruleModel.errorScript) && Objects.equals(
+            isShared, ruleModel.isShared) && Objects.equals(triggers, ruleModel.triggers) && Objects.equals(conditions, ruleModel.conditions) && Objects.equals(
+            actions, ruleModel.actions);
     }
 
     @Override

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleSetBodyUpdateModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRuleSetBodyUpdateModel extends TestModel implements IRestModel<RestRuleSetBodyUpdateModel>
 {
-    @Override
-    public ModelAssertion<RestRuleSetBodyUpdateModel> assertThat()
-    {
-        return new ModelAssertion<RestRuleSetBodyUpdateModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRuleSetBodyUpdateModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRuleSetBodyUpdateModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleSetModel.java

@@ -28,7 +28,6 @@ package org.alfresco.rest.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 
 /**
@@ -38,18 +37,6 @@ import org.alfresco.utility.model.TestModel;
  */
 public class RestRuleSetModel extends TestModel implements IRestModel<RestRuleSetModel>
 {
-    @Override
-    public ModelAssertion<RestRuleSetModel> assertThat()
-    {
-        return new ModelAssertion<>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRuleSetModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty (value = "entry")
     RestRuleSetModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSharedLinksModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated from 'Alfresco Core REST API' swagger file
  * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
@@ -61,18 +60,6 @@ public class RestSharedLinksModel extends TestModel implements IRestModel<RestSh
         return model;
     }
 
-    @Override
-    public ModelAssertion<RestSharedLinksModel> assertThat()
-    {
-        return new ModelAssertion<RestSharedLinksModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestSharedLinksModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(required = true)
     private String modifiedAt;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSimpleConditionDefinitionModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.model;
 
 import java.util.Objects;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestSimpleConditionDefinitionModel extends TestModel implements IRestModel<RestSimpleConditionDefinitionModel>
 {
-    @Override
-    public ModelAssertion<RestSimpleConditionDefinitionModel> assertThat()
-    {
-        return new ModelAssertion<RestSimpleConditionDefinitionModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestSimpleConditionDefinitionModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestSimpleConditionDefinitionModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSiteContainerModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestSiteContainerModel extends TestModel implements IRestModel<RestSiteContainerModel>
 {
     @JsonProperty(value = "entry")
@@ -64,21 +63,4 @@ public class RestSiteContainerModel extends TestModel implements IRestModel<Rest
     {
         this.folderId = folderId;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestSiteContainerModel> assertThat() 
-    {
-      return new ModelAssertion<RestSiteContainerModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestSiteContainerModel> and() 
-    {
-      return assertThat();
-    }
-    
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSiteEntry.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * 
  * Handles Site Entry in Site Membership Information response
@@ -93,22 +92,6 @@ public class RestSiteEntry extends TestModel implements IRestModel<RestSiteEntry
       this.id = id;
     }
 
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestSiteEntry> assertThat() 
-    {
-      return new ModelAssertion<RestSiteEntry>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestSiteEntry> and() 
-    {
-      return assertThat();
-    }
-
     @Override
     public RestSiteEntry onModel() 
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSiteGroupModel.java

@@ -25,15 +25,15 @@
  */
 package org.alfresco.rest.model;
 
+import static org.alfresco.utility.report.log.Step.STEP;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.model.TestModel;
 import org.testng.Assert;
 
-import static org.alfresco.utility.report.log.Step.STEP;
-
 public class RestSiteGroupModel extends TestModel implements IRestModel<RestSiteGroupModel>
 {
     @JsonProperty(value = "entry")
@@ -84,20 +84,4 @@ public class RestSiteGroupModel extends TestModel implements IRestModel<RestSite
         Assert.assertEquals(getRole(), role, "Site group role is not as expected.");
         return this;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestSiteGroupModel> assertThat()
-    {
-      return new ModelAssertion<RestSiteGroupModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestSiteGroupModel> and()
-    {
-      return assertThat();
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSiteMemberModel.java

@@ -27,14 +27,13 @@ package org.alfresco.rest.model;
 
 import static org.alfresco.utility.report.log.Step.STEP;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.model.TestModel;
 import org.testng.Assert;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 public class RestSiteMemberModel extends TestModel implements IRestModel<RestSiteMemberModel>
 {
     @JsonProperty(value = "entry")
@@ -98,20 +97,4 @@ public class RestSiteMemberModel extends TestModel implements IRestModel<RestSit
         
         return this;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestSiteMemberModel> assertThat() 
-    {
-      return new ModelAssertion<RestSiteMemberModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestSiteMemberModel> and() 
-    {
-      return assertThat();
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSiteMembershipRequestModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 import org.testng.Assert;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 public class RestSiteMembershipRequestModel extends TestModel implements IRestModel<RestSiteMembershipRequestModel>
 {
     @JsonProperty(value = "entry")
@@ -104,21 +103,4 @@ public class RestSiteMembershipRequestModel extends TestModel implements IRestMo
         Assert.assertEquals(getMessage(), message, "Site membership request message is not correct");
         return this;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestSiteMembershipRequestModel> assertThat() 
-    {
-      return new ModelAssertion<RestSiteMembershipRequestModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestSiteMembershipRequestModel> and() 
-    {
-      return assertThat();
-    }
-    
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSiteModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.SiteModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.SiteModel;
+
 /**
  * Handles single Site JSON responses
  * Example:
@@ -74,20 +73,4 @@ public class RestSiteModel extends SiteModel implements IRestModel<RestSiteModel
     {
         this.role = role;        
     }
-    
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestSiteModel> assertThat() 
-    {
-      return new ModelAssertion<RestSiteModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestSiteModel> and() 
-    {
-      return assertThat();
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSitePersonMembershipRequestModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestSitePersonMembershipRequestModel extends TestModel implements IRestModel<RestSitePersonMembershipRequestModel>
 {
     private String id;
@@ -110,20 +109,4 @@ public class RestSitePersonMembershipRequestModel extends TestModel implements I
     {
         this.modifiedAt = modifiedAt;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestSitePersonMembershipRequestModel> assertThat() 
-    {
-      return new ModelAssertion<RestSitePersonMembershipRequestModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestSitePersonMembershipRequestModel> and() 
-    {
-      return assertThat();
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestStatusInfoModel.java

@@ -25,14 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Generated by 'tsalvado' on '2021-08-18 21:15' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -40,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestStatusInfoModel extends TestModel implements IRestModel<RestStatusInfoModel>
 {
-    @Override
-    public ModelAssertion<RestStatusInfoModel> assertThat()
-    {
-        return new ModelAssertion<RestStatusInfoModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestStatusInfoModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestStatusInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSubscriberModel.java

@@ -32,12 +32,11 @@
 
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Base Path {@linkplain /alfresco/api/-default-/private/alfresco/versions/1}
  * 
@@ -108,18 +107,6 @@ public class RestSubscriberModel extends TestModel implements IRestModel<RestSub
         return model;
     }
 
-    @Override
-    public ModelAssertion<RestSubscriberModel> assertThat()
-    {
-        return new ModelAssertion<RestSubscriberModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestSubscriberModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(required = true)
     private String createdAt;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSyncNodeSubscriptionModel.java

@@ -32,12 +32,11 @@
 
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Base Path {@linkplain /alfresco/api/-default-/private/alfresco/versions/1}
  * 
@@ -76,18 +75,6 @@ public class RestSyncNodeSubscriptionModel extends TestModel implements IRestMod
         return model;
     }
 
-    @Override
-    public ModelAssertion<RestSyncNodeSubscriptionModel> assertThat()
-    {
-        return new ModelAssertion<RestSyncNodeSubscriptionModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestSyncNodeSubscriptionModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(required = true)
     private String deviceSubscriptionId;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestTagModel.java

@@ -27,13 +27,12 @@ package org.alfresco.rest.model;
 
 import static org.alfresco.utility.report.log.Step.STEP;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TagModel;
 import org.testng.Assert;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Handles single Tag Entry JSON response
  * "entry":
@@ -64,24 +63,6 @@ public class RestTagModel extends TagModel implements IRestModel<RestTagModel>
         return this;
     }
 
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    public ModelAssertion<RestTagModel> and() 
-    {
-      return new ModelAssertion<RestTagModel>(this);
-    }
-    
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    public ModelAssertion<RestTagModel> assertThat() 
-    {
-      return new ModelAssertion<RestTagModel>(this);
-    }
-
     public Integer getCount()
     {
         return count;

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestTargetModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class RestTargetModel extends TestModel implements IRestModel<RestTargetModel>
 {
@@ -106,20 +105,4 @@ public class RestTargetModel extends TestModel implements IRestModel<RestTargetM
     {
         this.file = file;
     }
-
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestTargetModel> assertThat() 
-    {
-      return new ModelAssertion<RestTargetModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestTargetModel> and() 
-    {
-      return assertThat();
-    }
-}    
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestTaskModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TaskModel;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TaskModel;
+
 /**
  * Handles single Task JSON response
  * Example:
@@ -185,22 +184,6 @@ public class RestTaskModel extends TaskModel implements IRestModel<RestTaskModel
         this.state = state;
     }
 
-    /**
-     * DSL for assertion on this rest model
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestTaskModel> assertThat() 
-    {
-      return new ModelAssertion<RestTaskModel>(this);
-    }
-    
-    @Override
-    public ModelAssertion<RestTaskModel> and() 
-    {
-      return assertThat();
-    }
-
     public Integer getPriorityTask()
     {
         return priorityTask;

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestTicketBodyModel.java

@@ -25,30 +25,17 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated from 'Alfresco Authentication REST API' swagger file
  * Base Path {@linkplain /alfresco/api/-default-/public/authentication/versions/1}
  */
 public class RestTicketBodyModel extends TestModel implements IRestModel<RestTicketBodyModel>
 {
-    @Override
-    public ModelAssertion<RestTicketBodyModel> assertThat()
-    {
-        return new ModelAssertion<RestTicketBodyModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestTicketBodyModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestTicketBodyModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestTicketModel.java

@@ -25,30 +25,17 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated from 'Alfresco Authentication REST API' swagger file
  * Base Path {@linkplain /alfresco/api/-default-/public/authentication/versions/1}
  */
 public class RestTicketModel extends TestModel implements IRestModel<RestTicketModel>
 {
-    @Override
-    public ModelAssertion<RestTicketModel> assertThat()
-    {
-        return new ModelAssertion<RestTicketModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestTicketModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestTicketModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestVariableModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.model.TestModel;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Handles a single Variable JSON response
  * Example:
@@ -111,23 +110,6 @@ public class RestVariableModel extends TestModel implements IRestModel<RestVaria
         return new RestVariableModel(scope, RandomData.getRandomName("name"), type, RandomData.getRandomName("value"));
     }
 
-    /**
-     * DSL for assertion on this rest model
-     * 
-     * @return
-     */
-    @Override
-    public ModelAssertion<RestVariableModel> assertThat()
-    {
-        return new ModelAssertion<RestVariableModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestVariableModel> and()
-    {
-        return assertThat();
-    }
-
     @Override
     public RestVariableModel onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestVersionInfoModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.model;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'aforascu' on '2018-01-10 16:02' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestVersionInfoModel extends TestModel implements IRestModel<RestVersionInfoModel>
 {
-    @Override
-    public ModelAssertion<RestVersionInfoModel> assertThat()
-    {
-        return new ModelAssertion<RestVersionInfoModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestVersionInfoModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestVersionInfoModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestVersionModel.java

@@ -27,27 +27,13 @@ package org.alfresco.rest.model;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestVersionModel extends TestModel implements IRestModel<RestVersionModel>
 {
-
-    @Override
-    public ModelAssertion<RestVersionModel> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<RestVersionModel> assertThat()
-    {
-        return new ModelAssertion<RestVersionModel>(this);
-    }
-
     @JsonProperty(value = "entry")
     RestVersionModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/body/RestNodeLockBodyModel.java

@@ -25,30 +25,17 @@
  */
 package org.alfresco.rest.model.body;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 public class RestNodeLockBodyModel extends TestModel implements IRestModel<RestNodeLockBodyModel>
 {
     
     @JsonProperty(value = "entry")
     RestNodeLockBodyModel model;
 
-    @Override
-    public ModelAssertion<RestNodeLockBodyModel> and()
-    {
-        return new ModelAssertion<RestNodeLockBodyModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestNodeLockBodyModel> assertThat()
-    {
-        return assertThat();
-    }
-
     @Override
     public RestNodeLockBodyModel onModel()
     {

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/FacetFieldBucket.java

@@ -44,7 +44,6 @@
 package org.alfresco.rest.search;
 
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 
 /**
@@ -102,24 +101,10 @@ public class FacetFieldBucket extends TestModel implements IRestModel<FacetField
         this.filterQuery = filterQuery;
     }
 
-    @Override
-    public ModelAssertion<FacetFieldBucket> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<FacetFieldBucket> assertThat()
-    {
-        return new ModelAssertion<FacetFieldBucket>(this);
-    }
-
     @Override
     public FacetFieldBucket onModel()
     {
         // TODO Auto-generated method stub
         return null;
     }
-
-
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/FacetInterval.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.search;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import java.util.List;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Represents a facet interval.
  */
@@ -87,16 +86,4 @@ public class FacetInterval extends TestModel implements IRestModel<FacetInterval
     {
         return null;
     }
-
-    @Override
-    public ModelAssertion<FacetInterval> and()
-    {
-        return assertThat();
-    }
-
-    @Override
-    public ModelAssertion<FacetInterval> assertThat()
-    {
-       return new ModelAssertion<FacetInterval>(this);
-    }
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/FacetQuery.java

@@ -49,7 +49,7 @@ import org.alfresco.utility.model.TestModel;
  * Pojo to represent facet query.
  *         {"query": "content.size:[o TO 102400]", "label": "small"},
  **/
-public class FacetQuery extends TestModel //implements IRestModel<FacetQuery>
+public class FacetQuery extends TestModel
 {
     
     private String  query;
@@ -93,22 +93,4 @@ public class FacetQuery extends TestModel //implements IRestModel<FacetQuery>
     {
         this.group = group;
     }
-    
-   /* @Override
-    public ModelAssertion<FacetQuery> and()
-    {
-        return assertThat();
-    }
-    @Override
-    public ModelAssertion<FacetQuery> assertThat()
-    {
-        return new ModelAssertion<FacetQuery>(this);
-    }
-    @Override
-    public FacetQuery onModel()
-    {
-        return null;
-    }*/
-
-    
 }

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/ResponseHighLightModel.java

@@ -46,7 +46,6 @@ package org.alfresco.rest.search;
 import java.util.List;
 
 import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
 /**
  * Pojo which represents the search response that includes the highlighting info. 
@@ -76,16 +75,6 @@ public class ResponseHighLightModel extends TestModel implements IRestModel<Resp
         this.snippets = snippets;
     }
     @Override
-    public ModelAssertion<ResponseHighLightModel> and()
-    {
-        return assertThat();
-    }
-    @Override
-    public ModelAssertion<ResponseHighLightModel> assertThat()
-    {
-        return new ModelAssertion<ResponseHighLightModel>(this);
-    }
-    @Override
     public ResponseHighLightModel onModel()
     {
         return model;

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestGenericBucketModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.search;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'gethin' on '2017-03-17 13:23' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestGenericBucketModel extends TestModel implements IRestModel<RestGenericBucketModel>
 {
-    @Override
-    public ModelAssertion<RestGenericBucketModel> assertThat()
-    {
-        return new ModelAssertion<RestGenericBucketModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestGenericBucketModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestGenericBucketModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestGenericFacetResponseModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.search;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'gethin' on '2017-03-17 12:44' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestGenericFacetResponseModel extends TestModel implements IRestModel<RestGenericFacetResponseModel>
 {
-    @Override
-    public ModelAssertion<RestGenericFacetResponseModel> assertThat()
-    {
-        return new ModelAssertion<RestGenericFacetResponseModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestGenericFacetResponseModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestGenericFacetResponseModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestGenericMetricModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.search;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'gethin' on '2017-03-17 13:23' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestGenericMetricModel extends TestModel implements IRestModel<RestGenericMetricModel>
 {
-    @Override
-    public ModelAssertion<RestGenericMetricModel> assertThat()
-    {
-        return new ModelAssertion<RestGenericMetricModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestGenericMetricModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestGenericMetricModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFacetFieldModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.search;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'gethin' on '2017-03-23 10:59' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestFacetFieldModel extends TestModel implements IRestModel<RestRequestFacetFieldModel>
 {
-    @Override
-    public ModelAssertion<RestRequestFacetFieldModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestFacetFieldModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestFacetFieldModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestFacetFieldModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFacetFieldsModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.search;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'gethin' on '2017-03-23 10:41' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestFacetFieldsModel extends TestModel implements IRestModel<RestRequestFacetFieldsModel>
 {
-    @Override
-    public ModelAssertion<RestRequestFacetFieldsModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestFacetFieldsModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestFacetFieldsModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestFacetFieldsModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFacetIntervalsModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.search;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'gethin' on '2017-03-01 12:12' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestFacetIntervalsModel extends TestModel implements IRestModel<RestRequestFacetIntervalsModel>
 {
-    @Override
-    public ModelAssertion<RestRequestFacetIntervalsModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestFacetIntervalsModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestFacetIntervalsModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestFacetIntervalsModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFacetSetModel.java

@@ -25,12 +25,11 @@
  */
 package org.alfresco.rest.search;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'gethin' on '2017-03-01 12:12' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -38,18 +37,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestFacetSetModel extends TestModel implements IRestModel<RestRequestFacetSetModel>
 {
-    @Override
-    public ModelAssertion<RestRequestFacetSetModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestFacetSetModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestFacetSetModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestFacetSetModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFieldsModel.java

@@ -43,12 +43,11 @@
  */
 package org.alfresco.rest.search;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'msuzuki' on '2017-02-24 09:26' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
@@ -56,18 +55,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestFieldsModel extends TestModel implements IRestModel<RestRequestFieldsModel>
 {
-    @Override
-    public ModelAssertion<RestRequestFieldsModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestFieldsModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestFieldsModel> and()
-    {
-        return assertThat();
-    }
-
     public RestRequestFieldsModel(){}
     
     public RestRequestFieldsModel(String fieldValue)

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestFilterQueryModel.java

@@ -25,31 +25,19 @@
  */
 package org.alfresco.rest.search;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Hacked together by 'gethin' on '2017-03-23 10:59' from 'Alfresco Search REST API' swagger file
  * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1}
  */
 public class RestRequestFilterQueryModel extends TestModel implements IRestModel<RestRequestFilterQueryModel>
 {
-    @Override
-    public ModelAssertion<RestRequestFilterQueryModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestFilterQueryModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestFilterQueryModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestFilterQueryModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestHighlightModel.java

@@ -27,12 +27,11 @@ package org.alfresco.rest.search;
 
 import java.util.List;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
 /**
  * Generated by 'msuzuki' on '2017-02-23 13:41' from 'Alfresco Search REST API' swagger file 
  * Generated from 'Alfresco Search REST API' swagger file
@@ -40,18 +39,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class RestRequestHighlightModel extends TestModel implements IRestModel<RestRequestHighlightModel>
 {
-    @Override
-    public ModelAssertion<RestRequestHighlightModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestHighlightModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestHighlightModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestHighlightModel model;
 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestPivotModel.java

@@ -25,13 +25,12 @@
  */
 package org.alfresco.rest.search;
 
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.rest.core.assertion.ModelAssertion;
-import org.alfresco.utility.model.TestModel;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import java.util.List;
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
 
 /**
  * Generated by 'gethin' on '2017-03-23 10:07' from 'Alfresco Search REST API' swagger file 
@@ -40,18 +39,6 @@ import java.util.List;
  */
 public class RestRequestPivotModel extends TestModel implements IRestModel<RestRequestPivotModel>
 {
-    @Override
-    public ModelAssertion<RestRequestPivotModel> assertThat()
-    {
-        return new ModelAssertion<RestRequestPivotModel>(this);
-    }
-
-    @Override
-    public ModelAssertion<RestRequestPivotModel> and()
-    {
-        return assertThat();
-    }
-
     @JsonProperty(value = "entry")
     RestRequestPivotModel model;