testing failure test cases

APPS[2000] Data Dictionary folder deletion behaviour should be consistent
[maven-release-plugin][skip ci] prepare for next development iteration
2025-09-10 14:11:58 +00:00 · 2023-07-12 19:09:00 +05:30 · 2023-07-12 13:30:51 +05:30 · 2023-07-11 14:48:58 +00:00 · 2023-07-11 14:48:55 +00:00 · 2023-07-11 16:03:52 +02:00
31 changed files with 228 additions and 63 deletions
--- 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>23.1.0.155</version>
+      <version>23.1.0.163-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>23.1.0.155</version>
+      <version>23.1.0.163-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>23.1.0.155</version>
+      <version>23.1.0.163-SNAPSHOT</version>
   </parent>

   <build>
@@ -82,7 +82,7 @@
      <dependency>
         <groupId>com.github.docker-java</groupId>
         <artifactId>docker-java</artifactId>
-         <version>3.3.0</version>
+         <version>3.3.2</version>
      </dependency>
   </dependencies>
 </project>
--- 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>23.1.0.155</version>
+      <version>23.1.0.163-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>23.1.0.155</version>
+      <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+      <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-SNAPSHOT</version>
    </parent>

    <properties>
--- a/data-model/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java
+++ b/data-model/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java
@@ -201,6 +201,11 @@ public class SearchParameters implements BasicSearchParameters

    private String timezone;
    
+    /**
+     * Configure the limit to track the total hits on search results
+     */
+    private int trackTotalHits;
+
    /**
     * Default constructor
     */
@@ -251,6 +256,7 @@ public class SearchParameters implements BasicSearchParameters
        sp.stats = this.stats;
        sp.ranges = this.ranges;
        sp.timezone = this.timezone;
+        sp.trackTotalHits = this.trackTotalHits;
        return sp;
    }
    
@@ -1641,6 +1647,21 @@ public class SearchParameters implements BasicSearchParameters
    {
        this.includeMetadata = includeMetadata;
    }
-    
+
+    public int getTrackTotalHits()
+    {
+        return trackTotalHits;
+    }
+
+    /**
+     * Set a maximum value for the report of total hits. The reported number of hits will never exceed this limit even
+     * if more are found. If unset, the engine’s default tracking limit is applied. To remove any limit, set to -1.
+     *
+     * @param trackTotalHits int
+     */
+    public void setTrackTotalHits(int trackTotalHits)
+    {
+        this.trackTotalHits = trackTotalHits;
+    }

 }
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-SNAPSHOT</version>
    </parent>

    <properties>
@@ -171,14 +171,14 @@
        <dependency>
            <groupId>org.codehaus.groovy</groupId>
            <artifactId>groovy</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
        </dependency>

        <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
        <dependency>
            <groupId>org.codehaus.groovy</groupId>
            <artifactId>groovy-json</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.18</version>
        </dependency>

       <dependency>
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestLimitsModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestLimitsModel.java
@@ -0,0 +1,82 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.search;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RestRequestLimitsModel extends TestModel implements IRestModel<RestRequestLimitsModel>
+{
+    @JsonProperty
+    RestRequestLimitsModel model;
+
+    private Integer permissionEvaluationTime;
+    private Integer permissionEvaluationCount;
+    private Integer trackTotalHitsLimit;
+
+    @Override
+    public RestRequestLimitsModel onModel()
+    {
+        return model;
+    }
+    
+    public RestRequestLimitsModel(Integer permissionEvaluationTime, Integer permissionEvaluationCount,
+            Integer trackTotalHitsLimit)
+    {
+        super();
+        this.permissionEvaluationTime = permissionEvaluationTime;
+        this.permissionEvaluationCount = permissionEvaluationCount;
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
+    }
+
+    public Integer getPermissionEvaluationTime()
+    {
+        return permissionEvaluationTime;
+    }
+    public void setPermissionEvaluationTime(Integer permissionEvaluationTime)
+    {
+        this.permissionEvaluationTime = permissionEvaluationTime;
+    }
+    public Integer getPermissionEvaluationCount()
+    {
+        return permissionEvaluationCount;
+    }
+    public void setPermissionEvaluationCount(Integer permissionEvaluationCount)
+    {
+        this.permissionEvaluationCount = permissionEvaluationCount;
+    }
+    public Integer getTrackTotalHitsLimit()
+    {
+        return trackTotalHitsLimit;
+    }
+    public void setTrackTotalHitsLimit(Integer trackTotalHitsLimit)
+    {
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
+    }
+}
+ 
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java
@@ -79,6 +79,7 @@ public class SearchRequest extends TestModel
    List<SortClause> sort;
    RestRequestDefaultsModel defaults;
    List<RestRequestTemplatesModel> templates;
