From 52149bf2925eae66429f8bbea32ad7cc3ec5d50c Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 15 Sep 2022 12:32:32 +0100 Subject: [PATCH] ACS-3363 Add inheritedBy to rule set. (#247) --- .../alfresco/rest/model/RestRuleSetModel.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleSetModel.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleSetModel.java index 2f76391eb1..dfdb7c6266 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleSetModel.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestRuleSetModel.java @@ -25,6 +25,7 @@ */ package org.alfresco.rest.model; +import java.util.List; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -57,6 +58,8 @@ public class RestRuleSetModel extends TestModel implements IRestModel inheritedBy; public String getId() { @@ -88,19 +91,31 @@ public class RestRuleSetModel extends TestModel implements IRestModel getInheritedBy() + { + return inheritedBy; + } + + public void setInheritedBy(List inheritedBy) + { + this.inheritedBy = inheritedBy; + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; RestRuleSetModel that = (RestRuleSetModel) o; - return Objects.equals(id, that.id) && Objects.equals(owningFolder, that.owningFolder) && - Objects.equals(inclusionType, that.inclusionType); + return Objects.equals(id, that.id) + && Objects.equals(owningFolder, that.owningFolder) + && Objects.equals(inclusionType, that.inclusionType) + && Objects.equals(inheritedBy, that.inheritedBy); } @Override public int hashCode() { - return Objects.hash(id, owningFolder, inclusionType); + return Objects.hash(id, owningFolder, inclusionType, inheritedBy); } }