ACS-4863 Allow referencing nodes by aliases for tag and category application. (#1822)

remote-api/src/main/java/org/alfresco/rest/api/impl/CategoriesImpl.java

@@ -189,7 +189,7 @@ public class CategoriesImpl implements Categories
     @Override
     public List<Category> listCategoriesForNode(final String nodeId, final Parameters parameters)
     {
-        final NodeRef contentNodeRef = nodes.validateNode(nodeId);
+        final NodeRef contentNodeRef = nodes.validateOrLookupNode(nodeId, null);
         verifyReadPermission(contentNodeRef);
         verifyNodeType(contentNodeRef);
 
@@ -211,7 +211,7 @@ public class CategoriesImpl implements Categories
             throw new InvalidArgumentException(NOT_A_VALID_CATEGORY);
         }
 
-        final NodeRef contentNodeRef = nodes.validateNode(nodeId);
+        final NodeRef contentNodeRef = nodes.validateOrLookupNode(nodeId, null);
         verifyChangePermission(contentNodeRef);
         verifyNodeType(contentNodeRef);
 
@@ -237,7 +237,7 @@ public class CategoriesImpl implements Categories
     public void unlinkNodeFromCategory(final StoreRef storeRef, final String nodeId, final String categoryId, final Parameters parameters)
     {
         final NodeRef categoryNodeRef = getCategoryNodeRef(storeRef, categoryId);
-        final NodeRef contentNodeRef = nodes.validateNode(nodeId);
+        final NodeRef contentNodeRef = nodes.validateOrLookupNode(nodeId, null);
         verifyChangePermission(contentNodeRef);
         verifyNodeType(contentNodeRef);
 

remote-api/src/main/java/org/alfresco/rest/api/impl/TagsImpl.java

@@ -25,11 +25,12 @@
  */
 package org.alfresco.rest.api.impl;
 
+import static java.util.stream.Collectors.toList;
+
 import static org.alfresco.rest.antlr.WhereClauseParser.EQUALS;
 import static org.alfresco.rest.antlr.WhereClauseParser.IN;
 import static org.alfresco.rest.antlr.WhereClauseParser.MATCHES;
 
-import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -116,38 +117,24 @@ public class TagsImpl implements Tags
 
     public List<Tag> addTags(String nodeId, final List<Tag> tags)
     {
-	        NodeRef nodeRef = nodes.validateNode(nodeId);
+        NodeRef nodeRef = nodes.validateOrLookupNode(nodeId, null);
-			if(!typeConstraint.matches(nodeRef))
+        if (!typeConstraint.matches(nodeRef))
         {
             throw new UnsupportedResourceOperationException("Cannot tag this node");
         }
 
-	        List<String> tagValues = new AbstractList<String>()
+        List<String> tagValues = tags.stream().map(Tag::getTag).collect(toList());
-            {
-                @Override
-                public String get(int arg0)
-                {
-                	String tag = tags.get(arg0).getTag();
-                    return tag;
-                }
-    
-                @Override
-                public int size()
-                {
-                    return tags.size();
-                }
-            };
         try
         {
             List<Pair<String, NodeRef>> tagNodeRefs = taggingService.addTags(nodeRef, tagValues);
-		        List<Tag> ret = new ArrayList<Tag>(tags.size());
+            List<Tag> ret = new ArrayList<>(tags.size());
-		        for(Pair<String, NodeRef> pair : tagNodeRefs)
+            for (Pair<String, NodeRef> pair : tagNodeRefs)
             {
                 ret.add(new Tag(pair.getSecond(), pair.getFirst()));
             }
             return ret;
         }
-            catch(IllegalArgumentException e)
+        catch (IllegalArgumentException e)
         {
             throw new InvalidArgumentException(e.getMessage());
         }
@@ -254,11 +241,11 @@ public class TagsImpl implements Tags
 
     public CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params)
     {
-		NodeRef nodeRef = nodes.validateNode(nodeId);
+        NodeRef nodeRef = nodes.validateOrLookupNode(nodeId, null);
         PagingResults<Pair<NodeRef, String>> results = taggingService.getTags(nodeRef, Util.getPagingRequest(params.getPaging()));
         Integer totalItems = results.getTotalResultCount().getFirst();
         List<Pair<NodeRef, String>> page = results.getPage();
-    	List<Tag> tags = new ArrayList<Tag>(page.size());
+        List<Tag> tags = new ArrayList<>(page.size());
         for(Pair<NodeRef, String> pair : page)
         {
             tags.add(new Tag(pair.getFirst(), pair.getSecond()));
@@ -276,7 +263,7 @@ public class TagsImpl implements Tags
 			.filter(Objects::nonNull)
 			.map(Tag::getTag)
 			.distinct()
-			.collect(Collectors.toList());
+			.collect(toList());
 
 		if (CollectionUtils.isEmpty(tagNames))
 		{
@@ -290,7 +277,7 @@ public class TagsImpl implements Tags
 				{
 					tag.setCount(0);
 				}
-			}).collect(Collectors.toList());
+			}).collect(toList());
 	}
 
 	private void verifyAdminAuthority()