+    RestRequestLimitsModel limits;

    public SearchRequest()
    {
@@ -302,4 +303,15 @@ public class SearchRequest extends TestModel

        return this;
    }
+
+    public RestRequestLimitsModel getLimits()
+    {
+        return limits;
+    }
+
+    public void setLimits(RestRequestLimitsModel limits)
+    {
+        this.limits = limits;
+    }
+
 }
--- 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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+        <version>23.1.0.163-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>23.1.0.155</version>
+    <version>23.1.0.163-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -54,14 +54,14 @@
        <dependency.alfresco-transform-service.version>3.0.0</dependency.alfresco-transform-service.version>
        <dependency.alfresco-transform-core.version>4.0.0</dependency.alfresco-transform-core.version>
        <dependency.alfresco-greenmail.version>6.9</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.22</dependency.acs-event-model.version>
+        <dependency.acs-event-model.version>0.0.23</dependency.acs-event-model.version>

        <dependency.spring.version>5.3.27</dependency.spring.version>
        <dependency.antlr.version>3.5.3</dependency.antlr.version>
        <dependency.jackson.version>2.15.1</dependency.jackson.version>
        <dependency.cxf.version>3.5.5</dependency.cxf.version>
        <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.44</dependency.webscripts.version>
+        <dependency.webscripts.version>8.45</dependency.webscripts.version>
        <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
        <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
        <dependency.assertj.version>3.24.2</dependency.assertj.version>
@@ -69,6 +69,7 @@
        <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
        <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
        <dependency.gson.version>2.8.9</dependency.gson.version>
+        <dependency.guava.version>32.1.1-jre</dependency.guava.version>
        <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
        <dependency.httpcore.version>4.4.16</dependency.httpcore.version>
        <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
@@ -76,7 +77,7 @@
        <dependency.slf4j.version>2.0.7</dependency.slf4j.version>
        <dependency.log4j.version>2.20.0</dependency.log4j.version>
        <dependency.gytheio.version>0.20.0-A1</dependency.gytheio.version>
-        <dependency.groovy.version>3.0.17</dependency.groovy.version>
+        <dependency.groovy.version>3.0.18</dependency.groovy.version>
        <dependency.tika.version>2.4.1</dependency.tika.version>
        <dependency.spring-security.version>5.8.3</dependency.spring-security.version>
        <dependency.truezip.version>7.7.10</dependency.truezip.version>
@@ -92,7 +93,7 @@
        <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
        <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
        <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
-        <dependency.swagger-parser.version>1.0.66</dependency.swagger-parser.version>
+        <dependency.swagger-parser.version>1.0.67</dependency.swagger-parser.version>
        <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
        <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
        <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
@@ -107,10 +108,10 @@
        <dependency.jakarta-mail-api.version>1.6.5</dependency.jakarta-mail-api.version>
        <dependency.jakarta-json-api.version>1.1.6</dependency.jakarta-json-api.version>
        <dependency.jakarta-json-path.version>2.8.0</dependency.jakarta-json-path.version>
-        <dependency.json-smart.version>2.4.11</dependency.json-smart.version>
+        <dependency.json-smart.version>2.5.0</dependency.json-smart.version>
        <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>

-        <alfresco.googledrive.version>3.4.1</alfresco.googledrive.version>
+        <alfresco.googledrive.version>3.4.2-A2</alfresco.googledrive.version>
        <alfresco.aos-module.version>1.6.1</alfresco.aos-module.version>
        <alfresco.api-explorer.version>23.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

@@ -123,9 +124,9 @@
        <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
        <dependency.tas-utility.version>4.0.4</dependency.tas-utility.version>
        <dependency.rest-assured.version>5.3.1</dependency.rest-assured.version>
