inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-3359 Rename boolean rule fields. (#1436)

Browse Source 
* ACS-3359 Rename boolean rule fields.

* ACS-3359 Re-add unused import.

This has started to be used on master now.

* ACS-3359 Fix E2E test.

The isShared field is requested and comes back correctly as false.
This commit is contained in:
Tom Page
2022-09-26 15:43:13 +01:00
committed by GitHub
parent d0eea6835e
commit 8c556eeaca
7 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/GetRulesTests.java
View File

@@ -150,11 +150,11 @@ public class GetRulesTests extends RestTest
rules.getEntries().get(i).onModel() rules.getEntries().get(i).onModel()
.assertThat().field("isShared").isNotNull() .assertThat().field("isShared").isNotNull()
.assertThat().field("description").isNull() .assertThat().field("description").isNull()
.assertThat().field("enabled").is(false) .assertThat().field("isEnabled").is(false)
.assertThat().field("cascade").is(false) .assertThat().field("isInheritable").is(false)
.assertThat().field("asynchronous").is(false) .assertThat().field("isAsynchronous").is(false)
.assertThat().field("errorScript").isNull() .assertThat().field("errorScript").isNull()
.assertThat().field("shared").isNull() .assertThat().field("isShared").is(false)
.assertThat().field("triggers").is("[inbound]")); .assertThat().field("triggers").is("[inbound]"));
} }

6
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java
View File