remote-api/src/test/java/org/alfresco/rest/api/impl/CategoriesImplTest.java

@@ -128,7 +128,7 @@ public class CategoriesImplTest
     {
         given(authorityServiceMock.hasAdminAuthority()).willReturn(true);
         given(nodesMock.validateNode(CATEGORY_ID)).willReturn(CATEGORY_NODE_REF);
-        given(nodesMock.validateNode(CONTENT_NODE_ID)).willReturn(CONTENT_NODE_REF);
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willReturn(CONTENT_NODE_REF);
         given(nodesMock.isSubClass(any(), any(), anyBoolean())).willReturn(true);
         given(typeConstraint.matches(any())).willReturn(true);
         given(permissionServiceMock.hasReadPermission(any())).willReturn(AccessStatus.ALLOWED);
@@ -900,7 +900,7 @@ public class CategoriesImplTest
         // when
         final List<Category> actualLinkedCategories = objectUnderTest.linkNodeToCategories(CONTENT_NODE_ID, categoryLinks, parametersMock);
 
-        then(nodesMock).should().validateNode(CONTENT_NODE_ID);
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID, null);
         then(permissionServiceMock).should().hasPermission(CONTENT_NODE_REF, PermissionService.CHANGE_PERMISSIONS);
         then(permissionServiceMock).shouldHaveNoMoreInteractions();
         then(typeConstraint).should().matches(CONTENT_NODE_REF);
@@ -1011,12 +1011,12 @@ public class CategoriesImplTest
     @Test
     public void testLinkNodeToCategories_withInvalidNodeId()
     {
-        given(nodesMock.validateNode(CONTENT_NODE_ID)).willThrow(EntityNotFoundException.class);
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willThrow(EntityNotFoundException.class);
 
         // when
         final Throwable actualException = catchThrowable(() -> objectUnderTest.linkNodeToCategories(CONTENT_NODE_ID, List.of(CATEGORY), parametersMock));
 
-        then(nodesMock).should().validateNode(CONTENT_NODE_ID);
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID, null);
         then(permissionServiceMock).shouldHaveNoInteractions();
         then(nodeServiceMock).shouldHaveNoInteractions();
         assertThat(actualException)
@@ -1031,7 +1031,7 @@ public class CategoriesImplTest
         // when
         final Throwable actualException = catchThrowable(() -> objectUnderTest.linkNodeToCategories(CONTENT_NODE_ID, List.of(CATEGORY), parametersMock));
 
-        then(nodesMock).should().validateNode(CONTENT_NODE_ID);
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID, null);
         then(permissionServiceMock).should().hasPermission(CONTENT_NODE_REF, PermissionService.CHANGE_PERMISSIONS);
         then(nodeServiceMock).shouldHaveNoInteractions();
         assertThat(actualException)
@@ -1118,7 +1118,7 @@ public class CategoriesImplTest
         objectUnderTest.unlinkNodeFromCategory(CONTENT_NODE_ID, CATEGORY_ID, parametersMock);
 
         then(nodesMock).should().validateNode(CATEGORY_ID);
-        then(nodesMock).should().validateNode(CONTENT_NODE_ID);
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID, null);
         then(permissionServiceMock).should().hasPermission(CONTENT_NODE_REF, PermissionService.CHANGE_PERMISSIONS);
         then(permissionServiceMock).shouldHaveNoMoreInteractions();
         then(typeConstraint).should().matches(CONTENT_NODE_REF);
@@ -1155,7 +1155,7 @@ public class CategoriesImplTest
         // when
         final List<Category> actualCategories = objectUnderTest.listCategoriesForNode(CONTENT_NODE_ID, parametersMock);
 
-        then(nodesMock).should().validateNode(CONTENT_NODE_ID);
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID, null);
         then(permissionServiceMock).should().hasReadPermission(CONTENT_NODE_REF);
         then(permissionServiceMock).shouldHaveNoMoreInteractions();
         then(typeConstraint).should().matches(CONTENT_NODE_REF);
@@ -1176,12 +1176,12 @@ public class CategoriesImplTest
     @Test
     public void testListCategoriesForNode_withInvalidNodeId()
     {
-        given(nodesMock.validateNode(CONTENT_NODE_ID)).willThrow(EntityNotFoundException.class);
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willThrow(EntityNotFoundException.class);
 
         // when
         final Throwable actualException = catchThrowable(() -> objectUnderTest.listCategoriesForNode(CONTENT_NODE_ID, parametersMock));
 
-        then(nodesMock).should().validateNode(CONTENT_NODE_ID);
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID, null);
         then(nodeServiceMock).shouldHaveNoInteractions();
         assertThat(actualException)
             .isInstanceOf(EntityNotFoundException.class);
