Addressed review comments

2025-10-29 15:21:53 +00:00 · 2023-03-01 11:21:24 +05:30 · 2023-02-28 20:07:34 +05:30 · 2023-02-28 17:16:54 +05:30 · 2023-02-27 20:51:22 +05:30 · 2023-02-27 20:00:29 +05:30
28 changed files with 90 additions and 28 deletions
--- a/.github/workflows/master_release.yml
+++ b/.github/workflows/master_release.yml
@@ -27,7 +27,7 @@ jobs:
    runs-on: ubuntu-latest
    needs: [run_ci]
    if: >
-      !failure() &&
+      !(failure() || cancelled()) &&
      !contains(github.event.head_commit.message, '[no release]') &&
      github.event_name != 'pull_request'
    steps:
@@ -55,7 +55,7 @@ jobs:
    runs-on: ubuntu-latest
    needs: [push_to_nexus]
    if: >
-      !failure() &&
+      !(failure() || cancelled()) &&
      !contains(github.event.head_commit.message, '[no downstream]') &&
      github.event_name != 'pull_request'
    steps:
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>20.86</version>
+      <version>20.90-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>20.86</version>
+      <version>20.90-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>20.86</version>
+      <version>20.90-SNAPSHOT</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>20.86</version>
+      <version>20.90-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>20.86</version>
+      <version>20.90-SNAPSHOT</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>20.86</version>
+      <version>20.90-SNAPSHOT</version>
   </parent>

   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-community-repo</artifactId>
-    <version>20.86</version>
+    <version>20.90-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -148,7 +148,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>20.86</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/TagsImpl.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/TagsImpl.java
@@ -108,6 +108,7 @@ public class TagsImpl implements Tags
 	        List<String> tagValues = new AbstractList<String>()
            {
                @Override
+
                public String get(int arg0)
                {
                	String tag = tags.get(arg0).getTag();
@@ -124,9 +125,14 @@ public class TagsImpl implements Tags
            {
 		        List<Pair<String, NodeRef>> tagNodeRefs = taggingService.addTags(nodeRef, tagValues);
 		        List<Tag> ret = new ArrayList<Tag>(tags.size());
+				List<Pair<String, Integer>> tagsCountPairList = taggingService.findTaggedNodesAndCountByTagName(nodeRef.getStoreRef());
+				Map<String, Integer> tagsCountMap = tagsCountPairList.stream().collect(Collectors.toMap(Pair::getFirst,Pair::getSecond));
 		        for(Pair<String, NodeRef> pair : tagNodeRefs)
 		        {
-		        	ret.add(new Tag(pair.getSecond(), pair.getFirst()));
+					Tag createdTag=new Tag(pair.getSecond(), pair.getFirst());
+					// The new use of the tag will not be indexed yet, so add one to whatever count we get back
+					createdTag.setCount(Optional.ofNullable(tagsCountMap.get(createdTag.getTag())).orElse(0) + 1);
+		        	ret.add(createdTag);
 		        }
 		        return ret;
            }
@@ -279,6 +285,7 @@ public class TagsImpl implements Tags
 			.peek(tag -> {
 				if (parameters.getInclude().contains(PARAM_INCLUDE_COUNT))
 				{
+					// this method creates orphan tags, which are not related with any content so setting count to 0.
 					tag.setCount(0);
 				}
 			}).collect(Collectors.toList());
--- a/remote-api/src/main/java/org/alfresco/rest/api/model/Tag.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Tag.java
@@ -130,6 +130,20 @@ public class Tag implements Comparable<Tag>
 				return false;
 		} else if (!nodeRef.equals(other.nodeRef))
 			return false;
+		if(tag==null)
+		{
+			if(other.tag != null)
+				return false;
+		}
+		else if (!tag.equals(other.tag))
+			return false;
+		if (count == null)
+		{
+			if (other.count != null)
+				return false;
+		}
+		else if (!count.equals(other.count))
+			return false;
 		return true;
 	}

--- a/remote-api/src/test/java/org/alfresco/rest/api/impl/TagsImplTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/TagsImplTest.java
@@ -40,6 +40,7 @@ import java.util.List;
 import java.util.stream.Collectors;

 import org.alfresco.rest.api.Nodes;
+import org.alfresco.rest.api.model.Node;
 import org.alfresco.rest.api.model.Tag;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
@@ -51,6 +52,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;
@@ -62,17 +64,22 @@ import org.mockito.junit.MockitoJUnitRunner;
 public class TagsImplTest
 {
    private static final String TAG_ID = "tag-node-id";
+    private static final String NODE_ID = "node-id";
    private static final String TAG_NAME = "tag-dummy-name";
    private static final NodeRef TAG_NODE_REF = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID);

    @Mock
    private Nodes nodesMock;
    @Mock
+    private Node createdNodeMock;
+    @Mock
    private AuthorityService authorityServiceMock;
    @Mock
    private TaggingService taggingServiceMock;
    @Mock
    private Parameters parametersMock;
+    @Mock
+    private TypeConstraint typeConstraint;

    @InjectMocks
    private TagsImpl objectUnderTest;
