From ccd421871c34d7460340d7ad922ecc887708e9e8 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 11 Oct 2022 11:27:03 +0100 Subject: [PATCH] ACS-3651 Use Serializable for values in action parameters. --- .../actions/access/AccessRestrictionUtil.java | 20 ++++++++++-------- .../FormProcAdminAccessRestrictionTest.java | 21 ++++++++++--------- .../rest/actions/access/pojo/Action.java | 7 ++++--- pom.xml | 2 +- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/AccessRestrictionUtil.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/AccessRestrictionUtil.java index 42e81e875f..50d127f96f 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/AccessRestrictionUtil.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/AccessRestrictionUtil.java @@ -1,15 +1,17 @@ package org.alfresco.rest.actions.access; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.google.gson.Gson; + import org.alfresco.rest.actions.access.pojo.Action; import org.alfresco.rest.actions.access.pojo.ActionCondition; import org.alfresco.rest.actions.access.pojo.Rule; import org.alfresco.utility.model.UserModel; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class AccessRestrictionUtil { public static final String MAIL_ACTION = "mail"; @@ -19,8 +21,8 @@ public class AccessRestrictionUtil { "Only admin or system user is allowed to define uses of or directly execute this action"; private static final String ERROR_MESSAGE_FAILED_TO_SEND_EMAIL = "Failed to send email to:"; - public static Map createMailParameters(UserModel sender, UserModel recipient) { - Map parameterValues = new HashMap<>(); + public static Map createMailParameters(UserModel sender, UserModel recipient) { + Map parameterValues = new HashMap<>(); parameterValues.put("from", sender.getEmailAddress()); parameterValues.put("to", recipient.getEmailAddress()); parameterValues.put("subject", "Test"); @@ -29,7 +31,7 @@ public class AccessRestrictionUtil { return parameterValues; } - public static Rule createRuleWithAction(String actionName, Map parameterValues) { + public static Rule createRuleWithAction(String actionName, Map parameterValues) { Rule rule = new Rule(); rule.setId(""); rule.setTitle("Test rule title"); @@ -57,7 +59,7 @@ public class AccessRestrictionUtil { return rule; } - public static Action createActionWithParameters(String actionName, Map parameterValues) { + public static Action createActionWithParameters(String actionName, Map parameterValues) { Action compositeAction = new Action(); compositeAction.setActionDefinitionName("composite-action"); @@ -76,7 +78,7 @@ public class AccessRestrictionUtil { } - public static Action createAction(String actionName, Map parameterValues) { + public static Action createAction(String actionName, Map parameterValues) { Action action = new Action(); action.setActionDefinitionName(actionName); action.setParameterValues(parameterValues); diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/FormProcAdminAccessRestrictionTest.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/FormProcAdminAccessRestrictionTest.java index efab76da58..a246ecf2f4 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/FormProcAdminAccessRestrictionTest.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/FormProcAdminAccessRestrictionTest.java @@ -1,5 +1,15 @@ package org.alfresco.rest.actions.access; +import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED; +import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_FIELD; +import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION; +import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createMailParameters; +import static org.alfresco.rest.actions.access.AccessRestrictionUtil.getExpectedEmailSendFailureMessage; +import static org.hamcrest.Matchers.containsString; + +import java.io.Serializable; +import java.util.Map; + import org.alfresco.rest.RestTest; import org.alfresco.rest.core.RestRequest; import org.alfresco.rest.core.RestResponse; @@ -13,15 +23,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.Map; - -import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED; -import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_FIELD; -import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION; -import static org.alfresco.rest.actions.access.AccessRestrictionUtil.createMailParameters; -import static org.alfresco.rest.actions.access.AccessRestrictionUtil.getExpectedEmailSendFailureMessage; -import static org.hamcrest.Matchers.containsString; - public class FormProcAdminAccessRestrictionTest extends RestTest { private static final String ACTION_FORM_PROCESSOR_ENDPOINT = "alfresco/service/api/action/%s/formprocessor"; @@ -75,7 +76,7 @@ public class FormProcAdminAccessRestrictionTest extends RestTest { .assertThat().body(ERROR_MESSAGE_FIELD, containsString(getExpectedEmailSendFailureMessage(testUser))); } - private String generateBody(Map mailParameters) { + private String generateBody(Map mailParameters) { JSONObject json = new JSONObject(); mailParameters.forEach((key, value) -> json.put(PROPERTY_PREFIX + key, value)); diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/pojo/Action.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/pojo/Action.java index d1f746d25d..b8d31f4852 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/pojo/Action.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/access/pojo/Action.java @@ -1,5 +1,6 @@ package org.alfresco.rest.actions.access.pojo; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -8,7 +9,7 @@ public class Action { private String actionedUponNode; private List conditions; private List actions; - private Map parameterValues; + private Map parameterValues; private boolean executeAsynchronously; @@ -47,11 +48,11 @@ public class Action { this.actions = actions; } - public Map getParameterValues() { + public Map getParameterValues() { return parameterValues; } - public void setParameterValues(Map parameterValues) { + public void setParameterValues(Map parameterValues) { this.parameterValues = parameterValues; } } diff --git a/pom.xml b/pom.xml index 2a657dddd0..f047c54c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ 2.7.4 3.0.56 5.2.0 - 1.133 + 1.134 1.9 1.7 1.7