-        <dependency.tas-email.version>1.21</dependency.tas-email.version>
-        <dependency.tas-webdav.version>1.16</dependency.tas-webdav.version>
-        <dependency.tas-ftp.version>1.17</dependency.tas-ftp.version>
+        <dependency.tas-email.version>1.23</dependency.tas-email.version>
+        <dependency.tas-webdav.version>1.18</dependency.tas-webdav.version>
+        <dependency.tas-ftp.version>1.18</dependency.tas-ftp.version>
        <dependency.tas-dataprep.version>2.6</dependency.tas-dataprep.version>

        <!-- AGS properties shared between community and enterprise -->
@@ -149,7 +150,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>23.1.0.155</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
@@ -359,7 +360,7 @@
            <dependency>
                <groupId>commons-codec</groupId>
                <artifactId>commons-codec</artifactId>
-                <version>1.15</version>
+                <version>1.16.0</version>
            </dependency>
            <dependency>
                <groupId>commons-lang</groupId>
@@ -771,6 +772,11 @@
                <artifactId>gson</artifactId>
                <version>${dependency.gson.version}</version>
            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${dependency.guava.version}</version>
+            </dependency>
            <dependency>
                <groupId>org.apache.camel</groupId>
                <artifactId>camel-core</artifactId>
@@ -886,7 +892,7 @@
            <dependency>
                <groupId>org.projectlombok</groupId>
                <artifactId>lombok</artifactId>
-                <version>1.18.26</version>
+                <version>1.18.28</version>
                <scope>provided</scope>
            </dependency>
            <dependency>
@@ -1006,7 +1012,7 @@
                <plugin>
                    <groupId>org.codehaus.cargo</groupId>
                    <artifactId>cargo-maven3-plugin</artifactId>
-                    <version>1.10.7</version>
+                    <version>1.10.8</version>
                </plugin>
            </plugins>
        </pluginManagement>
--- 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>23.1.0.155</version>
+        <version>23.1.0.163-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/remote-api/src/main/java/org/alfresco/rest/api/search/impl/SearchMapper.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/impl/SearchMapper.java
@@ -823,6 +823,11 @@ public class SearchMapper
                sp.setLimitBy(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS);
                sp.setMaxPermissionCheckTimeMillis(limits.getPermissionEvaluationTime());
            }
+
+            if(limits.getTrackTotalHitsLimit() != null)
+            {
+                sp.setTrackTotalHits(limits.getTrackTotalHitsLimit());
+            }
        }
    }

--- a/remote-api/src/main/java/org/alfresco/rest/api/search/model/Limits.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/search/model/Limits.java
@@ -37,13 +37,16 @@ public class Limits

    private final Integer permissionEvaluationTime;
    private final Integer permissionEvaluationCount;
+    private final Integer trackTotalHitsLimit;

    @JsonCreator
    public Limits(@JsonProperty("permissionEvaluationTime") Integer permissionEvaluationTime,
-                  @JsonProperty("permissionEvaluationCount") Integer permissionEvaluationCount)
+                  @JsonProperty("permissionEvaluationCount") Integer permissionEvaluationCount,
+                  @JsonProperty("trackTotalHitsLimit") Integer trackTotalHitsLimit)
    {
        this.permissionEvaluationTime = permissionEvaluationTime;
        this.permissionEvaluationCount = permissionEvaluationCount;
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
    }

    public Integer getPermissionEvaluationTime()
@@ -55,4 +58,9 @@ public class Limits
    {
        return permissionEvaluationCount;
    }
+
+    public Integer getTrackTotalHitsLimit()
+    {
+        return trackTotalHitsLimit;
+    }
 }
--- a/remote-api/src/test/java/org/alfresco/rest/api/search/SearchMapperTests.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/search/SearchMapperTests.java
@@ -745,33 +745,56 @@ public class SearchMapperTests
    }

    @Test
-    public void fromLimits() throws Exception
+    public void fromLimits_setNull() throws Exception
    {
        SearchParameters searchParameters = new SearchParameters();
        searchMapper.setDefaults(searchParameters);
-
-        //Doesn't error
        searchMapper.fromLimits(searchParameters, null);
-        assertEquals(500, searchParameters.getLimit());
-        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("LimitBy default value should be unlimited", LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("Limit default value should be 500", 500, searchParameters.getLimit());
+    }

-        searchMapper.fromLimits(searchParameters, new Limits(null, null));
-        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
-        assertEquals(500, searchParameters.getLimit());
-
-        searchMapper.fromLimits(searchParameters, new Limits(null, 34));
-        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
-        assertEquals(34, searchParameters.getMaxPermissionChecks());
-        assertEquals(-1, searchParameters.getLimit());
-        assertEquals(-1, searchParameters.getMaxPermissionCheckTimeMillis());
-
-        searchParameters = new SearchParameters();
+    @Test
+    public void fromLimits_setAllLimitsAsNull() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
        searchMapper.setDefaults(searchParameters);
-        searchMapper.fromLimits(searchParameters, new Limits(1000, null));
+        searchMapper.fromLimits(searchParameters, new Limits(null, null, null));
+        assertEquals("LimitBy default value should be unlimited", LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("Limit default value should be 500", 500, searchParameters.getLimit());
+    }
+
+    @Test
+    public void fromLimits_setPermissionEvaluationCount() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(null, 34, null));
        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