@@ -1195,7 +1195,7 @@ public class CategoriesImplTest
         // when
         final Throwable actualException = catchThrowable(() -> objectUnderTest.listCategoriesForNode(CONTENT_NODE_ID, parametersMock));
 
-        then(nodesMock).should().validateNode(CONTENT_NODE_ID);
+        then(nodesMock).should().validateOrLookupNode(CONTENT_NODE_ID, null);
         then(permissionServiceMock).should().hasReadPermission(CONTENT_NODE_REF);
         then(nodeServiceMock).shouldHaveNoInteractions();
         assertThat(actualException)

remote-api/src/test/java/org/alfresco/rest/api/impl/TagsImplTest.java

@@ -25,6 +25,8 @@
  */
 package org.alfresco.rest.api.impl;
 
+import static java.util.stream.Collectors.toList;
+
 import static org.alfresco.rest.api.impl.TagsImpl.NOT_A_VALID_TAG;
 import static org.alfresco.rest.api.impl.TagsImpl.NO_PERMISSION_TO_MANAGE_A_TAG;
 import static org.alfresco.service.cmr.repository.StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
@@ -41,7 +43,6 @@ import static org.mockito.BDDMockito.then;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
@@ -50,6 +51,7 @@ import org.alfresco.rest.api.model.Tag;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
+import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
@@ -63,6 +65,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.tagging.TaggingService;
 import org.alfresco.util.Pair;
+import org.alfresco.util.TypeConstraint;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -77,7 +80,9 @@ public class TagsImplTest
     private static final String PARENT_NODE_ID = "tag:tag-root";
     private static final String TAG_NAME = "tag-dummy-name";
     private static final NodeRef TAG_NODE_REF = new NodeRef(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID.concat("-").concat(TAG_NAME));
-    private static final NodeRef TAG_PARENT_NODE_REF = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_NODE_ID);
+    private static final NodeRef TAG_PARENT_NODE_REF = new NodeRef(STORE_REF_WORKSPACE_SPACESSTORE, PARENT_NODE_ID);
+    private static final String CONTENT_NODE_ID = "content-node-id";
+    private static final NodeRef CONTENT_NODE_REF = new NodeRef(STORE_REF_WORKSPACE_SPACESSTORE, CONTENT_NODE_ID);
 
     private final RecognizedParamsExtractor queryExtractor = new RecognizedParamsExtractor() {};
 
@@ -97,6 +102,8 @@ public class TagsImplTest
     private Paging pagingMock;
     @Mock
     private PagingResults<Pair<NodeRef, String>> pagingResultsMock;
+    @Mock
+    private TypeConstraint typeConstraintMock;
 
     @InjectMocks
     private TagsImpl objectUnderTest;
@@ -122,7 +129,7 @@ public class TagsImplTest
 
         then(taggingServiceMock).should().getTags(eq(STORE_REF_WORKSPACE_SPACESSTORE), any(PagingRequest.class), isNull(), isNull());
         then(taggingServiceMock).shouldHaveNoMoreInteractions();
-        final List<Tag> expectedTags = createTagsWithNodeRefs(List.of(TAG_NAME)).stream().peek(tag -> tag.setCount(0)).collect(Collectors.toList());
+        final List<Tag> expectedTags = createTagsWithNodeRefs(List.of(TAG_NAME)).stream().peek(tag -> tag.setCount(0)).collect(toList());
         assertEquals(expectedTags, actualTags.getCollection());
     }
 
@@ -140,7 +147,7 @@ public class TagsImplTest
         then(taggingServiceMock).should().findTaggedNodesAndCountByTagName(STORE_REF_WORKSPACE_SPACESSTORE);
         final List<Tag> expectedTags = createTagsWithNodeRefs(List.of(TAG_NAME)).stream()
             .peek(tag -> tag.setCount(0))
-            .collect(Collectors.toList());
+            .collect(toList());
         assertEquals(expectedTags, actualTags.getCollection());
     }
 
@@ -395,7 +402,7 @@ public class TagsImplTest
 
         final List<Tag> expectedTags = createTagsWithNodeRefs(tagNames).stream()
             .peek(tag -> tag.setCount(0))
-            .collect(Collectors.toList());
+            .collect(toList());
         assertThat(actualCreatedTags)
             .isNotNull()
             .isEqualTo(expectedTags);
