diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/GetRulesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/GetRulesTests.java index 4092c27d5f..cd036b5cb9 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/GetRulesTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/GetRulesTests.java @@ -150,11 +150,11 @@ public class GetRulesTests extends RestTest rules.getEntries().get(i).onModel() .assertThat().field("isShared").isNotNull() .assertThat().field("description").isNull() - .assertThat().field("enabled").is(false) - .assertThat().field("cascade").is(false) - .assertThat().field("asynchronous").is(false) + .assertThat().field("isEnabled").is(false) + .assertThat().field("isInheritable").is(false) + .assertThat().field("isAsynchronous").is(false) .assertThat().field("errorScript").isNull() - .assertThat().field("shared").isNull() + .assertThat().field("isShared").is(false) .assertThat().field("triggers").is("[inbound]")); } diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java index 356f078cb6..fdb2bf596f 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java @@ -61,9 +61,9 @@ public class RulesTestsUtils { RestRuleModel ruleModel = createRuleModelWithDefaultValues(); ruleModel.setDescription(RULE_DESCRIPTION_DEFAULT); - ruleModel.setEnabled(RULE_ENABLED_DEFAULT); - ruleModel.setCascade(RULE_CASCADE_DEFAULT); - ruleModel.setAsynchronous(RULE_ASYNC_DEFAULT); + ruleModel.setIsEnabled(RULE_ENABLED_DEFAULT); + ruleModel.setIsInheritable(RULE_CASCADE_DEFAULT); + ruleModel.setIsAsynchronous(RULE_ASYNC_DEFAULT); ruleModel.setIsShared(RULE_SHARED_DEFAULT); ruleModel.setTriggers(RULE_TRIGGERS_DEFAULT); ruleModel.setErrorScript(RULE_ERROR_SCRIPT_DEFAULT); diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/UpdateRulesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/UpdateRulesTests.java index 841c67328d..47544c6dab 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/UpdateRulesTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/UpdateRulesTests.java @@ -54,6 +54,7 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableMap; + import org.alfresco.rest.RestTest; import org.alfresco.rest.model.RestActionBodyExecTemplateModel; import org.alfresco.rest.model.RestCompositeConditionDefinitionModel; @@ -291,9 +292,9 @@ public class UpdateRulesTests extends RestTest rule.setTriggers(List.of(INBOUND)); final String updatedDescription = "Updated description"; rule.setDescription(updatedDescription); - rule.setEnabled(!RULE_ENABLED_DEFAULT); - rule.setCascade(!RULE_CASCADE_DEFAULT); - rule.setAsynchronous(!RULE_ASYNC_DEFAULT); + rule.setIsEnabled(!RULE_ENABLED_DEFAULT); + rule.setIsInheritable(!RULE_CASCADE_DEFAULT); + rule.setIsAsynchronous(!RULE_ASYNC_DEFAULT); final String updatedErrorScript = "updated-error-script"; rule.setErrorScript(updatedErrorScript); final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet() diff --git a/pom.xml b/pom.xml index 9dc41cda79..f34a551df4 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ 2.7.4 3.0.56 5.2.0 - 1.122 + 1.123 1.32 1.9 1.7 diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/rules/Rule.java b/remote-api/src/main/java/org/alfresco/rest/api/model/rules/Rule.java index b5c05e0c63..c487d673f5 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/rules/Rule.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/rules/Rule.java @@ -39,7 +39,6 @@ import org.alfresco.service.Experimental; import org.alfresco.service.cmr.action.ActionCondition; import org.alfresco.service.cmr.action.CompositeAction; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.namespace.NamespaceService; import org.alfresco.util.GUID; @Experimental @@ -48,9 +47,9 @@ public class Rule private String id; private String name; private String description; - private boolean enabled; - private boolean cascade; - private boolean asynchronous; + private boolean isEnabled; + private boolean isInheritable; + private boolean isAsynchronous; private Boolean isShared; private String errorScript; private List triggers = List.of(RuleTrigger.INBOUND); @@ -73,9 +72,9 @@ public class Rule final Rule.Builder builder = builder() .name(ruleModel.getTitle()) .description(ruleModel.getDescription()) - .enabled(!ruleModel.getRuleDisabled()) - .cascade(ruleModel.isAppliedToChildren()) - .asynchronous(ruleModel.getExecuteAsynchronously()); + .isEnabled(!ruleModel.getRuleDisabled()) + .isInheritable(ruleModel.isAppliedToChildren()) + .isAsynchronous(ruleModel.getExecuteAsynchronously()); if (ruleModel.getNodeRef() != null) { builder.id(ruleModel.getNodeRef().getId()); @@ -113,9 +112,9 @@ public class Rule ruleModel.setNodeRef(nodeRef); ruleModel.setTitle(name); ruleModel.setDescription(description); - ruleModel.setRuleDisabled(!enabled); - ruleModel.applyToChildren(cascade); - ruleModel.setExecuteAsynchronously(asynchronous); + ruleModel.setRuleDisabled(!isEnabled); + ruleModel.applyToChildren(isInheritable); + ruleModel.setExecuteAsynchronously(isAsynchronous); if (triggers != null) { ruleModel.setRuleTypes(triggers.stream().map(RuleTrigger::getValue).collect(Collectors.toList())); @@ -166,34 +165,34 @@ public class Rule this.description = description; } - public boolean isEnabled() + public boolean getIsEnabled() { - return enabled; + return isEnabled; } - public void setEnabled(boolean enabled) + public void setIsEnabled(boolean isEnabled) { - this.enabled = enabled; + this.isEnabled = isEnabled; } - public boolean isCascade() + public boolean getIsInheritable() { - return cascade; + return isInheritable; } - public void setCascade(boolean cascade) + public void setIsInheritable(boolean isInheritable) { - this.cascade = cascade; + this.isInheritable = isInheritable; } - public boolean isAsynchronous() + public boolean getIsAsynchronous() { - return asynchronous; + return isAsynchronous; } - public void setAsynchronous(boolean asynchronous) + public void setIsAsynchronous(boolean isAsynchronous) { - this.asynchronous = asynchronous; + this.isAsynchronous = isAsynchronous; } public String getErrorScript() @@ -261,8 +260,8 @@ public class Rule @Override public String toString() { - return "Rule{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", description='" + description + '\'' + ", enabled=" + enabled + ", cascade=" + cascade - + ", asynchronous=" + asynchronous + ", isShared=" + isShared + ", errorScript='" + errorScript + '\'' + ", triggers=" + triggers + ", conditions=" + conditions + return "Rule{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", description='" + description + '\'' + ", isEnabled=" + isEnabled + ", isInheritable=" + isInheritable + + ", isAsynchronous=" + isAsynchronous + ", isShared=" + isShared + ", errorScript='" + errorScript + '\'' + ", triggers=" + triggers + ", conditions=" + conditions + ", actions=" + actions + '}'; } @@ -274,9 +273,9 @@ public class Rule if (o == null || getClass() != o.getClass()) return false; Rule rule = (Rule) o; - return enabled == rule.enabled - && cascade == rule.cascade - && asynchronous == rule.asynchronous + return isEnabled == rule.isEnabled + && isInheritable == rule.isInheritable + && isAsynchronous == rule.isAsynchronous && Objects.equals(isShared, rule.isShared) && Objects.equals(id, rule.id) && Objects.equals(name, rule.name) @@ -290,7 +289,7 @@ public class Rule @Override public int hashCode() { - return Objects.hash(id, name, description, enabled, cascade, asynchronous, isShared, errorScript, triggers, conditions, actions); + return Objects.hash(id, name, description, isEnabled, isInheritable, isAsynchronous, isShared, errorScript, triggers, conditions, actions); } public static Builder builder() @@ -304,9 +303,9 @@ public class Rule private String id; private String name; private String description; - private boolean enabled; - private boolean cascade; - private boolean asynchronous; + private boolean isEnabled; + private boolean isInheritable; + private boolean isAsynchronous; private Boolean isShared; private String errorScript; private List triggers = List.of(RuleTrigger.INBOUND); @@ -331,21 +330,21 @@ public class Rule return this; } - public Builder enabled(boolean enabled) + public Builder isEnabled(boolean isEnabled) { - this.enabled = enabled; + this.isEnabled = isEnabled; return this; } - public Builder cascade(boolean cascade) + public Builder isInheritable(boolean isInheritable) { - this.cascade = cascade; + this.isInheritable = isInheritable; return this; } - public Builder asynchronous(boolean asynchronous) + public Builder isAsynchronous(boolean isAsynchronous) { - this.asynchronous = asynchronous; + this.isAsynchronous = isAsynchronous; return this; } @@ -385,9 +384,9 @@ public class Rule rule.setId(id); rule.setName(name); rule.setDescription(description); - rule.setEnabled(enabled); - rule.setCascade(cascade); - rule.setAsynchronous(asynchronous); + rule.setIsEnabled(isEnabled); + rule.setIsInheritable(isInheritable); + rule.setIsAsynchronous(isAsynchronous); rule.setIsShared(isShared); rule.setErrorScript(errorScript); rule.setRuleTriggers(triggers); diff --git a/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleLoaderTest.java b/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleLoaderTest.java index 01cbc17a55..9cfaa985fe 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleLoaderTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleLoaderTest.java @@ -53,7 +53,7 @@ public class RuleLoaderTest private static final String TITLE = "title"; private static final String DESCRIPTION = "description"; private static final boolean ENABLED = true; - private static final boolean CASCADE = true; + private static final boolean INHERITABLE = true; private static final boolean EXECUTE_ASYNCHRONOUSLY = false; private static final List TRIGGERS = List.of("update", "outbound"); private static final NodeRef RULE_SET_NODE = new NodeRef("rule://set/"); @@ -80,9 +80,9 @@ public class RuleLoaderTest Rule expected = Rule.builder().id(NODE_ID) .name(TITLE) .description(DESCRIPTION) - .enabled(ENABLED) - .cascade(CASCADE) - .asynchronous(EXECUTE_ASYNCHRONOUSLY) + .isEnabled(ENABLED) + .isInheritable(INHERITABLE) + .isAsynchronous(EXECUTE_ASYNCHRONOUSLY) .triggers(List.of(UPDATE, OUTBOUND)).create(); assertThat(rule).isEqualTo(expected); } @@ -112,7 +112,7 @@ public class RuleLoaderTest rule.setTitle(TITLE); rule.setDescription(DESCRIPTION); rule.setRuleDisabled(!ENABLED); - rule.applyToChildren(CASCADE); + rule.applyToChildren(INHERITABLE); rule.setExecuteAsynchronously(EXECUTE_ASYNCHRONOUSLY); rule.setRuleTypes(TRIGGERS); return rule; diff --git a/remote-api/src/test/java/org/alfresco/rest/api/model/rules/RuleTest.java b/remote-api/src/test/java/org/alfresco/rest/api/model/rules/RuleTest.java index 12959d6af6..18e3320d6f 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/model/rules/RuleTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/model/rules/RuleTest.java @@ -38,7 +38,6 @@ import org.alfresco.repo.action.ActionImpl; import org.alfresco.repo.action.executer.ScriptActionExecuter; import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.impl.mapper.rules.RestRuleCompositeConditionModelMapper; -import org.alfresco.rest.api.impl.mapper.rules.RestRuleSimpleConditionModelMapper; import org.alfresco.rest.api.model.mapper.RestModelMapper; import org.alfresco.service.Experimental; import org.alfresco.service.cmr.action.ActionCondition; @@ -57,7 +56,7 @@ public class RuleTest private static final String RULE_NAME = "rule name"; private static final String RULE_DESCRIPTION = "rule description"; private static final boolean RULE_ENABLED = true; - private static final boolean RULE_CASCADE = true; + private static final boolean RULE_INHERITABLE = true; private static final boolean RULE_ASYNC = true; private static final boolean RULE_SHARED = true; private static final String ACTION_DEFINITION_NAME = "action-def-name"; @@ -82,7 +81,7 @@ public class RuleTest public void testFromRuleModelWithNullValues() { final org.alfresco.service.cmr.rule.Rule ruleModel = new org.alfresco.service.cmr.rule.Rule(); - final Rule expectedRule = Rule.builder().enabled(true).create(); + final Rule expectedRule = Rule.builder().isEnabled(true).create(); // when final Rule actualRule = Rule.from(ruleModel, compositeConditionMapper); @@ -141,9 +140,9 @@ public class RuleTest .id(RULE_ID) .name(RULE_NAME) .description(RULE_DESCRIPTION) - .enabled(RULE_ENABLED) - .cascade(RULE_CASCADE) - .asynchronous(RULE_ASYNC) + .isEnabled(RULE_ENABLED) + .isInheritable(RULE_INHERITABLE) + .isAsynchronous(RULE_ASYNC) .triggers(List.of(RuleTrigger.INBOUND, RuleTrigger.UPDATE)) .errorScript(ERROR_SCRIPT) .conditions(compositeConditionMapper.toRestModel(Collections.emptyList())) @@ -156,7 +155,7 @@ public class RuleTest ruleModel.setTitle(RULE_NAME); ruleModel.setDescription(RULE_DESCRIPTION); ruleModel.setRuleDisabled(!RULE_ENABLED); - ruleModel.applyToChildren(RULE_CASCADE); + ruleModel.applyToChildren(RULE_INHERITABLE); ruleModel.setExecuteAsynchronously(RULE_ASYNC); ruleModel.setRuleTypes(List.of(RuleType.INBOUND, RuleType.UPDATE)); ruleModel.setAction(createActionModel());