-        assertEquals(1000, searchParameters.getMaxPermissionCheckTimeMillis());
-        assertEquals(-1, searchParameters.getLimit());
-        assertEquals(-1, searchParameters.getMaxPermissionChecks());
+        assertEquals("MaxPermissionChecks should be set", 34, searchParameters.getMaxPermissionChecks());
+        assertEquals("Limit should be -1", -1, searchParameters.getLimit());
+        assertEquals("MaxPermissionCheckTimeMillis should be -1", -1, searchParameters.getMaxPermissionCheckTimeMillis());
+    }
+
+    @Test
+    public void fromLimits_setPermissionEvaluationTime() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(1000, null, null));
+        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
+        assertEquals("MaxPermissionCheckTimeMillis should be set", 1000, searchParameters.getMaxPermissionCheckTimeMillis());
+        assertEquals("Limit should be -1", -1, searchParameters.getLimit());
+        assertEquals("MaxPermissionChecks should be -1", -1, searchParameters.getMaxPermissionChecks());
+    }
+
+    @Test
+    public void fromLimits_setTrackTotalHitsLimit() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(null, null, 10));
+        assertEquals("TrackTotalHits should be set", 10, searchParameters.getTrackTotalHits());
    }

    @Test
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>23.1.0.163-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/repository/src/main/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java
+++ b/repository/src/main/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java
@@ -44,6 +44,7 @@ import java.util.zip.ZipException;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.ActionServiceImpl;
 import org.alfresco.repo.action.ParameterDefinitionImpl;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.importer.ACPImportPackageHandler;
