diff --git a/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java b/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java index 874dbdf1b3..a4c286973e 100644 --- a/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java +++ b/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java @@ -94,6 +94,7 @@ public class ActionsImpl implements Actions map(this::toModel). collect(Collectors.toList()); return new ActionDefinition( + actionDefinition.getName(), // ID is a synonym for name. actionDefinition.getName(), actionDefinition.getTitle(), actionDefinition.getDescription(), diff --git a/src/main/java/org/alfresco/rest/api/model/ActionDefinition.java b/src/main/java/org/alfresco/rest/api/model/ActionDefinition.java index 7dc98c3864..c9a9cdf137 100644 --- a/src/main/java/org/alfresco/rest/api/model/ActionDefinition.java +++ b/src/main/java/org/alfresco/rest/api/model/ActionDefinition.java @@ -29,6 +29,7 @@ import java.util.List; public class ActionDefinition { + private String id; private String name; private String title; private String description; @@ -44,7 +45,8 @@ public class ActionDefinition { } - public ActionDefinition(String name, + public ActionDefinition(String id, + String name, String title, String description, List applicableTypes, @@ -52,6 +54,7 @@ public class ActionDefinition boolean trackStatus, List parameterDefinitions) { + this.id = id; this.name = name; this.title = title; this.description = description; @@ -62,11 +65,11 @@ public class ActionDefinition } /** - * Synonym for name. + * Will be used as a synonym for name. */ public String getId() { - return getName(); + return id; } public String getName() diff --git a/src/test/java/org/alfresco/rest/api/tests/TestActions.java b/src/test/java/org/alfresco/rest/api/tests/TestActions.java index 36268da546..365dc3e40c 100644 --- a/src/test/java/org/alfresco/rest/api/tests/TestActions.java +++ b/src/test/java/org/alfresco/rest/api/tests/TestActions.java @@ -399,6 +399,12 @@ public class TestActions extends AbstractBaseApiTest assertEquals(expectedActions, retrievedActions); } + // Badly formed request -> 400 + { + PublicApiClient.Paging paging = getPaging(0, -1); // -1 is not acceptable + actions.getActionDefinitionsForNode(validNode.getId(), createParams(paging, null), 400); + } + // Non-existent node ID { NodeRef nodeRef = new NodeRef( @@ -408,5 +414,11 @@ public class TestActions extends AbstractBaseApiTest actions.getActionDefinitionsForNode(nodeRef.getId(), emptyParams, 404); } + + // Unauthorized -> 401 + { + publicApiClient.setRequestContext(new RequestContext(account1.getId(), person1, "invalid-password")); + actions.getActionDefinitionsForNode(validNode.getId(), emptyParams, 401); + } } }