@@ -61,9 +61,9 @@ public class RulesTestsUtils
{ {
RestRuleModel ruleModel = createRuleModelWithDefaultValues(); RestRuleModel ruleModel = createRuleModelWithDefaultValues();
ruleModel.setDescription(RULE_DESCRIPTION_DEFAULT); ruleModel.setDescription(RULE_DESCRIPTION_DEFAULT);
ruleModel.setEnabled(RULE_ENABLED_DEFAULT); ruleModel.setIsEnabled(RULE_ENABLED_DEFAULT);
ruleModel.setCascade(RULE_CASCADE_DEFAULT); ruleModel.setIsInheritable(RULE_CASCADE_DEFAULT);
ruleModel.setAsynchronous(RULE_ASYNC_DEFAULT); ruleModel.setIsAsynchronous(RULE_ASYNC_DEFAULT);
ruleModel.setIsShared(RULE_SHARED_DEFAULT); ruleModel.setIsShared(RULE_SHARED_DEFAULT);
ruleModel.setTriggers(RULE_TRIGGERS_DEFAULT); ruleModel.setTriggers(RULE_TRIGGERS_DEFAULT);
ruleModel.setErrorScript(RULE_ERROR_SCRIPT_DEFAULT); ruleModel.setErrorScript(RULE_ERROR_SCRIPT_DEFAULT);

7
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/UpdateRulesTests.java
View File

@@ -54,6 +54,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.alfresco.rest.RestTest; import org.alfresco.rest.RestTest;
import org.alfresco.rest.model.RestActionBodyExecTemplateModel; import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
import org.alfresco.rest.model.RestCompositeConditionDefinitionModel; import org.alfresco.rest.model.RestCompositeConditionDefinitionModel;
@@ -291,9 +292,9 @@ public class UpdateRulesTests extends RestTest
rule.setTriggers(List.of(INBOUND)); rule.setTriggers(List.of(INBOUND));
final String updatedDescription = "Updated description"; final String updatedDescription = "Updated description";
rule.setDescription(updatedDescription); rule.setDescription(updatedDescription);
rule.setEnabled(!RULE_ENABLED_DEFAULT); rule.setIsEnabled(!RULE_ENABLED_DEFAULT);
rule.setCascade(!RULE_CASCADE_DEFAULT); rule.setIsInheritable(!RULE_CASCADE_DEFAULT);
rule.setAsynchronous(!RULE_ASYNC_DEFAULT); rule.setIsAsynchronous(!RULE_ASYNC_DEFAULT);
final String updatedErrorScript = "updated-error-script"; final String updatedErrorScript = "updated-error-script";
rule.setErrorScript(updatedErrorScript); rule.setErrorScript(updatedErrorScript);
final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet() final RestRuleModel updatedRule = restClient.authenticateUser(user).withCoreAPI().usingNode(ruleFolder).usingDefaultRuleSet()

2
pom.xml
View File

@@ -123,7 +123,7 @@
<dependency.mariadb.version>2.7.4</dependency.mariadb.version> <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
<dependency.tas-utility.version>3.0.56</dependency.tas-utility.version> <dependency.tas-utility.version>3.0.56</dependency.tas-utility.version>
<dependency.rest-assured.version>5.2.0</dependency.rest-assured.version> <dependency.rest-assured.version>5.2.0</dependency.rest-assured.version>
<dependency.tas-restapi.version>1.122</dependency.tas-restapi.version> <dependency.tas-restapi.version>1.123</dependency.tas-restapi.version>
<dependency.tas-cmis.version>1.32</dependency.tas-cmis.version> <dependency.tas-cmis.version>1.32</dependency.tas-cmis.version>
<dependency.tas-email.version>1.9</dependency.tas-email.version> <dependency.tas-email.version>1.9</dependency.tas-email.version>
<dependency.tas-webdav.version>1.7</dependency.tas-webdav.version> <dependency.tas-webdav.version>1.7</dependency.tas-webdav.version>

79
remote-api/src/main/java/org/alfresco/rest/api/model/rules/Rule.java
View File

@@ -39,7 +39,6 @@ import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.action.ActionCondition; import org.alfresco.service.cmr.action.ActionCondition;
import org.alfresco.service.cmr.action.CompositeAction; import org.alfresco.service.cmr.action.CompositeAction;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
@Experimental @Experimental
@@ -48,9 +47,9 @@ public class Rule
private String id; private String id;
private String name; private String name;
private String description; private String description;
private boolean enabled; private boolean isEnabled;
private boolean cascade; private boolean isInheritable;
private boolean asynchronous; private boolean isAsynchronous;
private Boolean isShared; private Boolean isShared;
private String errorScript; private String errorScript;
private List<RuleTrigger> triggers = List.of(RuleTrigger.INBOUND); private List<RuleTrigger> triggers = List.of(RuleTrigger.INBOUND);
@@ -73,9 +72,9 @@ public class Rule
final Rule.Builder builder = builder() final Rule.Builder builder = builder()
.name(ruleModel.getTitle()) .name(ruleModel.getTitle())
.description(ruleModel.getDescription()) .description(ruleModel.getDescription())
.enabled(!ruleModel.getRuleDisabled()) .isEnabled(!ruleModel.getRuleDisabled())
.cascade(ruleModel.isAppliedToChildren()) .isInheritable(ruleModel.isAppliedToChildren())
.asynchronous(ruleModel.getExecuteAsynchronously()); .isAsynchronous(ruleModel.getExecuteAsynchronously());
if (ruleModel.getNodeRef() != null) { if (ruleModel.getNodeRef() != null) {
builder.id(ruleModel.getNodeRef().getId()); builder.id(ruleModel.getNodeRef().getId());
@@ -113,9 +112,9 @@ public class Rule
ruleModel.setNodeRef(nodeRef); ruleModel.setNodeRef(nodeRef);
ruleModel.setTitle(name); ruleModel.setTitle(name);
ruleModel.setDescription(description); ruleModel.setDescription(description);
ruleModel.setRuleDisabled(!enabled); ruleModel.setRuleDisabled(!isEnabled);
ruleModel.applyToChildren(cascade); ruleModel.applyToChildren(isInheritable);
ruleModel.setExecuteAsynchronously(asynchronous); ruleModel.setExecuteAsynchronously(isAsynchronous);
if (triggers != null) if (triggers != null)
{ {
ruleModel.setRuleTypes(triggers.stream().map(RuleTrigger::getValue).collect(Collectors.toList())); ruleModel.setRuleTypes(triggers.stream().map(RuleTrigger::getValue).collect(Collectors.toList()));
@@ -166,34 +165,34 @@ public class Rule
this.description = description; 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() public String getErrorScript()
@@ -261,8 +260,8 @@ public class Rule
@Override @Override
public String toString() public String toString()
{ {
return "Rule{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", description='" + description + '\'' + ", enabled=" + enabled + ", cascade=" + cascade return "Rule{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", description='" + description + '\'' + ", isEnabled=" + isEnabled + ", isInheritable=" + isInheritable
+ ", asynchronous=" + asynchronous + ", isShared=" + isShared + ", errorScript='" + errorScript + '\'' + ", triggers=" + triggers + ", conditions=" + conditions + ", isAsynchronous=" + isAsynchronous + ", isShared=" + isShared + ", errorScript='" + errorScript + '\'' + ", triggers=" + triggers + ", conditions=" + conditions
+ ", actions=" + actions + '}'; + ", actions=" + actions + '}';
} }
@@ -274,9 +273,9 @@ public class Rule
if (o == null || getClass() != o.getClass()) if (o == null || getClass() != o.getClass())
return false; return false;
Rule rule = (Rule) o; Rule rule = (Rule) o;
return enabled == rule.enabled return isEnabled == rule.isEnabled
&& cascade == rule.cascade && isInheritable == rule.isInheritable
&& asynchronous == rule.asynchronous && isAsynchronous == rule.isAsynchronous
&& Objects.equals(isShared, rule.isShared) && Objects.equals(isShared, rule.isShared)
&& Objects.equals(id, rule.id) && Objects.equals(id, rule.id)
&& Objects.equals(name, rule.name) && Objects.equals(name, rule.name)
@@ -290,7 +289,7 @@ public class Rule
@Override @Override
public int hashCode() 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() public static Builder builder()
@@ -304,9 +303,9 @@ public class Rule
private String id; private String id;
private String name; private String name;
private String description; private String description;
private boolean enabled; private boolean isEnabled;
private boolean cascade; private boolean isInheritable;
private boolean asynchronous; private boolean isAsynchronous;
private Boolean isShared; private Boolean isShared;
private String errorScript; private String errorScript;
private List<RuleTrigger> triggers = List.of(RuleTrigger.INBOUND); private List<RuleTrigger> triggers = List.of(RuleTrigger.INBOUND);
@@ -331,21 +330,21 @@ public class Rule
return this; return this;
} }
public Builder enabled(boolean enabled) public Builder isEnabled(boolean isEnabled)
{ {
this.enabled = enabled; this.isEnabled = isEnabled;
return this; return this;
} }
public Builder cascade(boolean cascade) public Builder isInheritable(boolean isInheritable)
{ {
this.cascade = cascade; this.isInheritable = isInheritable;
return this; return this;
} }
public Builder asynchronous(boolean asynchronous) public Builder isAsynchronous(boolean isAsynchronous)
{ {
this.asynchronous = asynchronous; this.isAsynchronous = isAsynchronous;
return this; return this;
} }
@@ -385,9 +384,9 @@ public class Rule
rule.setId(id); rule.setId(id);
rule.setName(name); rule.setName(name);
rule.setDescription(description); rule.setDescription(description);
rule.setEnabled(enabled); rule.setIsEnabled(isEnabled);
rule.setCascade(cascade); rule.setIsInheritable(isInheritable);
rule.setAsynchronous(asynchronous); rule.setIsAsynchronous(isAsynchronous);
rule.setIsShared(isShared); rule.setIsShared(isShared);
rule.setErrorScript(errorScript); rule.setErrorScript(errorScript);
rule.setRuleTriggers(triggers); rule.setRuleTriggers(triggers);

10
remote-api/src/test/java/org/alfresco/rest/api/impl/rules/RuleLoaderTest.java
View File

@@ -53,7 +53,7 @@ public class RuleLoaderTest
private static final String TITLE = "title"; private static final String TITLE = "title";
private static final String DESCRIPTION = "description"; private static final String DESCRIPTION = "description";
private static final boolean ENABLED = true; 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 boolean EXECUTE_ASYNCHRONOUSLY = false;
private static final List<String> TRIGGERS = List.of("update", "outbound"); private static final List<String> TRIGGERS = List.of("update", "outbound");
private static final NodeRef RULE_SET_NODE = new NodeRef("rule://set/"); 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) Rule expected = Rule.builder().id(NODE_ID)
.name(TITLE) .name(TITLE)
.description(DESCRIPTION) .description(DESCRIPTION)
.enabled(ENABLED) .isEnabled(ENABLED)
.cascade(CASCADE) .isInheritable(INHERITABLE)
.asynchronous(EXECUTE_ASYNCHRONOUSLY) .isAsynchronous(EXECUTE_ASYNCHRONOUSLY)
.triggers(List.of(UPDATE, OUTBOUND)).create(); .triggers(List.of(UPDATE, OUTBOUND)).create();
assertThat(rule).isEqualTo(expected); assertThat(rule).isEqualTo(expected);
} }
@@ -112,7 +112,7 @@ public class RuleLoaderTest
rule.setTitle(TITLE); rule.setTitle(TITLE);
rule.setDescription(DESCRIPTION); rule.setDescription(DESCRIPTION);
rule.setRuleDisabled(!ENABLED); rule.setRuleDisabled(!ENABLED);
rule.applyToChildren(CASCADE); rule.applyToChildren(INHERITABLE);
rule.setExecuteAsynchronously(EXECUTE_ASYNCHRONOUSLY); rule.setExecuteAsynchronously(EXECUTE_ASYNCHRONOUSLY);
rule.setRuleTypes(TRIGGERS); rule.setRuleTypes(TRIGGERS);
return rule; return rule;

13
remote-api/src/test/java/org/alfresco/rest/api/model/rules/RuleTest.java
View File

@@ -38,7 +38,6 @@ import org.alfresco.repo.action.ActionImpl;
import org.alfresco.repo.action.executer.ScriptActionExecuter; import org.alfresco.repo.action.executer.ScriptActionExecuter;
import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.impl.mapper.rules.RestRuleCompositeConditionModelMapper; 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.rest.api.model.mapper.RestModelMapper;
import org.alfresco.service.Experimental; import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.action.ActionCondition; 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_NAME = "rule name";
private static final String RULE_DESCRIPTION = "rule description"; private static final String RULE_DESCRIPTION = "rule description";
private static final boolean RULE_ENABLED = true; 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_ASYNC = true;
private static final boolean RULE_SHARED = true; private static final boolean RULE_SHARED = true;
private static final String ACTION_DEFINITION_NAME = "action-def-name"; private static final String ACTION_DEFINITION_NAME = "action-def-name";
@@ -82,7 +81,7 @@ public class RuleTest
public void testFromRuleModelWithNullValues() public void testFromRuleModelWithNullValues()
{ {
final org.alfresco.service.cmr.rule.Rule ruleModel = new org.alfresco.service.cmr.rule.Rule(); 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 // when
final Rule actualRule = Rule.from(ruleModel, compositeConditionMapper); final Rule actualRule = Rule.from(ruleModel, compositeConditionMapper);
@@ -141,9 +140,9 @@ public class RuleTest
.id(RULE_ID) .id(RULE_ID)
.name(RULE_NAME) .name(RULE_NAME)
.description(RULE_DESCRIPTION) .description(RULE_DESCRIPTION)
.enabled(RULE_ENABLED) .isEnabled(RULE_ENABLED)
.cascade(RULE_CASCADE) .isInheritable(RULE_INHERITABLE)
.asynchronous(RULE_ASYNC) .isAsynchronous(RULE_ASYNC)
.triggers(List.of(RuleTrigger.INBOUND, RuleTrigger.UPDATE)) .triggers(List.of(RuleTrigger.INBOUND, RuleTrigger.UPDATE))
.errorScript(ERROR_SCRIPT) .errorScript(ERROR_SCRIPT)
.conditions(compositeConditionMapper.toRestModel(Collections.emptyList())) .conditions(compositeConditionMapper.toRestModel(Collections.emptyList()))
@@ -156,7 +155,7 @@ public class RuleTest
ruleModel.setTitle(RULE_NAME); ruleModel.setTitle(RULE_NAME);
ruleModel.setDescription(RULE_DESCRIPTION); ruleModel.setDescription(RULE_DESCRIPTION);
ruleModel.setRuleDisabled(!RULE_ENABLED); ruleModel.setRuleDisabled(!RULE_ENABLED);
ruleModel.applyToChildren(RULE_CASCADE); ruleModel.applyToChildren(RULE_INHERITABLE);
ruleModel.setExecuteAsynchronously(RULE_ASYNC); ruleModel.setExecuteAsynchronously(RULE_ASYNC);
ruleModel.setRuleTypes(List.of(RuleType.INBOUND, RuleType.UPDATE)); ruleModel.setRuleTypes(List.of(RuleType.INBOUND, RuleType.UPDATE));
ruleModel.setAction(createActionModel()); ruleModel.setAction(createActionModel());