@@ -81,9 +88,14 @@ public class TagsImplTest
    public void setup()
    {
        given(authorityServiceMock.hasAdminAuthority()).willReturn(true);
+        given(nodesMock.validateNode(NODE_ID)).willReturn(TAG_NODE_REF);
        given(nodesMock.validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TAG_ID)).willReturn(TAG_NODE_REF);
+        given(nodesMock.getNode(any())).willReturn(createdNodeMock);
+        given(createdNodeMock.getNodeId()).willReturn(NODE_ID);
+        given(typeConstraint.matches(any())).willReturn(true);
        given(taggingServiceMock.getTagName(TAG_NODE_REF)).willReturn(TAG_NAME);
    }
+
    @Test
    public void testGetTags() {
        final List<String> tagNames = List.of("testTag","tag11");
@@ -302,4 +314,33 @@ public class TagsImplTest
            .tag(tagName)
            .create();
    }
+
+    @Test
+    public void testAddTagsToNode()
+    {
+        final List<String> tagNames = List.of("tag1","tag2");
+        final List<Tag> tagsToCreate = createTags(tagNames);
+        given(taggingServiceMock.addTags(any(), any())).willAnswer(invocation -> createTagAndNodeRefPairs(invocation.getArgument(1)));
+        final List<Tag> actualCreatedTags = objectUnderTest.addTags(nodesMock.getNode(any()).getNodeId(),tagsToCreate);
+        then(taggingServiceMock).should().addTags(TAG_NODE_REF, tagNames);
+        final List<Tag> expectedTags = createTagsWithNodeRefs(tagNames).stream().peek(tag -> tag.setCount(1)).collect(Collectors.toList());;
+        assertThat(actualCreatedTags)
+                .isNotNull()
+                .isEqualTo(expectedTags);
+    }
+
+    @Test
+    public void testAddTagsToNodeWithResponseNotIndexed()
+    {
+        final List<String> tagNames = List.of("tag1","tag2");
+        final List<Tag> tagsToCreate = createTags(tagNames);
+        given(taggingServiceMock.addTags(any(), any())).willAnswer(invocation -> createTagAndNodeRefPairs(invocation.getArgument(1)));
+        final List<Tag> actualCreatedTags = objectUnderTest.addTags(nodesMock.getNode(any()).getNodeId(),tagsToCreate);
+        then(taggingServiceMock).should().addTags(TAG_NODE_REF, tagNames);
+        final List<Tag> expectedTags = createTagsWithNodeRefs(tagNames).stream().peek(tag -> tag.setCount(1)).collect(Collectors.toList());;
+        assertThat(actualCreatedTags)
+                .isNotNull()
+                .isEqualTo(expectedTags);
+    }
+
 }
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>20.86</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <dependencies>
Author	SHA1	Message	Date
suneet.gupta	e737daa801	Addressed review comments	2023-03-01 11:21:24 +05:30
suneet.gupta	640a1120fd	Addressed review comments	2023-02-28 20:07:34 +05:30
suneet.gupta	803cea84e3	Addressed review comments	2023-02-28 17:16:54 +05:30
suneet.gupta	db2da8338a	Merge branch 'master' of github.com:Alfresco/alfresco-community-repo into ACS-4636_TagCreationCountIssue	2023-02-27 20:51:22 +05:30
suneet.gupta	bb5e4d42ac	Addressed review comments	2023-02-27 20:00:29 +05:30
atkumar	dbe0d75764	Addressed review comments.	2023-02-27 19:09:42 +05:30
alfresco-build	c2d13e3177	[maven-release-plugin][skip ci] prepare for next development iteration	2023-02-27 11:08:57 +00:00
alfresco-build	e8f50da5a2	[maven-release-plugin][skip ci] prepare release 20.89	2023-02-27 11:08:54 +00:00
Tom Page	2053e3b83a	Code freeze testing.	2023-02-27 09:35:11 +00:00
alfresco-build	bcc2eadba6	[maven-release-plugin][skip ci] prepare for next development iteration	2023-02-26 00:06:28 +00:00
alfresco-build	eb40dd3a45	[maven-release-plugin][skip ci] prepare release 20.88	2023-02-26 00:06:25 +00:00
Alfresco CI User	4c511423d5	[force] Force release for 2023-02-26.	2023-02-26 00:03:24 +00:00
alfresco-build	b12b21e773	[maven-release-plugin][skip ci] prepare for next development iteration	2023-02-24 07:28:12 +00:00
alfresco-build	569078f408	[maven-release-plugin][skip ci] prepare release 20.87	2023-02-24 07:28:08 +00:00
Damian Ujma	90de678d7d	ACS-3750 Fix cancelled workflow condition (#1768 )	2023-02-23 16:11:09 +01:00
pjoshi31	093bee9ace	reverting getTags	2023-02-23 17:12:27 +05:30
pjoshi31	e1974e6b26	Setted count on create endpoint	2023-02-23 16:51:57 +05:30
alfresco-build	0a75cbbc67	[maven-release-plugin][skip ci] prepare for next development iteration	2023-02-22 11:38:44 +00:00