@@ -405,18 +412,78 @@ public class TagsImplTest
     public void testGetTagByIdNotFoundValidation()
     {
         given(primaryParentMock.getParentRef()).willReturn(TAG_NODE_REF);
-        objectUnderTest.getTag(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,TAG_ID);
+        objectUnderTest.getTag(STORE_REF_WORKSPACE_SPACESSTORE,TAG_ID);
         then(nodeServiceMock).shouldHaveNoInteractions();
-        then(nodesMock).should().validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID);
+        then(nodesMock).should().validateNode(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID);
         then(nodesMock).shouldHaveNoMoreInteractions();
         then(taggingServiceMock).shouldHaveNoInteractions();
     }
 
+    @Test
+    public void testAddTags()
+    {
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willReturn(CONTENT_NODE_REF);
+        given(typeConstraintMock.matches(CONTENT_NODE_REF)).willReturn(true);
+        List<Pair<String, NodeRef>> pairs = List.of(new Pair<>("tagA", new NodeRef("tag://A/")), new Pair<>("tagB", new NodeRef("tag://B/")));
+        List<String> tagNames = pairs.stream().map(Pair::getFirst).collect(toList());
+        List<Tag> tags = tagNames.stream().map(name -> Tag.builder().tag(name).create()).collect(toList());
+        given(taggingServiceMock.addTags(CONTENT_NODE_REF, tagNames)).willReturn(pairs);
+
+        List<Tag> actual = objectUnderTest.addTags(CONTENT_NODE_ID, tags);
+
+        List<Tag> expected = pairs.stream().map(pair -> new Tag(pair.getSecond(), pair.getFirst())).collect(toList());
+        assertEquals("Unexpected tags returned.", expected, actual);
+    }
+
+    @Test(expected = InvalidArgumentException.class)
+    public void testAddTagsToInvalidNode()
+    {
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willThrow(new InvalidArgumentException());
+        List<Tag> tags = List.of(Tag.builder().tag("tag1").create());
+
+        objectUnderTest.addTags(CONTENT_NODE_ID, tags);
+    }
+
+    @Test(expected = UnsupportedResourceOperationException.class)
+    public void testAddTagsToWrongTypeOfNode()
+    {
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willReturn(CONTENT_NODE_REF);
+        given(typeConstraintMock.matches(CONTENT_NODE_REF)).willReturn(false);
+
+        List<Tag> tags = List.of(Tag.builder().tag("tag1").create());
+
+        objectUnderTest.addTags(CONTENT_NODE_ID, tags);
+    }
+
+    @Test
+    public void testGetTagsForNode()
+    {
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willReturn(CONTENT_NODE_REF);
+        given(parametersMock.getPaging()).willReturn(pagingMock);
+        List<Pair<NodeRef, String>> pairs = List.of(new Pair<>(new NodeRef("tag://A/"), "tagA"), new Pair<>(new NodeRef("tag://B/"), "tagB"));
+        given(taggingServiceMock.getTags(eq(CONTENT_NODE_REF), any(PagingRequest.class))).willReturn(pagingResultsMock);
+        given(pagingResultsMock.getTotalResultCount()).willReturn(new Pair<>(null, null));
+        given(pagingResultsMock.getPage()).willReturn(pairs);
+
+        CollectionWithPagingInfo<Tag> actual = objectUnderTest.getTags(CONTENT_NODE_ID, parametersMock);
+
+        List<Tag> tags = pairs.stream().map(pair -> Tag.builder().tag(pair.getSecond()).nodeRef(pair.getFirst()).create()).collect(toList());
+        assertEquals(actual.getCollection(), tags);
+    }
+
+    @Test (expected = InvalidArgumentException.class)
+    public void testGetTagsFromInvalidNode()
+    {
+        given(nodesMock.validateOrLookupNode(CONTENT_NODE_ID, null)).willThrow(new InvalidArgumentException());
+
+        objectUnderTest.getTags(CONTENT_NODE_ID, parametersMock);
+    }
+
     private static List<Pair<String, NodeRef>> createTagAndNodeRefPairs(final List<String> tagNames)
     {
         return tagNames.stream()
             .map(tagName -> createPair(tagName, new NodeRef(STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID.concat("-").concat(tagName))))
-            .collect(Collectors.toList());
+            .collect(toList());
     }
 
     private static Pair<String, NodeRef> createPair(final String tagName, final NodeRef nodeRef)
@@ -426,12 +493,12 @@ public class TagsImplTest
 
     private static List<Tag> createTags(final List<String> tagNames)
     {
-        return tagNames.stream().map(TagsImplTest::createTag).collect(Collectors.toList());
+        return tagNames.stream().map(TagsImplTest::createTag).collect(toList());
     }
 
     private static List<Tag> createTagsWithNodeRefs(final List<String> tagNames)
     {
-        return tagNames.stream().map(TagsImplTest::createTagWithNodeRef).collect(Collectors.toList());
+        return tagNames.stream().map(TagsImplTest::createTagWithNodeRef).collect(toList());
     }
 
     private static Tag createTag(final String tagName)