@@ -65,6 +66,8 @@ import org.alfresco.util.TempFileProvider;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.utils.InputStreamStatistics;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;

 /**
 * Importer action executor
@@ -73,6 +76,7 @@ import org.apache.commons.compress.utils.InputStreamStatistics;
 */
 public class ImporterActionExecuter extends ActionExecuterAbstractBase
 {
+    private static Log logger = LogFactory.getLog(ImporterActionExecuter.class);
    public static final String NAME = "import";
    public static final String PARAM_ENCODING = "encoding";
    public static final String PARAM_DESTINATION_FOLDER = "destination";
@@ -242,17 +246,21 @@ public class ImporterActionExecuter extends ActionExecuterAbstractBase
                       //       http://bugs.sun.com/bugdatabase/view_bug.do;:WuuT?bug_id=4820807
                       // We also try to use the extra encoding information if present
                       String encoding = (String) ruleAction.getParameterValue(PARAM_ENCODING);
+                       logger.info("Encoding before: "+encoding);
                       if (encoding == null)
                       {
+                           logger.info("Encoding is null ");
                           encoding = "Cp437";
                       }
                       else
                       {
                           if (encoding.equalsIgnoreCase("default"))
                           {
-                               encoding = null;
+                               logger.info("Encoding is default ");
+                               encoding = "Cp437";
                           }
                       }
+                       logger.info("Encoding after: "+encoding);
                       zipFile = new ZipFile(tempFile, encoding, true);
                       // build a temp dir name based on the ID of the noderef we are importing
                       // also use the long life temp folder as large ZIP files can take a while
Author	SHA1	Message	Date
Praveen Singh	3ffe06391b	testing failure test cases	2023-07-12 19:09:00 +05:30
Praveen Singh	92ff7151d8	APPS[2000] Data Dictionary folder deletion behaviour should be consistent	2023-07-12 13:30:51 +05:30
alfresco-build	d7722e4f25	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-11 14:48:58 +00:00
alfresco-build	6a87008665	[maven-release-plugin][skip ci] prepare release 23.1.0.162	2023-07-11 14:48:55 +00:00
dependabot[bot]	6d14548119	Bump acs-event-model from 0.0.22 to 0.0.23 (#1950 ) Bumps [acs-event-model](https://github.com/Alfresco/acs-event-model) from 0.0.22 to 0.0.23. - [Commits](https://github.com/Alfresco/acs-event-model/commits) --- updated-dependencies: - dependency-name: org.alfresco:acs-event-model dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 16:03:52 +02:00
dependabot[bot]	67c4751676	Bump lombok from 1.18.26 to 1.18.28 (#1960 ) Bumps [lombok](https://github.com/projectlombok/lombok) from 1.18.26 to 1.18.28. - [Release notes](https://github.com/projectlombok/lombok/releases) - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.26...v1.18.28) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 16:03:24 +02:00
MohinishSah	d4a60a1d24	Update pom.xml	2023-07-11 16:59:20 +05:30
MohinishSah	4388a75924	Update pom.xml	2023-07-11 16:46:31 +05:30
dependabot[bot]	5982ec7172	Bump swagger-parser from 1.0.66 to 1.0.67 (#1966 ) Bumps [swagger-parser](https://github.com/swagger-api/swagger-parser) from 1.0.66 to 1.0.67. - [Release notes](https://github.com/swagger-api/swagger-parser/releases) - [Commits](https://github.com/swagger-api/swagger-parser/compare/v1.0.66...v1.0.67) --- updated-dependencies: - dependency-name: io.swagger:swagger-parser dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 13:11:00 +02:00
dependabot[bot]	7f26658eba	Bump webdav from 1.16 to 1.18 (#2055 ) Bumps [webdav](https://github.com/Alfresco/alfresco-tas-webdav) from 1.16 to 1.18. - [Changelog](https://github.com/Alfresco/alfresco-tas-webdav/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/Alfresco/alfresco-tas-webdav/compare/v1.16...v1.18) --- updated-dependencies: - dependency-name: org.alfresco.tas:webdav dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 13:03:14 +02:00
dependabot[bot]	88273f3073	Bump commons-codec from 1.15 to 1.16.0 (#2013 ) Bumps [commons-codec](https://github.com/apache/commons-codec) from 1.15 to 1.16.0. - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.15...rel/commons-codec-1.16.0) --- updated-dependencies: - dependency-name: commons-codec:commons-codec dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 13:02:46 +02:00
alfresco-build	7218864a44	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-11 08:07:36 +00:00
alfresco-build	133dd2b1c1	[maven-release-plugin][skip ci] prepare release 23.1.0.161	2023-07-11 08:07:33 +00:00
dependabot[bot]	ade270743e	Bump json-smart from 2.4.11 to 2.5.0 (#2056 ) Bumps [json-smart](https://github.com/netplex/json-smart-v2) from 2.4.11 to 2.5.0. - [Release notes](https://github.com/netplex/json-smart-v2/releases) - [Commits](https://github.com/netplex/json-smart-v2/compare/2.4.11...2.5.0) --- updated-dependencies: - dependency-name: net.minidev:json-smart dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 09:21:54 +02:00
dependabot[bot]	59b50f0c67	Bump email from 1.21 to 1.23 (#2054 ) Bumps [email](https://github.com/Alfresco/alfresco-tas-email) from 1.21 to 1.23. - [Changelog](https://github.com/Alfresco/alfresco-tas-email/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/Alfresco/alfresco-tas-email/compare/v1.21...v1.23) --- updated-dependencies: - dependency-name: org.alfresco.tas:email dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 09:20:23 +02:00
dependabot[bot]	8837c15a67	Bump ftp from 1.17 to 1.18 (#2053 ) Bumps [ftp](https://github.com/Alfresco/alfresco-tas-ftp) from 1.17 to 1.18. - [Changelog](https://github.com/Alfresco/alfresco-tas-ftp/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/Alfresco/alfresco-tas-ftp/compare/v1.17...v1.18) --- updated-dependencies: - dependency-name: org.alfresco.tas:ftp dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-11 09:20:01 +02:00
dependabot[bot]	bac818baf2	Bump cargo-maven3-plugin from 1.10.7 to 1.10.8 (#2036 ) Bumps cargo-maven3-plugin from 1.10.7 to 1.10.8. --- updated-dependencies: - dependency-name: org.codehaus.cargo:cargo-maven3-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-10 16:36:05 +02:00
dependabot[bot]	2f6c845865	Bump groovy-json from 3.0.17 to 3.0.18 (#2028 ) Bumps [groovy-json](https://github.com/apache/groovy) from 3.0.17 to 3.0.18. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy-json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-10 15:00:36 +02:00
dependabot[bot]	347627d0fd	Bump groovy from 3.0.17 to 3.0.18 (#2029 ) Bumps [groovy](https://github.com/apache/groovy) from 3.0.17 to 3.0.18. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-10 15:00:18 +02:00
alfresco-build	a495dae1db	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-10 10:27:06 +00:00
alfresco-build	a07da7308f	[maven-release-plugin][skip ci] prepare release 23.1.0.160	2023-07-10 10:27:03 +00:00
dependabot[bot]	8b472e89f5	Bump guava from 32.0.1-jre to 32.1.1-jre (#2050 ) Bumps [guava](https://github.com/google/guava) from 32.0.1-jre to 32.1.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-10 11:37:33 +02:00
dependabot[bot]	a3aaaedb0e	Bump docker-java from 3.3.0 to 3.3.2 (#2051 ) Bumps [docker-java](https://github.com/docker-java/docker-java) from 3.3.0 to 3.3.2. - [Release notes](https://github.com/docker-java/docker-java/releases) - [Changelog](https://github.com/docker-java/docker-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/docker-java/docker-java/compare/3.3.0...3.3.2) --- updated-dependencies: - dependency-name: com.github.docker-java:docker-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-10 11:36:16 +02:00
dependabot[bot]	044d07af86	Bump dependency.webscripts.version from 8.44 to 8.45 (#2048 ) Bumps `dependency.webscripts.version` from 8.44 to 8.45. Updates `spring-surf-core-configservice` from 8.44 to 8.45 Updates `spring-webscripts` from 8.44 to 8.45 - [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.44...spring-surf-webscripts-parent-8.45) Updates `spring-webscripts` from 8.44 to 8.45 - [Commits](https://github.com/Alfresco/surf-webscripts/compare/spring-surf-webscripts-parent-8.44...spring-surf-webscripts-parent-8.45) Updates `spring-webscripts-api` from 8.44 to 8.45 --- updated-dependencies: - dependency-name: org.alfresco.surf:spring-surf-core-configservice dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts:tests dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.alfresco.surf:spring-webscripts-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-10 11:26:58 +02:00
alfresco-build	110ccd5574	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-09 00:06:43 +00:00
alfresco-build	8fbe444266	[maven-release-plugin][skip ci] prepare release 23.1.0.159	2023-07-09 00:06:41 +00:00
Alfresco CI User	5ef0bbb840	[force] Force release for 2023-07-09.	2023-07-09 00:03:34 +00:00
alfresco-build	ba5720b494	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-07 09:42:37 +00:00
alfresco-build	866adc16f3	[maven-release-plugin][skip ci] prepare release 23.1.0.158	2023-07-07 09:42:33 +00:00
Tom Page	577788a8c6	PRODSEC-7249 Update guava. (#2047 )	2023-07-07 09:51:27 +01:00
alfresco-build	6b02b4dc05	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-06 09:39:16 +00:00
alfresco-build	fc847ac7a5	[maven-release-plugin][skip ci] prepare release 23.1.0.157	2023-07-06 09:39:13 +00:00
pardhukota-pk	25e8f0c6f8	Adding dummy logs (#2043 ) Co-authored-by: Kota Pardhu <Kota.Pardhu@hyland.com>	2023-07-06 14:21:53 +05:30
alfresco-build	499cf08ecd	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-05 16:22:57 +00:00
alfresco-build	f0c191d7ca	[maven-release-plugin][skip ci] prepare release 23.1.0.156	2023-07-05 16:22:54 +00:00
evasques	a1faf97fc5	ACS-5487 - Track Total Hits on ES (#2041 ) SearchParameters - added trackTotalHits (int) attribute SearchRequest - Added trackTotalHitsLimit (int) to the Limits attribute and mapped it to the SearchParameters Changed the SearchRequest model in TAS to include a new RestRequestLimitsModel that has the new trackTotalHitsLimit attribute SearchMapperTests to test the changes in the SearchParameters	2023-07-05 15:39:36 +01:00
alfresco-build	d372ff6f5e	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-05 12:06:36 +00:00