check push test

The code form MMT comes from this project anyway

.gitignore

@@ -24,16 +24,17 @@ target
 *.log.*
 
 # Mobile Tools for Java (J2ME)
-
 .mtj
 .tmp/
 
 # Package Files #
-
 *.jar
 *.war
 *.ear
 
+# maven-shade-plugin for mmt tool
+dependency-reduced-pom.xml
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 
 hs_err_pid*

.travis.yml

@@ -43,6 +43,11 @@ install: travis_retry travis_wait 40 bash scripts/travis/build.sh
 
 jobs:
   include:
+    - name: "Source Clear Scan (SCA)"
+      if: branch = master OR branch =~ /release\/.*/
+      # Run Veracode
+      install: skip
+      script: travis_wait 30 bash scripts/travis/source_clear.sh
 
     - name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
       if: commit_message !~ /\[skip repo\]/

README.md

@@ -2,13 +2,6 @@
 
 [![Build Status](https://travis-ci.com/Alfresco/alfresco-community-repo.svg?branch=master)](https://travis-ci.com/Alfresco/alfresco-community-repo)
 
-This project contains the bulk of the [Alfresco Content Services Repository](https://community.alfresco.com/docs/DOC-6385-project-overview-repository) code.
-
-To make the development process simpler, it brings together code historically in `alfresco-core`,
-`alfresco-data-madel`, `alfresco-repository`, `alfresco-remote-api` and repository specific
-tests and war file creation from `acs-community-packaging`. They exist as sub projects within the Maven Reactor and still
-create the same artifacts.
-
 #### Alfresco Core
 
 Alfresco Core is a library packaged as a jar file which contains the following:
@@ -16,8 +9,6 @@ Alfresco Core is a library packaged as a jar file which contains the following:
 * Canned queries interface and supporting classes
 * Generic encryption supporting classes
 
-Version 7 of the library uses Spring 5, Quartz 2.3 and does not have Hibernate dependency.
-
 #### Alfresco Data Model
 Data model is a library packaged as a jar file which  contains the following:
 * Dictionary, Repository and Search Services interfaces
@@ -31,14 +22,6 @@ Repository is a library packaged as a jar file which contains the following:
 * Various Service implementations
 * Utility classes
 
-Tests are combined into test classes split by test type or Spring application context used in the test, see classes
-in _src/test/java/org/alfresco_. All of these classes as well as individual tests can be run by specifying the test
-class name and a set of DB connection properties. Check the travis.yml file for docker images that should be started
-to provide a suitable test environment. For example:
-~~~
-mvn clean test -Dtest=SomeRepoTest -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql:alfresco -Ddb.username=alfresco -Ddb.password=alfresco
-~~~
-
 #### Alfresco Remote API
 
 Remote API is a library packaged as a jar file which contains the following:
@@ -46,13 +29,10 @@ Remote API is a library packaged as a jar file which contains the following:
 * WebScript implementations including [V1 REST APIs](https://community.alfresco.com/community/ecm/blog/2017/05/02/v1-rest-api-10-things-you-should-know)
 * [OpenCMIS](https://chemistry.apache.org/java/opencmis.html) implementations
 
-Like the `alfresco-repository` tests are combined in test classes split by test type or Spring application context used
-in the test.
-
 #### Artifacts
 The artifacts can be obtained by:
 * downloading from [Alfresco maven repository](https://artifacts.alfresco.com/nexus/content/groups/public)
-* getting as Maven dependency by adding the dependency to your pom file:
+* as Maven dependency by adding the dependency to your pom file:
 ~~~
 <dependency>
   <groupId>org.alfresco</groupId>
@@ -94,40 +74,24 @@ and Alfresco maven repository:
 ~~~
 The SNAPSHOT versions of the artifact are not published.
 
-All current source versions are held in github. Historic versions can be found in [Alfresco SVN](https://svn.alfresco.com/repos/alfresco-open-mirror/services/alfresco-core/)
-
-### Contributing guide
-Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
-
-## Setting up your development environment
-Although it is possible to work on individual github projects, we recommend working on the `alfresco-community-repo`
-and `acs-community-packaging` in a single Intellij IDEA project. They depend on each other and typically you will
-want to make changes to both of them if you are changing the repository code.
-
-~~~
-mkdir work
-cd work
-git clone git@github.com:Alfresco/alfresco-community-repo.git
-git clone git@github.com:Alfresco/acs-community-packaging.git
-~~~
-If you wish to build these projects from the command line, use the following commands.
-~~~
-cd alfresco-community-repo
-mvn clean install -Pbuild-docker-images -DskipTests=true -Dversion.edition=Community
-cd ..
-
-cd acs-community-packaging
-mvn clean install -Pbuild-docker-images -Dmaven.javadoc.skip=true
-cd ..
-~~~
-In Intellij IDEA, create a new project using the `work` directory as the source.
-* File > New Project from Existing Sources > .../work > Maven
+## Setting up and building your development environment
+See the [Development Tomcat Environment](https://github.com/Alfresco/acs-community-packaging/tree/master/dev/README.md)
+page which will show you how to try out your repository changes in a local tomcat instance.
+If you wish to use Docker images, take a look at the aliases ending in `D` and the docker-compose files in this
+project's test modules.    
 
 ## Branches
-As multiple projects have been combined, branch names use the ACS version they are targeting.
-For example the code used to create the repository in ACS 6.2.1 is a branch called `releases/6.2.1`.
+This project has a branch for each ACS release. For example the code in ACS 6.2.1 is a
+branch called `releases/6.2.2`. In addition to the original 6.2.2 release it will also contain Hot Fixes
+added later. The latest unreleased code is on the `master` branch. There are also `.N` branches, such as 
+`releases/7.1.N` on which we gather unreleased fixes for future service pack releases. They do not indicate
+that one is planned.
 
-The actual version number of the **repository artifacts** created by `alfresco-community-repo` are however different.
-For example `release/6.2.1` artifacts are `7.183.x`. This adds some complexity, but ensures that
-version numbers do not go backwards in existing releases. It also provides some level of 
-independence between the repository and other ACS components.
+For historic reasons the version of artifacts created on each branch do not match the ACS version.
+For example artifact in ACS 7.2.0 will be `14.<something>`.
+
+The enterprise projects which extend the `alfresco-community-repo` use the same branch names and leading
+artifact version number.
+
+### Contributing guide
+Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>14.17</version>
+      <version>14.28-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>14.17</version>
+      <version>14.28-SNAPSHOT</version>
    </parent>
 
    <modules>

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>14.17</version>
+      <version>14.28-SNAPSHOT</version>
    </parent>
 
 

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties

@@ -0,0 +1,89 @@
+# dataprep related
+alfresco.scheme=http
+alfresco.server=localhost
+alfresco.port=8082
+
+# sync service related
+sync.scheme=http
+sync.server=localhost
+sync.port=9090
+
+# Solr Server Settings
+solr.scheme=http
+solr.server=localhost
+solr.port=8083
+
+#Solr Indexing Time
+solrWaitTimeInSeconds=20
+
+# credentials
+admin.user=admin
+admin.password=admin
+
+# Identity Service configuration
+# set this property to run tests using AIS
+# identity-service.auth-server-url=http://localhost:8999/auth
+
+# in containers we cannot access directly JMX, so we will use http://jolokia.org agent
+# disabling this we will use direct JMX calls to server
+jmx.useJolokiaAgent=false
+
+# Server Health section
+# in ServerHealth#isServerReachable() - could also be shown.
+# enable this option to view if on server there are tenants or not
+serverHealth.showTenants=false
+
+# TEST MANAGEMENT SECTION - Test Rail
+#
+# (currently supporting Test Rail v5.2.1.3472 integration)
+#
+# Example of configuration:
+# ------------------------------------------------------
+# if testManagement.enabled=true we enabled TestRailExecutorListener (if used in your suite xml file)
+# testManagement.updateTestExecutionResultsOnly=true (this will just update the results of a test: no step will be updated - good for performance)
+# testManagement.endPoint=https://alfresco.testrail.com/
+# testManagement.username=<username>
+# testManagement.apiKey=<api-key>
+# testManagement.project=<id-of-your-project
+# testManagement.testRun=<test-run-name> 
+# testManagement.includeOnlyTestCasesExecuted=true #if you want to include in your run ONLY the test cases that you run, then set this value to false
+# testManagement.rateLimitInSeconds=1 #is the default rate limit after what minimum time, should we upload the next request. http://docs.gurock.com/testrail-api2/introduction #Rate Limit 
+# testManagement.suiteId=23 (the id of the Master suite)
+# ------------------------------------------------------
+testManagement.enabled=false
+testManagement.endPoint=https://alfresco.testrail.com/
+testManagement.username=
+testManagement.apiKey=
+testManagement.project=7
+testManagement.includeOnlyTestCasesExecuted=true
+testManagement.rateLimitInSeconds=1
+testManagement.testRun=MyTestRunInTestRail
+testManagement.suiteId=12
+
+# The location of the reports path
+reports.path=./target/reports
+
+#
+# Database Section
+# You should provide here the database URL, that can be a differed server as alfresco.
+# https://docs.oracle.com/javase/tutorial/jdbc/basics/connecting.html
+#
+# Current supported db.url:
+#
+# MySQL:
+# db.url = jdbc:mysql://${alfresco.server}:3306/alfresco
+# 
+# PostgreSQL:
+# db.url = jdbc:postgresql://<your-DB-IP>:3306/alfresco
+#
+# Oracle:
+# db.url = jdbc:oracle://<your-DB-IP>:3306/alfresco
+#
+# MariaDB:
+# db.url = jdbc:mariadb://<your-DB-IP>:3306/alfresco
+#
+db.url = jdbc:mysql://${alfresco.server}:3306/alfresco
+db.username = alfresco
+db.password = alfresco
+
+environment=default

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>14.17</version>
+      <version>14.28-SNAPSHOT</version>
    </parent>
 
    <modules>

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>14.17</version>
+      <version>14.28-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -108,7 +108,7 @@
       </dependency>
       <dependency>
          <groupId>org.mockito</groupId>
-         <artifactId>mockito-all</artifactId>
+         <artifactId>mockito-core</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java

@@ -27,8 +27,9 @@
 
 package org.alfresco.module.org_alfresco_module_rm.action.dm;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -352,7 +353,7 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest
     private void setupMockedAspects()
     {
         doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef);
-        doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT));
+        doReturn(true).when(mockedDictionaryService).isSubClass(nullable(QName.class), eq(ContentModel.TYPE_CONTENT));
         doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE);
         doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD);
         doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY);

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/audit/event/AddToHoldAuditEventUnitTest.java

@@ -36,15 +36,13 @@ import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import java.util.Map;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
 
 /**
  * Unit tests for {@link AddToHoldAuditEvent}.
@@ -67,8 +65,6 @@ public class AddToHoldAuditEventUnitTest extends BaseUnitTest
     @Before
     public void setUp()
     {
-        initMocks(this);
-
         holdNodeRef = generateNodeRef();
         String holdName = "Hold " + GUID.generate();
 
@@ -87,6 +83,6 @@ public class AddToHoldAuditEventUnitTest extends BaseUnitTest
     public void testAddToHoldCausesAuditEvent()
     {
         addToHoldAuditEvent.onAddToHold(holdNodeRef, contentNodeRef);
-        verify(mockedRecordsManagementAuditService, times(1)).auditEvent(eq(contentNodeRef), any(String.class), isNull(Map.class), any(Map.class), eq(true), eq(false));
+        verify(mockedRecordsManagementAuditService, times(1)).auditEvent(eq(contentNodeRef), nullable(String.class), isNull(), anyMap(), eq(true), eq(false));
     }
 }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/audit/event/CreateHoldAuditEventUnitTest.java

@@ -37,15 +37,13 @@ import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import java.util.Map;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
 
 /**
  * Unit tests for {@link CreateHoldAuditEvent}.
@@ -68,8 +66,6 @@ public class CreateHoldAuditEventUnitTest extends BaseUnitTest
     @Before
     public void setUp()
     {
-        initMocks(this);
-
         holdNodeRef = generateNodeRef();
         String holdName = "Hold " + GUID.generate();
         String holdReason = "Reason " + GUID.generate();
@@ -88,6 +84,6 @@ public class CreateHoldAuditEventUnitTest extends BaseUnitTest
     public void testCreateHoldCausesAuditEvent()
     {
         createHoldAuditEvent.onCreateNode(childAssociationRef);
-        verify(mockedRecordsManagementAuditService, times(1)).auditEvent(eq(holdNodeRef), any(String.class), isNull(Map.class), any(Map.class));
+        verify(mockedRecordsManagementAuditService, times(1)).auditEvent(eq(holdNodeRef), nullable(String.class), isNull(), anyMap());
     }
 }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/audit/event/DeleteHoldAuditEventUnitTest.java

@@ -34,18 +34,15 @@ import org.alfresco.util.GUID;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 
-import java.util.Map;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
 
 /**
  * Unit tests for {@link DeleteHoldAuditEvent}.
@@ -67,8 +64,6 @@ public class DeleteHoldAuditEventUnitTest extends BaseUnitTest
     @Before
     public void setUp()
     {
-        initMocks(this);
-
         holdNodeRef = generateNodeRef();
         String holdName = "Hold " + GUID.generate();
 
@@ -84,6 +79,6 @@ public class DeleteHoldAuditEventUnitTest extends BaseUnitTest
     {
         deleteHoldAuditEvent.beforeDeleteNode(holdNodeRef);
         verify(mockedRecordsManagementAuditService, times(1))
-            .auditEvent(eq(holdNodeRef), any(String.class), any(Map.class), isNull(Map.class), Matchers.eq(true), Matchers.eq(false));
+            .auditEvent(eq(holdNodeRef), nullable(String.class), anyMap(), isNull(), eq(true), eq(false));
     }
 }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/audit/event/RemoveFromHoldAuditEventUnitTest.java

@@ -27,25 +27,24 @@
 
 package org.alfresco.module.org_alfresco_module_rm.audit.event;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import java.util.Map;
 
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.util.GUID;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for {@link RemoveFromHoldAuditEvent}.
@@ -53,6 +52,7 @@ import org.mockito.Mock;
  * @author Chris Shields
  * @since 3.3
  */
+@RunWith(MockitoJUnitRunner.class)
 public class RemoveFromHoldAuditEventUnitTest extends BaseUnitTest
 {
     @InjectMocks
@@ -70,16 +70,14 @@ public class RemoveFromHoldAuditEventUnitTest extends BaseUnitTest
     @Before
     public void setUp()
     {
-        initMocks(this);
-
         holdNodeRef = generateNodeRef();
         String holdName = "Hold " + GUID.generate();
 
         contentNodeRef = generateNodeRef();
         String contentName = "Content " + GUID.generate();
 
-        when(mockedNodeService.getProperty(holdNodeRef, PROP_NAME)).thenReturn(holdName);
-        when(mockedNodeService.getProperty(contentNodeRef, PROP_NAME)).thenReturn(contentName);
+        lenient().when(mockedNodeService.getProperty(holdNodeRef, PROP_NAME)).thenReturn(holdName);
+        lenient().when(mockedNodeService.getProperty(contentNodeRef, PROP_NAME)).thenReturn(contentName);
     }
 
     /**
@@ -89,7 +87,7 @@ public class RemoveFromHoldAuditEventUnitTest extends BaseUnitTest
     public void testRemoveFromHoldCausesAuditEvent()
     {
         removeFromHoldAuditEvent.onRemoveFromHold(holdNodeRef, contentNodeRef);
-        verify(mockedRecordsManagementAuditService, times(1)).auditEvent(eq(contentNodeRef), any(String.class), any(Map.class), isNull(Map.class), eq(true));
+        verify(mockedRecordsManagementAuditService, times(1)).auditEvent(eq(contentNodeRef), nullable(String.class), anyMap(), isNull(), eq(true));
     }
 
 }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilterUnitTest.java

@@ -28,14 +28,14 @@
 package org.alfresco.module.org_alfresco_module_rm.forms;
 
 import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.generateQName;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -45,7 +45,6 @@ import java.util.Map;
 
 import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
-import org.alfresco.repo.forms.Field;
 import org.alfresco.repo.forms.FieldDefinition;
 import org.alfresco.repo.forms.Form;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -81,7 +80,7 @@ public class RecordsManagementTypeFormFilterUnitTest extends BaseUnitTest
     public void testAddCustomRMPropertiesNoneFound()
     {        
         typeFormFilter.addCustomRMProperties(MY_CUSTOM_TYPE, mockForm);
-        verifyZeroInteractions(mockForm);        
+        verifyNoMoreInteractions(mockForm);
     }
     
     /**
@@ -130,8 +129,8 @@ public class RecordsManagementTypeFormFilterUnitTest extends BaseUnitTest
         
         typeFormFilter.afterGenerate(mockTypeDefinition, null, null, mockForm, null);
         
-        verify(mockedIdentifierService).generateIdentifier(any(QName.class), any(NodeRef.class));
-        verify(idDef).setDefaultValue(anyString());
+        verify(mockedIdentifierService).generateIdentifier(nullable(QName.class), nullable(NodeRef.class));
+        verify(idDef).setDefaultValue(nullable(String.class));
         verify(vrDef).setDefaultValue(Boolean.FALSE.toString());
         verify(rpDef).setDefaultValue("none|0");
     }
@@ -162,7 +161,7 @@ public class RecordsManagementTypeFormFilterUnitTest extends BaseUnitTest
         typeFormFilter.addCustomRMProperties(MY_CUSTOM_TYPE, mockForm);
         
         // ensure that two custom properties have been added to the form
-        verify(mockForm, times(1)).addFields(anyListOf(Field.class));       
+        verify(mockForm, times(1)).addFields(anyList());
     }
     
     /**

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java

@@ -30,16 +30,16 @@ package org.alfresco.module.org_alfresco_module_rm.job;
 import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.generateQName;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
@@ -57,7 +57,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.stubbing.Answer;
 
@@ -98,7 +97,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
             return callback.execute();
         };
         doAnswer(doInTransactionAnswer).when(mockedRetryingTransactionHelper).doInTransaction(any(RetryingTransactionCallback.class),
-            Matchers.anyBoolean(), Matchers.anyBoolean());
+            anyBoolean(), anyBoolean());
 
         // setup data
         List<String> dispositionActions = buildList(CUTOFF, RETAIN);
@@ -141,7 +140,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         verifyQueryTimes(1);
 
         // ensure nothing else happens becuase we have no results
-        verifyZeroInteractions(mockedNodeService, mockedRecordFolderService, mockedRetryingTransactionHelper);
+        verifyNoMoreInteractions(mockedNodeService, mockedRecordFolderService, mockedRetryingTransactionHelper);
     }
 
     /**
@@ -178,7 +177,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         // ensure work is executed in transaction for each node processed
         verify(mockedNodeService, times(2)).exists(any(NodeRef.class));
         verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class),
-            Matchers.anyBoolean(), Matchers.anyBoolean());
+            anyBoolean(), anyBoolean());
 
         // ensure each node is process correctly
         verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION);
@@ -186,7 +185,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
 
         // ensure no more interactions
         verifyNoMoreInteractions(mockedNodeService);
-        verifyZeroInteractions(mockedRecordsManagementActionService);
+        verifyNoMoreInteractions(mockedRecordsManagementActionService);
 
     }
 
@@ -216,7 +215,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
 
         // ensure no more interactions
         verifyNoMoreInteractions(mockedNodeService);
-        verifyZeroInteractions(mockedRecordsManagementActionService);
+        verifyNoMoreInteractions(mockedRecordsManagementActionService);
     }
 
     /**
@@ -258,7 +257,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         // ensure work is executed in transaction for each node processed
         verify(mockedNodeService, times(2)).exists(any(NodeRef.class));
         verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class),
-            Matchers.anyBoolean(), Matchers.anyBoolean());
+            anyBoolean(), anyBoolean());
 
         // ensure each node is process correctly
         // node1
@@ -307,7 +306,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
 
         // mock the search service to return the right page
         when(mockedSearchService.query(any(SearchParameters.class))).thenAnswer((Answer<ResultSet>) invocation -> {
-            SearchParameters params = invocation.getArgumentAt(0, SearchParameters.class);
+            SearchParameters params = invocation.getArgument(0, SearchParameters.class);
             if (params.getSkipCount() == 0)
             {
                 // mock first page

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FrozenAspectUnitTest.java

@@ -27,17 +27,15 @@
 package org.alfresco.module.org_alfresco_module_rm.model.rma.aspect;
 
 import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_HELD_CHILDREN;
-import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_RECORD;
 import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.PROP_HELD_CHILDREN_COUNT;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMap;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
@@ -51,24 +49,22 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.QName;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.context.ApplicationContext;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Test class for frozen aspect
  * @author Ross Gale
  * @since 3.2
  */
+@RunWith(MockitoJUnitRunner.class)
 public class FrozenAspectUnitTest
 {
     @Mock
     private NodeService mockNodeService;
 
-    @Mock
-    private ApplicationContext mockApplicationContext;
-
     @Mock
     private ChildAssociationRef mockChildAssociationRef;
 
@@ -90,9 +86,6 @@ public class FrozenAspectUnitTest
     @Mock
     private ChildAssociationRef mockOldRef;
 
-    @Mock
-    private Set mockSet;
-
     @Mock
     private PropertyModificationAllowedCheck mockPropertyModificationAllowedCheck;
 
@@ -110,18 +103,17 @@ public class FrozenAspectUnitTest
     @Before
     public void setUp()
     {
-        MockitoAnnotations.initMocks(this);
         when(mockNodeService.exists(record)).thenReturn(true);
         when(mockNodeService.getType(record)).thenReturn(ContentModel.TYPE_CONTENT);
         when(mockedNodeTypeUtility.instanceOf(mockNodeService.getType(record), ContentModel.TYPE_CONTENT)).thenReturn(true);
         when(mockNodeService.exists(content)).thenReturn(true);
         when(mockNodeService.hasAspect(folder, ASPECT_HELD_CHILDREN)).thenReturn(true);
         when(mockNodeService.getProperty(folder, PROP_HELD_CHILDREN_COUNT)).thenReturn(1);
-        when(mockApplicationContext.getBean("dbNodeService")).thenReturn(mockNodeService);
         when(mockFreezeService.isFrozen(content)).thenReturn(false);
         children.add(mockChildRef);
         when(mockNodeService.getChildAssocs(content)).thenReturn(children);
         when(mockChildRef.isPrimary()).thenReturn(true);
+        frozenAspect.setNodeService(mockNodeService);
     }
 
     /**
@@ -142,7 +134,6 @@ public class FrozenAspectUnitTest
     @Test
     public void testRemoveAspectForContent()
     {
-        when(mockNodeService.hasAspect(content, ASPECT_RECORD)).thenReturn(false);
         when(mockNodeService.getType(content)).thenReturn(ContentModel.TYPE_CONTENT);
         when(mockedNodeTypeUtility.instanceOf(mockNodeService.getType(content), ContentModel.TYPE_CONTENT)).thenReturn(true);
         when(mockNodeService.getPrimaryParent(content)).thenReturn(mockChildAssociationRef);
@@ -157,7 +148,6 @@ public class FrozenAspectUnitTest
     @Test
     public void testRemoveAspectForContentDoesntUpdateForOtherTypes()
     {
-        when(mockNodeService.hasAspect(content, ASPECT_RECORD)).thenReturn(false);
         when(mockNodeService.getType(content)).thenReturn(ContentModel.TYPE_FOLDER);
         when(mockedNodeTypeUtility.instanceOf(mockNodeService.getType(content), ContentModel.TYPE_CONTENT)).thenReturn(false);
         frozenAspect.onRemoveAspect(content, null);
@@ -233,7 +223,6 @@ public class FrozenAspectUnitTest
     @Test(expected = PermissionDeniedException.class)
     public void testBeforeMoveThrowsExceptionForFrozenNode()
     {
-        when(mockOldRef.getParentRef()).thenReturn(parent);
         when(mockOldRef.getChildRef()).thenReturn(child);
         when(mockNodeService.exists(child)).thenReturn(true);
         when(mockFreezeService.isFrozen(child)).thenReturn(true);
@@ -247,8 +236,6 @@ public class FrozenAspectUnitTest
     public void testUpdatePropertiesThrowsExceptionForFrozenNode()
     {
         when(mockFreezeService.isFrozen(content)).thenReturn(true);
-        when(mockResourceHelper.getSet(content)).thenReturn(mockSet);
-        when(mockSet.contains("frozen")).thenReturn(false);
         when(mockPropertyModificationAllowedCheck.check(null, null)).thenReturn(false);
         frozenAspect.onUpdateProperties(content, null, null);
     }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java

@@ -33,7 +33,6 @@ import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagement
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
@@ -43,14 +42,17 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for the {@link RecordAspect}.
  *
  * @author Claudia Agache
  */
+@RunWith(MockitoJUnitRunner.class)
 public class RecordAspectUnitTest
 {
     private static final NodeRef NODE_REF = new NodeRef("node://Ref/");
@@ -72,7 +74,7 @@ public class RecordAspectUnitTest
     @Before
     public void setUp()
     {
-        initMocks(this);
+        recordAspect.setNodeService(mockNodeService);
     }
 
     /** Check that the bin is duplicated before adding the aspect if the file has a copy. */

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/NonElectronicRecordTypeUnitTest.java

@@ -45,13 +45,15 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.GUID;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * @author silviudinuta
  */
+@RunWith(MockitoJUnitRunner.class)
 public class NonElectronicRecordTypeUnitTest implements RecordsManagementModel, ContentModel
 {
     private final static NodeRef CHILD_NODE_REF = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
@@ -74,17 +76,15 @@ public class NonElectronicRecordTypeUnitTest implements RecordsManagementModel,
     @Before
     public void setUp()
     {
-        MockitoAnnotations.initMocks(this);
         MockAuthenticationUtilHelper.setup(mockAuthenticationUtil);
         when(mockedNodeService.exists(CHILD_NODE_REF)).thenReturn(true);
-        when(mockedNodeService.exists(PARENT_NODE_REF)).thenReturn(true);
 
         ChildAssociationRef generateChildAssociationRef = mock(ChildAssociationRef.class);
         when(generateChildAssociationRef.getParentRef()).thenReturn(PARENT_NODE_REF);
-        when(generateChildAssociationRef.getChildRef()).thenReturn(CHILD_NODE_REF);
 
         when(mockedNodeService.getPrimaryParent(CHILD_NODE_REF)).thenReturn(generateChildAssociationRef);
         when(mockedNodeService.getType(PARENT_NODE_REF)).thenReturn(TYPE_UNFILED_RECORD_FOLDER);
+        nonElectronicRecordType.setNodeService(mockedNodeService);
     }
 
     @Test

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptUnitTest.java

@@ -27,6 +27,7 @@
 
 package org.alfresco.module.org_alfresco_module_rm.script.hold;
 
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -71,8 +72,8 @@ public abstract class BaseHoldWebScriptUnitTest extends BaseWebScriptUnitTest
 
         // generate active content
         dmNodeRef = generateNodeRef(TYPE_CONTENT);
-        when(mockedExtendedPermissionService.hasPermission(dmNodeRef, PermissionService.WRITE)).thenReturn(AccessStatus.ALLOWED);
-        when(mockedDictionaryService.isSubClass(mockedNodeService.getType(dmNodeRef), ContentModel.TYPE_CONTENT)).thenReturn(true);
+        lenient().when(mockedExtendedPermissionService.hasPermission(dmNodeRef, PermissionService.WRITE)).thenReturn(AccessStatus.ALLOWED);
+        lenient().when(mockedDictionaryService.isSubClass(mockedNodeService.getType(dmNodeRef), ContentModel.TYPE_CONTENT)).thenReturn(true);
 
         // list of active contents
         activeContents = Collections.singletonList(dmNodeRef);

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/HoldPutUnitTest.java

@@ -37,9 +37,12 @@ import java.util.List;
 
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.json.JSONObject;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 
 /**
@@ -48,6 +51,7 @@ import org.springframework.extensions.webscripts.DeclarativeWebScript;
  * @author Roy Wetherall
  * @since 2.2
  */
+@RunWith(MockitoJUnitRunner.class)
 public class HoldPutUnitTest extends BaseHoldWebScriptWithContentUnitTest
 {
     /** classpath location of ftl template for web script */
@@ -77,6 +81,12 @@ public class HoldPutUnitTest extends BaseHoldWebScriptWithContentUnitTest
     /**
      * Test that a record can be removed from holds.
      */
+
+    @Before
+    public void setUp(){
+        webScript.setHoldService(mockedHoldService);
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void removeRecordFromHolds() throws Exception

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImplUnitTest.java

@@ -34,11 +34,12 @@ import static org.alfresco.service.cmr.security.PermissionService.GROUP_PREFIX;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anySet;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -75,10 +76,11 @@ import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -89,6 +91,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
  * @author Roy Wetherall
  * @since 2.5
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ExtendedSecurityServiceImplUnitTest
 {
     /** service mocks*/
@@ -145,9 +148,6 @@ public class ExtendedSecurityServiceImplUnitTest
     @SuppressWarnings("unchecked")
     @Before public void before()
     {
-        // initialise mocks 
-        MockitoAnnotations.initMocks(this);
-        
         // setup node
         nodeRef = AlfMock.generateNodeRef(mockedNodeService);
         
@@ -157,7 +157,7 @@ public class ExtendedSecurityServiceImplUnitTest
             .thenReturn(filePlan);
         
         // set-up application context
-        when(mockedApplicationContext.getBean("dbNodeService"))
+        lenient().when(mockedApplicationContext.getBean("dbNodeService"))
             .thenReturn(mockedNodeService);
 
         // setup retrying transaction helper
@@ -199,6 +199,7 @@ public class ExtendedSecurityServiceImplUnitTest
             .forEach((a) -> 
                when(mockedAuthorityService.authorityExists(a))
                    .thenReturn(true));
+        extendedSecurityService.setNodeService(mockedNodeService);
     }
     
     /**
@@ -481,7 +482,7 @@ public class ExtendedSecurityServiceImplUnitTest
         .thenReturn(mockedWritePagingResults);
         
         // setup exact match
-        when(mockedAuthorityService.authorityExists(GROUP_PREFIX + writeGroup))
+        lenient().when(mockedAuthorityService.authorityExists(GROUP_PREFIX + writeGroup))
             .thenReturn(true);
         when(mockedAuthorityService.getContainedAuthorities(null, GROUP_PREFIX + readGroup, true))
             .thenReturn(Stream
@@ -560,7 +561,7 @@ public class ExtendedSecurityServiceImplUnitTest
         .thenReturn(mockedWritePagingResults);
         
         // setup exact match
-        when(mockedAuthorityService.authorityExists(GROUP_PREFIX + writeGroup))
+        lenient().when(mockedAuthorityService.authorityExists(GROUP_PREFIX + writeGroup))
             .thenReturn(true);
         when(mockedAuthorityService.getContainedAuthorities(null, GROUP_PREFIX + readGroup, true))
             .thenReturn(Stream
@@ -651,7 +652,7 @@ public class ExtendedSecurityServiceImplUnitTest
         .thenReturn(mockedWritePagingResults);
 
         // setup exact match
-        when(mockedAuthorityService.authorityExists(GROUP_PREFIX + writeGroup))
+        lenient().when(mockedAuthorityService.authorityExists(GROUP_PREFIX + writeGroup))
             .thenReturn(true);
         when(mockedAuthorityService.getContainedAuthorities(null, GROUP_PREFIX + readGroup, true))
             .thenReturn(Stream

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/AlfMock.java

@@ -27,8 +27,9 @@
 
 package org.alfresco.module.org_alfresco_module_rm.test.util;
 
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.util.UUID;
@@ -119,7 +120,7 @@ public class AlfMock
     public static NodeRef generateNodeRef(NodeService mockedNodeService, QName type, boolean exists)
     {
         NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, GUID.generate());
-        when(mockedNodeService.exists(eq(nodeRef))).thenReturn(exists);
+        lenient().when(mockedNodeService.exists(eq(nodeRef))).thenReturn(exists);
         if (type != null)
         {
             when(mockedNodeService.getType(eq(nodeRef))).thenReturn(type);

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java

@@ -28,10 +28,10 @@
 package org.alfresco.module.org_alfresco_module_rm.test.util;
 
 import static org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock.generateQName;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doAnswer;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -168,7 +168,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
         MockitoAnnotations.initMocks(this);
 
         // setup application context
-        doReturn(mockedNodeService).when(mockedApplicationContext).getBean("dbNodeService");
+        lenient().doReturn(mockedNodeService).when(mockedApplicationContext).getBean("dbNodeService");
 
         // setup retrying transaction helper
         Answer<Object> doInTransactionAnswer = new Answer<Object>()
@@ -181,7 +181,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
                 return callback.execute();
             }
         };
-        doAnswer(doInTransactionAnswer).when(mockedRetryingTransactionHelper).<Object>doInTransaction(any(RetryingTransactionCallback.class));
+        lenient().doAnswer(doInTransactionAnswer).when(mockedRetryingTransactionHelper).<Object>doInTransaction(any(RetryingTransactionCallback.class));
 
         // setup mocked authentication util
         MockAuthenticationUtilHelper.setup(mockedAuthenticationUtil);
@@ -189,15 +189,15 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
         // setup file plan
         filePlan = generateNodeRef(TYPE_FILE_PLAN);
         setupAsFilePlanComponent(filePlan);
-        doReturn(true).when(mockedFilePlanService).isFilePlan(filePlan);
+        lenient().doReturn(true).when(mockedFilePlanService).isFilePlan(filePlan);
 
         // setup basic file plan component
         filePlanComponent = generateNodeRef();
         setupAsFilePlanComponent(filePlanComponent);
 
         // setup namespace service
-        doReturn(RM_URI).when(mockedNamespaceService).getNamespaceURI(RM_PREFIX);
-        doReturn(CollectionUtils.unmodifiableSet(RM_PREFIX)).when(mockedNamespaceService).getPrefixes(RM_URI);
+        lenient().doReturn(RM_URI).when(mockedNamespaceService).getNamespaceURI(RM_PREFIX);
+        lenient().doReturn(CollectionUtils.unmodifiableSet(RM_PREFIX)).when(mockedNamespaceService).getPrefixes(RM_URI);
 
         // setup record folder and record
         recordFolder = generateRecordFolder();
@@ -206,10 +206,10 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
         // set record as child of record folder
         List<ChildAssociationRef> result = new ArrayList<>(1);
         result.add(new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, recordFolder, generateQName(RM_URI), record, true, 1));
-        doReturn(result).when(mockedNodeService).getChildAssocs(eq(recordFolder), eq(ContentModel.ASSOC_CONTAINS), any(QNamePattern.class));
-        doReturn(result).when(mockedNodeService).getParentAssocs(record);
-        doReturn(Collections.singletonList(recordFolder)).when(mockedRecordFolderService).getRecordFolders(record);
-        doReturn(Collections.singletonList(record)).when(mockedRecordService).getRecords(recordFolder);
+        lenient().doReturn(result).when(mockedNodeService).getChildAssocs(eq(recordFolder), eq(ContentModel.ASSOC_CONTAINS), any(QNamePattern.class));
+        lenient().doReturn(result).when(mockedNodeService).getParentAssocs(record);
+        lenient().doReturn(Collections.singletonList(recordFolder)).when(mockedRecordFolderService).getRecordFolders(record);
+        lenient().doReturn(Collections.singletonList(record)).when(mockedRecordService).getRecords(recordFolder);
     }
 
     /**
@@ -221,7 +221,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
     protected NodeRef generateHoldNodeRef(String name)
     {
         NodeRef hold = generateNodeRef(TYPE_HOLD);
-        doReturn(name).when(mockedNodeService).getProperty(hold, ContentModel.PROP_NAME);
+        lenient().doReturn(name).when(mockedNodeService).getProperty(hold, ContentModel.PROP_NAME);
         doReturn(true).when(mockedHoldService).isHold(hold);
         return hold;
     }
@@ -235,7 +235,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
     {
         NodeRef recordFolder = generateNodeRef(TYPE_RECORD_FOLDER);
         setupAsFilePlanComponent(recordFolder);
-        doReturn(true).when(mockedRecordFolderService).isRecordFolder(recordFolder);
+        lenient().doReturn(true).when(mockedRecordFolderService).isRecordFolder(recordFolder);
         return recordFolder;
     }
 
@@ -248,8 +248,8 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
     {
         NodeRef record = generateNodeRef(ContentModel.TYPE_CONTENT);
         setupAsFilePlanComponent(record);
-        doReturn(true).when(mockedNodeService).hasAspect(record, ASPECT_RECORD);
-        doReturn(true).when(mockedRecordService).isRecord(record);
+        lenient().doReturn(true).when(mockedNodeService).hasAspect(record, ASPECT_RECORD);
+        lenient().doReturn(true).when(mockedRecordService).isRecord(record);
         return record;
     }
 
@@ -260,10 +260,10 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
      */
     protected void setupAsFilePlanComponent(NodeRef nodeRef)
     {
-        doReturn(true).when(mockedNodeService).hasAspect(nodeRef, ASPECT_FILE_PLAN_COMPONENT);
-        doReturn(true).when(mockedFilePlanService).isFilePlanComponent(nodeRef);
-        doReturn(filePlan).when(mockedFilePlanService).getFilePlan(nodeRef);
-        doReturn(filePlan).when(mockedNodeService).getProperty(nodeRef, PROP_ROOT_NODEREF);
+        lenient().doReturn(true).when(mockedNodeService).hasAspect(nodeRef, ASPECT_FILE_PLAN_COMPONENT);
+        lenient().doReturn(true).when(mockedFilePlanService).isFilePlanComponent(nodeRef);
+        lenient().doReturn(filePlan).when(mockedFilePlanService).getFilePlan(nodeRef);
+        lenient().doReturn(filePlan).when(mockedNodeService).getProperty(nodeRef, PROP_ROOT_NODEREF);
     }
 
     /**
@@ -297,7 +297,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
     protected NodeRef generateCmContent(String name)
     {
         NodeRef nodeRef = generateNodeRef(ContentModel.TYPE_CONTENT, true);
-        doReturn(name).when(mockedNodeService).getProperty(nodeRef, ContentModel.PROP_NAME);
+        lenient().doReturn(name).when(mockedNodeService).getProperty(nodeRef, ContentModel.PROP_NAME);
         return nodeRef;
     }
 
@@ -312,11 +312,11 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
     protected NodeRef generateNodeRef(QName type, boolean exists)
     {
         NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, GUID.generate());
-        when(mockedNodeService.exists(eq(nodeRef))).thenReturn(exists);
+        lenient().when(mockedNodeService.exists(eq(nodeRef))).thenReturn(exists);
         if (type != null)
         {
-            when(mockedNodeService.getType(eq(nodeRef))).thenReturn(type);
-            when(mockedNodeTypeUtility.instanceOf(type, type)).thenReturn(true);
+            lenient().when(mockedNodeService.getType(eq(nodeRef))).thenReturn(type);
+            lenient().when(mockedNodeTypeUtility.instanceOf(type, type)).thenReturn(true);
         }
         return nodeRef;
     }
@@ -334,7 +334,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
 
         if (parent != null)
         {
-            doReturn(parent).when(mockedChildAssociationRef).getParentRef();
+            lenient().doReturn(parent).when(mockedChildAssociationRef).getParentRef();
         }
 
         if (child != null)

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java

@@ -29,10 +29,12 @@ package org.alfresco.module.org_alfresco_module_rm.test.util;
 
 import static java.util.Collections.emptyMap;
 
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -179,19 +181,19 @@ public abstract class BaseWebScriptUnitTest extends BaseUnitTest
         org.springframework.extensions.webscripts.Runtime mockedRuntime = mock(org.springframework.extensions.webscripts.Runtime.class);        
         
         WebScriptRequest mockedRequest = mock(WebScriptRequest.class);
-        doReturn(match).when(mockedRequest).getServiceMatch();
-        doReturn(mockedRuntime).when(mockedRequest).getRuntime();
+        lenient().doReturn(match).when(mockedRequest).getServiceMatch();
+        lenient().doReturn(mockedRuntime).when(mockedRequest).getRuntime();
         
         if (content != null && !content.isEmpty())
         {
             Content mockedContent = mock(Content.class);
-            doReturn(content).when(mockedContent).getContent();
-            doReturn(mockedContent).when(mockedRequest).getContent();
+            lenient().doReturn(content).when(mockedContent).getContent();
+            lenient().doReturn(mockedContent).when(mockedRequest).getContent();
         }
         
         String [] paramNames = (String[])parameters.keySet().toArray(new String[parameters.size()]);
-        doReturn(paramNames).when(mockedRequest).getParameterNames();
-        doAnswer(new Answer()
+        lenient().doReturn(paramNames).when(mockedRequest).getParameterNames();
+        lenient().doAnswer(new Answer()
         {
             @Override
             public Object answer(InvocationOnMock invocation) throws Throwable
@@ -201,9 +203,9 @@ public abstract class BaseWebScriptUnitTest extends BaseUnitTest
             }
             
         }).when(mockedRequest).getParameter(anyString());
-        
-        doReturn(new String[0]).when(mockedRequest).getHeaderNames();
-        doReturn("json").when(mockedRequest).getFormat();
+
+        lenient().doReturn(new String[0]).when(mockedRequest).getHeaderNames();
+        lenient().doReturn("json").when(mockedRequest).getFormat();
         
         return mockedRequest;        
     }
@@ -217,7 +219,7 @@ public abstract class BaseWebScriptUnitTest extends BaseUnitTest
     {
         WebScriptResponse mockedResponse = mock(WebScriptResponse.class);
         StringWriter writer = new StringWriter();
-        doReturn(writer).when(mockedResponse).getWriter();
+        lenient().doReturn(writer).when(mockedResponse).getWriter();
         return mockedResponse;
     }
     
@@ -230,13 +232,13 @@ public abstract class BaseWebScriptUnitTest extends BaseUnitTest
     protected Container getMockedContainer(String template) throws Exception
     {
         FormatRegistry mockedFormatRegistry = mock(FormatRegistry.class);
-        doReturn("application/json").when(mockedFormatRegistry).getMimeType(anyString(), anyString());
+        lenient().doReturn("application/json").when(mockedFormatRegistry).getMimeType(nullable(String.class), nullable(String.class));
         
         ScriptProcessorRegistry mockedScriptProcessorRegistry = mock(ScriptProcessorRegistry.class);
-        doReturn(null).when(mockedScriptProcessorRegistry).findValidScriptPath(anyString());
+        lenient().doReturn(null).when(mockedScriptProcessorRegistry).findValidScriptPath(anyString());
         
         TemplateProcessorRegistry mockedTemplateProcessorRegistry = mock(TemplateProcessorRegistry.class);
-        doReturn(template).when(mockedTemplateProcessorRegistry).findValidTemplatePath(anyString());
+        lenient().doReturn(template).when(mockedTemplateProcessorRegistry).findValidTemplatePath(anyString());
         
         FTLTemplateProcessor ftlTemplateProcessor = new FTLTemplateProcessor()
         {
@@ -248,25 +250,25 @@ public abstract class BaseWebScriptUnitTest extends BaseUnitTest
         };
         ftlTemplateProcessor.init();        
         
-        doReturn(ftlTemplateProcessor).when(mockedTemplateProcessorRegistry).getTemplateProcessor(anyString());
+        lenient().doReturn(ftlTemplateProcessor).when(mockedTemplateProcessorRegistry).getTemplateProcessor(anyString());
         
         Container mockedContainer = mock(Container.class);
-        doReturn(mockedFormatRegistry).when(mockedContainer).getFormatRegistry();
-        doReturn(mockedScriptProcessorRegistry).when(mockedContainer).getScriptProcessorRegistry();
-        doReturn(mockedTemplateProcessorRegistry).when(mockedContainer).getTemplateProcessorRegistry();
+        lenient().doReturn(mockedFormatRegistry).when(mockedContainer).getFormatRegistry();
+        lenient().doReturn(mockedScriptProcessorRegistry).when(mockedContainer).getScriptProcessorRegistry();
+        lenient().doReturn(mockedTemplateProcessorRegistry).when(mockedContainer).getTemplateProcessorRegistry();
         
         Map<String, Object> containerTemplateParameters = new HashMap<>(5);
         containerTemplateParameters.put("jsonUtils", new JSONUtils());
         containerTemplateParameters.put("people", getMockedPeopleObject());
-        doReturn(containerTemplateParameters).when(mockedContainer).getTemplateParameters();
+        lenient().doReturn(containerTemplateParameters).when(mockedContainer).getTemplateParameters();
 
         SearchPath mockedSearchPath = mock(SearchPath.class);
-        doReturn(false).when(mockedSearchPath).hasDocument(anyString());
-        doReturn(mockedSearchPath).when(mockedContainer).getSearchPath();
+        lenient().doReturn(false).when(mockedSearchPath).hasDocument(anyString());
+        lenient().doReturn(mockedSearchPath).when(mockedContainer).getSearchPath();
         
         // setup description
         Description mockDescription = mock(Description.class);
-        doReturn(mock(RequiredCache.class)).when(mockDescription).getRequiredCache();
+        lenient().doReturn(mock(RequiredCache.class)).when(mockDescription).getRequiredCache();
         
         return mockedContainer;
     }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/MockAuthenticationUtilHelper.java

@@ -27,11 +27,10 @@
 
 package org.alfresco.module.org_alfresco_module_rm.test.util;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doAnswer;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.when;
 
 import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
@@ -74,7 +73,7 @@ public class MockAuthenticationUtilHelper
         reset(mockAuthenticationUtil);
 
         // just do the work
-        doAnswer(new Answer<Object>()
+        lenient().doAnswer(new Answer<Object>()
         {
             @SuppressWarnings("rawtypes")
             @Override
@@ -87,7 +86,7 @@ public class MockAuthenticationUtilHelper
         }).when(mockAuthenticationUtil).<Object> runAsSystem(any(RunAsWork.class));
 
         // just do the work
-        doAnswer(new Answer<Object>()
+        lenient().doAnswer(new Answer<Object>()
         {
             @SuppressWarnings("rawtypes")
             @Override
@@ -99,10 +98,10 @@ public class MockAuthenticationUtilHelper
 
         }).when(mockAuthenticationUtil).<Object> runAs(any(RunAsWork.class), anyString());
 
-        when(mockAuthenticationUtil.getAdminUserName()).thenReturn(ADMIN_USER);
-        when(mockAuthenticationUtil.getFullyAuthenticatedUser()).thenReturn(fullyAuthenticatedUser);
-        when(mockAuthenticationUtil.getRunAsUser()).thenReturn(fullyAuthenticatedUser);
-        when(mockAuthenticationUtil.getSystemUserName()).thenReturn(SYSTEM_USER);
-        when(mockAuthenticationUtil.getGuestUserName()).thenReturn(GUEST_USER);
+        lenient().when(mockAuthenticationUtil.getAdminUserName()).thenReturn(ADMIN_USER);
+        lenient().when(mockAuthenticationUtil.getFullyAuthenticatedUser()).thenReturn(fullyAuthenticatedUser);
+        lenient().when(mockAuthenticationUtil.getRunAsUser()).thenReturn(fullyAuthenticatedUser);
+        lenient().when(mockAuthenticationUtil.getSystemUserName()).thenReturn(SYSTEM_USER);
+        lenient().when(mockAuthenticationUtil.getGuestUserName()).thenReturn(GUEST_USER);
     }
 }

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtilityUnitTest.java

@@ -87,6 +87,7 @@ public class ContentBinDuplicationUtilityUnitTest
     public void setUp()
     {
         MockitoAnnotations.initMocks(this);
+        contentBinDuplicationUtility.setNodeService(mockNodeService);
     }
 
     /**

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImplUnitTest.java

@@ -29,10 +29,11 @@ package org.alfresco.module.org_alfresco_module_rm.version;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -52,7 +53,6 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
 import org.alfresco.repo.version.Version2Model;
 import org.alfresco.repo.version.VersionModel;
 import org.alfresco.repo.version.common.VersionImpl;
-import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -61,9 +61,11 @@ import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Recordable version service implementation unit test.
@@ -71,6 +73,7 @@ import org.mockito.Spy;
  * @author Roy Wetherall
  * @since 2.3
  */
+@RunWith(MockitoJUnitRunner.class)
 public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
 {
     /** versioned content name */
@@ -108,34 +111,23 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
         recordableVersionService.initialise();
 
         doReturn(generateChildAssociationRef(null, generateNodeRef(Version2Model.TYPE_QNAME_VERSION_HISTORY)))
-            .when(mockedDbNodeService).createNode(any(NodeRef.class),
-                                                  any(QName.class),
-                                                  any(QName.class),
+            .when(mockedDbNodeService).createNode(nullable(NodeRef.class),
+                                                  nullable(QName.class),
+                                                  nullable(QName.class),
                                                   eq(Version2Model.TYPE_QNAME_VERSION_HISTORY),
-                                                  anyMap());
-        doReturn(generateChildAssociationRef(null, generateNodeRef(TYPE_CONTENT)))
-        .when(mockedDbNodeService).createNode(any(NodeRef.class),
-                                              any(QName.class),
-                                              any(QName.class),
-                                              eq(TYPE_CONTENT),
-                                              anyMap());
+                                                  nullable(Map.class));
 
         doReturn(filePlan).when(mockedFilePlanService).getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
-        doReturn(unfiledRecordContainer).when(mockedFilePlanService).getUnfiledContainer(any(NodeRef.class));
 
         record = generateCmContent(CONTENT_NAME);
-        FileInfo mockedFileInfo = mock(FileInfo.class);
-        doReturn(record).when(mockedFileInfo).getNodeRef();
-        doReturn(mockedFileInfo).when(mockedFileFolderService).copy(any(NodeRef.class),
-                                                                    any(NodeRef.class),
-                                                                    any(String.class));
         version = generateNodeRef(TYPE_CONTENT);
         doReturn(generateChildAssociationRef(null, version)).when(mockedDbNodeService).createNode(
-                                                                any(NodeRef.class),
+                                                                nullable(NodeRef.class),
                                                                 eq(Version2Model.CHILD_QNAME_VERSIONS),
-                                                                any(QName.class),
+                                                                nullable(QName.class),
                                                                 eq(TYPE_CONTENT),
-                                                                anyMap());
+                                                                nullable(Map.class));
+        recordableVersionService.setDbNodeService(mockedDbNodeService);
     }
 
     /**
@@ -167,7 +159,6 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
      {
          // setup given conditions
          doReturn(false).when(mockedNodeService).hasAspect(nodeRef, RecordableVersionModel.ASPECT_VERSIONABLE);
-         doReturn(null).when(mockedNodeService).getProperty(nodeRef, RecordableVersionModel.PROP_RECORDABLE_VERSION_POLICY);
          versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR);
 
          // when version is created
@@ -357,7 +348,6 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
     public void filePlanSpecifiedNoPolicy() throws Exception
     {
         // setup given conditions
-        doReturn(true).when(mockedNodeService).hasAspect(nodeRef, RecordableVersionModel.ASPECT_VERSIONABLE);
         versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR);
         versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, true);
 
@@ -376,7 +366,6 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
     public void adHocRecordedVersionNoPolicy() throws Exception
     {
         // setup given conditions
-        doReturn(true).when(mockedNodeService).hasAspect(nodeRef, RecordableVersionModel.ASPECT_VERSIONABLE);
         versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR);
         versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, true);
 
@@ -391,8 +380,6 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
     public void adHocRecordedVersionOverridePolicy() throws Exception
     {
         // setup given conditions
-        doReturn(true).when(mockedNodeService).hasAspect(nodeRef, RecordableVersionModel.ASPECT_VERSIONABLE);
-        doReturn(RecordableVersionPolicy.MAJOR_ONLY.toString()).when(mockedNodeService).getProperty(nodeRef, RecordableVersionModel.PROP_RECORDABLE_VERSION_POLICY);
         versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR);
         versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, true);
 
@@ -461,16 +448,15 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
         // latest version is not recorded
         Version mockedVersion = mock(VersionImpl.class);
         NodeRef versionNodeRef = generateNodeRef();
-        doReturn(Collections.emptyMap()).when(mockedVersion).getVersionProperties();        
         doReturn(true).when(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE);
         
         // version history
         NodeRef versionHistoryNodeRef = generateNodeRef();
-        doReturn(versionHistoryNodeRef).when(mockedDbNodeService).getChildByName(any(NodeRef.class), eq(Version2Model.CHILD_QNAME_VERSION_HISTORIES), any(String.class));
+        doReturn(versionHistoryNodeRef).when(mockedDbNodeService).getChildByName(nullable(NodeRef.class), eq(Version2Model.CHILD_QNAME_VERSION_HISTORIES), nullable(String.class));
         
         // version number
         doReturn(mockedVersion).when(recordableVersionService).getCurrentVersion(nodeRef);
-        doReturn(versionNodeRef).when(recordableVersionService).convertNodeRef(any(NodeRef.class));
+        doReturn(versionNodeRef).when(recordableVersionService).convertNodeRef(nullable(NodeRef.class));
         makePrimaryParentOf(versionNodeRef, versionHistoryNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "something-0"), mockedDbNodeService);
         
         // created version
@@ -478,36 +464,36 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
         doReturn(generateChildAssociationRef(versionHistoryNodeRef, newVersionNodeRef)).when(mockedDbNodeService).createNode(
                 eq(versionHistoryNodeRef),
                 eq(Version2Model.CHILD_QNAME_VERSIONS),
-                any(QName.class),
-                any(QName.class),
-                any(Map.class));
+                nullable(QName.class),
+                nullable(QName.class),
+                nullable(Map.class));
         
         // created record
         NodeRef newRecordNodeRef = generateNodeRef();
         doReturn(newRecordNodeRef).when(mockedRecordService).createRecordFromContent(
-                eq(filePlan), 
-                any(String.class), 
-                any(QName.class), 
-                any(Map.class), 
-                any(ContentReader.class));
+                eq(filePlan),
+                nullable(String.class),
+                nullable(QName.class),
+                nullable(Map.class),
+                nullable(ContentReader.class));
                 
         // create record from version
         recordableVersionService.createRecordFromLatestVersion(filePlan, nodeRef);
         
         // verify that the version is converted to a recorded version
         verify(mockedRecordService, times(1)).createRecordFromContent(
-                eq(filePlan), 
-                any(String.class), 
-                any(QName.class), 
-                any(Map.class), 
-                any(ContentReader.class));
+                eq(filePlan),
+                nullable(String.class),
+                nullable(QName.class),
+                any(Map.class),
+                nullable(ContentReader.class));
         verify(mockedDbNodeService, times(1)).deleteNode(any(NodeRef.class));
         verify(mockedDbNodeService, times(1)).createNode(
                 eq(versionHistoryNodeRef),
                 eq(Version2Model.CHILD_QNAME_VERSIONS),
-                any(QName.class),
-                any(QName.class),
-                any(Map.class));
+                nullable(QName.class),
+                nullable(QName.class),
+                nullable(Map.class));
         verify(mockedNodeService, times(1)).addAspect(eq(newVersionNodeRef), eq(Version2Model.ASPECT_VERSION), any(Map.class));
         verify(mockedNodeService, times(1)).addAspect(
                 newVersionNodeRef, 
@@ -605,20 +591,13 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
         // set up version
         Version mockedVersion = mock(VersionImpl.class);
         NodeRef versionNodeRef = generateNodeRef();
-        NodeRef versionRecordNodeRef = generateNodeRef();
         when(mockedVersion.getFrozenStateNodeRef())
             .thenReturn(versionNodeRef);
-        when(mockedDbNodeService.exists(versionRecordNodeRef))
-            .thenReturn(true);
-        
+
         // indicate that the version doesn't have the aspect
         when(mockedDbNodeService.hasAspect(versionNodeRef, RecordableVersionModel.ASPECT_RECORDED_VERSION))
             .thenReturn(true);
         
-        // indicate that the associated version record exists
-        when(mockedDbNodeService.getProperty(versionNodeRef, RecordableVersionModel.PROP_RECORD_NODE_REF))
-            .thenReturn(versionRecordNodeRef);
-        
         // mark as destroyed
         recordableVersionService.destroyRecordedVersion(mockedVersion);
         
@@ -643,20 +622,13 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest
         // set up version
         Version mockedVersion = mock(VersionImpl.class);
         NodeRef versionNodeRef = generateNodeRef();
-        NodeRef versionRecordNodeRef = generateNodeRef();
         when(mockedVersion.getFrozenStateNodeRef())
             .thenReturn(versionNodeRef);
-        when(mockedDbNodeService.exists(versionRecordNodeRef))
-            .thenReturn(false);
-        
+
         // indicate that the version doesn't have the aspect
         when(mockedDbNodeService.hasAspect(versionNodeRef, RecordableVersionModel.ASPECT_RECORDED_VERSION))
             .thenReturn(true);
         
-        // indicate that the associated version record exists
-        when(mockedDbNodeService.getProperty(versionNodeRef, RecordableVersionModel.PROP_RECORD_NODE_REF))
-            .thenReturn(versionRecordNodeRef);
-        
         // mark as destroyed
         recordableVersionService.destroyRecordedVersion(mockedVersion);
         

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java

@@ -33,10 +33,11 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -562,7 +563,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme
         executeWebScript(parameters);
 
         verify(contentStreamer, times(1)).streamContent(any(WebScriptRequest.class), any(WebScriptResponse.class),
-                    csvFileCaptor.capture(), any(Long.class), any(Boolean.class), any(String.class), any(Map.class));
+                    csvFileCaptor.capture(), nullable(Long.class), any(Boolean.class), any(String.class), any(Map.class));
 
         File fileForDownload = csvFileCaptor.getValue();
         assertNotNull(fileForDownload);

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/impl/RMSitesImplUnitTest.java

@@ -28,8 +28,9 @@
 package org.alfresco.rm.rest.api.impl;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -41,7 +42,6 @@ import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.test.util.AlfMock;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.rest.api.impl.SiteImportPackageHandler;
 import org.alfresco.rest.api.model.Site;
 import org.alfresco.rest.api.model.SiteUpdate;
@@ -59,10 +59,11 @@ import org.alfresco.service.cmr.view.Location;
 import org.alfresco.service.namespace.QName;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit Test class for RMSitesImpl.
@@ -71,6 +72,7 @@ import org.mockito.MockitoAnnotations;
  * @since 2.6
  *
  */
+@RunWith(MockitoJUnitRunner.class)
 public class RMSitesImplUnitTest  extends BaseUnitTest
 {
     private static final String RM_SITE_TITLE_AFTER_UPDATE = "Updated Title";
@@ -86,8 +88,6 @@ public class RMSitesImplUnitTest  extends BaseUnitTest
     @Mock
     private SiteService mockedSiteService;
     @Mock
-    AuthenticationUtil mockAuthenticationUtil;
-    @Mock
     private ImporterService mockedImporterService;
     @Mock
     private FavouritesService mockedFavouritesService;
@@ -95,7 +95,6 @@ public class RMSitesImplUnitTest  extends BaseUnitTest
     @Before
     public void before()
     {
-        MockitoAnnotations.initMocks(this);
     }
 
     @Test
@@ -138,7 +137,7 @@ public class RMSitesImplUnitTest  extends BaseUnitTest
 
         verify(mockedImporterService, times(1)).importView(any(SiteImportPackageHandler.class), any(Location.class), any(ImporterBinding.class), eq(null));
         verify(mockedSiteService, times(1)).createContainer(RM_SITE_ID, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
-        verify(mockedFavouritesService, times(1)).addFavourite(any(String.class), any(NodeRef.class));
+        verify(mockedFavouritesService, times(1)).addFavourite(nullable(String.class), any(NodeRef.class));
 
         //verify returned values for RM site are the right ones
         assertEquals(RMSiteCompliance.STANDARD, createdRMSite.getCompliance());
@@ -191,7 +190,7 @@ public class RMSitesImplUnitTest  extends BaseUnitTest
 
         verify(mockedImporterService, times(1)).importView(any(SiteImportPackageHandler.class), any(Location.class), any(ImporterBinding.class), eq(null));
         verify(mockedSiteService, times(1)).createContainer(RM_SITE_ID, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
-        verify(mockedFavouritesService, times(1)).addFavourite(any(String.class), any(NodeRef.class));
+        verify(mockedFavouritesService, times(1)).addFavourite(nullable(String.class), any(NodeRef.class));
 
         //verify returned values for RM site are the right ones
         assertEquals(RMSiteCompliance.DOD5015, createdRMSite.getCompliance());
@@ -253,13 +252,12 @@ public class RMSitesImplUnitTest  extends BaseUnitTest
         when(mockedNodeService.getType(siteNodeRef)).thenReturn(RecordsManagementModel.TYPE_RM_SITE);
 
         when(mockedSiteService.getSite(siteId)).thenReturn(mockedSiteInfo);
-        when(mockedSiteService.getMembersRole(eq(siteId), any(String.class))).thenReturn(RM_SITE_MANAGER_ROLE);
+        when(mockedSiteService.getMembersRole(eq(siteId), nullable(String.class))).thenReturn(RM_SITE_MANAGER_ROLE);
 
         //mock UpdateSite
         SiteUpdate mockedSiteUpdate= mock(SiteUpdate.class);
         when(mockedSiteUpdate.getDescription()).thenReturn(RM_SITE_DESCRIPTION_AFTER_UPDATE);
         when(mockedSiteUpdate.getTitle()).thenReturn(RM_SITE_TITLE_AFTER_UPDATE);
-        when(mockedSiteUpdate.getVisibility()).thenReturn(null);
         when(mockedSiteUpdate.wasSet(Site.TITLE)).thenReturn(true);
         when(mockedSiteUpdate.wasSet(Site.DESCRIPTION)).thenReturn(true);
 
@@ -309,7 +307,7 @@ public class RMSitesImplUnitTest  extends BaseUnitTest
         when(mockedNodeService.getType(siteNodeRef)).thenReturn(RecordsManagementModel.TYPE_RM_SITE);
 
         when(mockedSiteService.getSite(siteId)).thenReturn(mockedSiteInfo);
-        when(mockedSiteService.getMembersRole(eq(siteId), any(String.class))).thenReturn(RM_SITE_MANAGER_ROLE);
+        when(mockedSiteService.getMembersRole(eq(siteId), nullable(String.class))).thenReturn(RM_SITE_MANAGER_ROLE);
 
         //STANDARD compliance
         RMSite rmSite = rmSitesImpl.getRMSite(siteId);

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>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <properties>

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>14.17</version>
+      <version>14.28-SNAPSHOT</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <properties>

data-model/src/main/java/org/alfresco/repo/content/ContentStore.java

@@ -26,6 +26,7 @@
 package org.alfresco.repo.content;
 
 import org.alfresco.api.AlfrescoPublicApi;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentAccessor;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -33,6 +34,9 @@ import org.alfresco.service.cmr.repository.ContentStreamListener;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.DirectAccessUrl;
 
+import java.util.Collections;
+import java.util.Map;
+
 
 /**
  * Provides low-level retrieval of content
@@ -324,4 +328,20 @@ public interface ContentStore
         throw new UnsupportedOperationException(
                 "Retrieving direct access URLs is not supported by this content store.");
     }
+
+    /**
+     * Gets a key-value (String-String) collection of storage headers/properties with their respective values.
+     * A particular Cloud Connector will fill in that data with Cloud Storage Provider generic data.
+     * Map may be also filled in with entries consisting of pre-defined Alfresco keys of {@code ObjectStorageProps} and their values.
+     * If empty Map is returned - no connector is present or connector is not supporting retrieval of the properties
+     * or cannot determine the properties.
+     *
+     * @param contentUrl the URL of the content for which the storage properties are to be retrieved.
+     * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values.
+     */
+    @Experimental
+    default Map<String, String> getStorageProperties(String contentUrl)
+    {
+        return Collections.emptyMap();
+    }
 }

data-model/src/main/java/org/alfresco/repo/content/ObjectStorageProps.java

@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * Alfresco Data model classes
+ * %%
+ * Copyright (C) 2005 - 2021 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.repo.content;
+
+import org.alfresco.service.Experimental;
+
+/**
+ * Enumeration with "header" values for Alfresco derived Storage Properties
+ * Values of this enum should be used when adding Alfresco derived key-value pairs in Storage Properties map.
+ * Subject to expand/change.
+ *
+ * @author mpichura
+ */
+@Experimental
+public enum ObjectStorageProps {
+    /**
+     * Object's content is archived and not immediately accessible.
+     */
+    X_ALF_ARCHIVED("x-alf-archived"),
+    /**
+     * Object's content retrieval from archive is in progress
+     */
+    X_ALF_ARCHIVE_RESTORE_IN_PROGRESS("x-alf-archive-restore-in-progress"),
+    /**
+     * Expiry date and time of object's content retrieved from archive.
+     * Use YYYYMMDDThhmmssZ (ISO-8601) datetime format when using this value as key in Storage Properties map.
+     */
+    X_ALF_ARCHIVE_RESTORE_EXPIRY("x-alf-archive-restore-expiry");
+
+    ObjectStorageProps(String value) {
+        this.value = value;
+    }
+
+    private final String value;
+
+    public String getValue() {
+        return value;
+    }
+
+}

data-model/src/main/java/org/alfresco/service/Experimental.java

@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Data model classes
+ * %%
+ * Copyright (C) 2005 - 2021 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.service;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to mark a type/method/field as experimental.
+ * <p>
+ * If this annotation is present on an element it marks it as experimental and subject to change without further notice.
+ * The element may even be deleted or renamed without any notice.
+ * Experimental element may likely become a valid one (not experimental anymore) in future releases but there is no guarantee when
+ * and if that happens.
+ *
+ * @author mpichura
+ */
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
+@Retention(RetentionPolicy.CLASS)
+@Documented
+public @interface Experimental {
+    /**
+     * Further description that can optionally be added to clarify possible future changes of annotated object.
+     *
+     * @return a String, the default is an empty String.
+     */
+    String description() default "";
+
+}

mmt/pom.xml

@@ -0,0 +1,112 @@
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-mmt</artifactId>
+    <name>Alfresco Module Management Tool</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-community-repo</artifactId>
+        <version>14.28-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-repository</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.schlichtherle.truezip</groupId>
+            <artifactId>truezip-driver-zip</artifactId>
+            <version>${dependency.truezip.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.schlichtherle.truezip</groupId>
+            <artifactId>truezip-file</artifactId>
+            <version>${dependency.truezip.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${dependency.maven-artifact.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-mmt</id>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <manifestEntries>
+                                <Main-Class>org.alfresco.repo.module.tool.ModuleManagementTool</Main-Class>
+                            </manifestEntries>
+                        </transformer>
+                    </transformers>
+                    <artifactSet>
+                        <includes>
+                            <include>de.schlichtherle.truezip:*</include>
+                            <include>org.alfresco:alfresco-core</include>
+                            <include>org.alfresco:alfresco-repository</include>
+                            <include>org.apache.commons:commons-compress</include>
+                            <include>org.safehaus.jug:jug</include>
+                            <include>org.alfresco.surf:spring-surf-core</include>
+                            <include>org.tukaani:xz</include>
+                            <include>org.apache.maven:maven-artifact</include>
+                        </includes>
+                    </artifactSet>
+                    <filters>
+                        <filter>
+                            <artifact>org.alfresco:alfresco-core</artifact>
+                            <includes>
+                                <include>org/alfresco/error/AlfrescoRuntimeException.class</include>
+                                <include>org/alfresco/util/Pair.class</include>
+                                <include>org/alfresco/util/EqualsHelper.class</include>
+                                <include>org/alfresco/util/VersionNumber.class</include>
+                            </includes>
+                        </filter>
+                        <filter>
+                            <artifact>org.apache.maven:maven-artifact</artifact>
+                            <includes>
+                                <include>org/apache/maven/artifact/versioning/**/*.class</include>
+                            </includes>
+                        </filter>
+                        <filter>
+                            <artifact>org.alfresco:alfresco-repository</artifact>
+                            <includes>
+                                <include>org/alfresco/repo/module/tool/default-file-mapping.properties</include>
+                                <include>org/alfresco/repo/module/**/*.class</include>
+                                <include>org/alfresco/service/cmr/module/**/*.class</include>
+                            </includes>
+                        </filter>
+                        <filter>
+                            <artifact>org.alfresco.surf:spring-surf-core</artifact>
+                            <includes>
+                                <include>org/springframework/extensions/surf/util/I18NUtil.class</include>
+                                <include>org/springframework/extensions/surf/util/ISO8601DateFormat.class</include>
+                                <include>org/springframework/extensions/surf/exception/PlatformRuntimeException.class</include>
+                            </includes>
+                        </filter>
+                        <filter>
+                            <!-- Duplicated file in truezip-driver-file, need to filter this one -->
+                            <artifact>de.schlichtherle.truezip:truezip-driver-zip</artifact>
+                            <excludes>
+                                <exclude>META-INF/services/de.schlichtherle.truezip.fs.spi.FsDriverService</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

mmt/src/main/resources/LICENSE

@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 </project>

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -71,6 +71,7 @@
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-mmt</artifactId>
                                     <type>jar</type>
+                                    <version>${project.version}</version>
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>
                                 </artifactItem>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <properties>

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>14.17</version>
+    <version>14.28-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -12,11 +12,13 @@
       <version>12</version>
     </parent>
 
+    
     <modules>
         <module>core</module>
         <module>data-model</module>
         <module>repository</module>
         <module>remote-api</module>
+        <module>mmt</module>
         <module>packaging</module>
         <module>amps</module>
     </modules>
@@ -43,7 +45,6 @@
         <dir.root>${project.build.directory}/alf_data</dir.root>
 
         <dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version>
-        <dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
         <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
         <dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
@@ -64,7 +65,6 @@
         <dependency.webscripts.version>8.24</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.69</dependency.bouncycastle.version>
         <dependency.mockito-core.version>3.11.2</dependency.mockito-core.version>
-        <dependency.mockito-all.version>1.10.19</dependency.mockito-all.version>
         <dependency.org-json.version>20210307</dependency.org-json.version>
         <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
@@ -91,6 +91,7 @@
         <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
         <dependency.swagger-parser.version>1.0.52</dependency.swagger-parser.version>
         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
+        <dependency.maven-artifact.version>3.8.3</dependency.maven-artifact.version>
 
         <dependency.jakarta-jaxb-api.version>2.3.3</dependency.jakarta-jaxb-api.version>
         <dependency.jakarta-ws-api.version>2.3.3</dependency.jakarta-ws-api.version>
@@ -143,7 +144,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>14.17</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -290,11 +291,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-mmt</artifactId>
-                <version>${dependency.alfresco-mmt.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-server-root</artifactId>
@@ -734,11 +730,6 @@
                 <artifactId>gunit</artifactId>
                 <version>${dependency.antlr.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>${dependency.mockito-all.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <dependencies>

remote-api/src/main/java/org/alfresco/repo/web/scripts/quickshare/UnshareContentDelete.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2016 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%
- */
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2016 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.repo.web.scripts.quickshare;
 
 import java.util.HashMap;
@@ -31,10 +31,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.model.QuickShareModel;
+import org.alfresco.repo.tenant.TenantUtil;
 import org.alfresco.service.cmr.quickshare.InvalidSharedIdException;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.webscripts.Cache;
@@ -82,14 +84,15 @@ public class UnshareContentDelete extends AbstractQuickShareContent
 
         try
         {
-            NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
+            Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
+            String networkTenantDomain = pair.getFirst();
 
-            String sharedBy = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
-            if (!quickShareService.canDeleteSharedLink(nodeRef, sharedBy))
+            TenantUtil.runAsSystemTenant(() ->
             {
-                throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Can't perform unshare action: " + sharedId);
-            }
-            quickShareService.unshareContent(sharedId);
+                checkIfCanDeleteSharedLink(sharedId);
+                quickShareService.unshareContent(sharedId);
+                return null;
+            }, networkTenantDomain);
 
             Map<String, Object> model = new HashMap<>(1);
             model.put("success", Boolean.TRUE);
@@ -106,4 +109,14 @@ public class UnshareContentDelete extends AbstractQuickShareContent
             throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Unable to find: " + sharedId);
         }
     }
+
+    private void checkIfCanDeleteSharedLink(String sharedId) {
+        NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
+
+        String sharedBy = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
+        if (!quickShareService.canDeleteSharedLink(nodeRef, sharedBy))
+        {
+            throw new WebScriptException(HttpServletResponse.SC_FORBIDDEN, "Can't perform unshare action: " + sharedId);
+        }
+    }
 }

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

@@ -274,15 +274,15 @@ public class QuickShareLinksImpl implements QuickShareLinks, RecognizedParamsExt
 
         try
         {
-            NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
+            Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
+            String networkTenantDomain = pair.getFirst();
 
-            String sharedByUserId = (String)nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
-            if (!quickShareService.canDeleteSharedLink(nodeRef, sharedByUserId))
+            TenantUtil.runAsSystemTenant(() ->
             {
-                throw new PermissionDeniedException("Can't perform unshare action: " + sharedId);
-            }
-
-            quickShareService.unshareContent(sharedId);
+                checkIfCanDeleteSharedLink(sharedId);
+                quickShareService.unshareContent(sharedId);
+                return null;
+            }, networkTenantDomain);
         }
         catch (InvalidSharedIdException ex)
         {
@@ -698,4 +698,14 @@ public class QuickShareLinksImpl implements QuickShareLinks, RecognizedParamsExt
             throw new InvalidArgumentException("A valid recipientEmail must be specified.");
         }
     }
+
+    private void checkIfCanDeleteSharedLink(String sharedId) {
+        NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
+
+        String sharedByUserId = (String)nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
+        if (!quickShareService.canDeleteSharedLink(nodeRef, sharedByUserId))
+        {
+            throw new PermissionDeniedException("Can't perform unshare action: " + sharedId);
+        }
+    }
 }

remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/admin/support-tools/admin-nodebrowser.get.html.ftl

@@ -33,7 +33,7 @@
       <#elseif v?is_number>
          ${v?c}
       <#elseif v?is_string>
-         "${v?string}"
+         "${v?html}"
       <#elseif v?is_hash>
          <#if v?keys?size gt maxDepth >
             <#stop "Max depth of object achieved">
@@ -188,7 +188,7 @@ ${url.serviceContext}/api/node/${nodeRef?replace("://","/")}/content;${prop?url}
          </tr>
          <#list result.children as n>
          <tr>
-            <td><a href="#" onclick="AdminConsole_childClick('${n.childRef}');return false;">${n.QName}</a></td>
+            <td><a href="#" onclick="AdminConsole_childClick('${n.childRef}');return false;">${n.QName?html}</a></td>
             <td><a href="#" onclick="AdminConsole_childClick('${n.childRef}');return false;">${n.childRef}</a></td>
             <td>${n.primary?string}</td>
             <td>${n.typeQName}</td>
@@ -222,7 +222,7 @@ ${url.serviceContext}/api/node/${nodeRef?replace("://","/")}/content;${prop?url}
          </tr>
          <#list result.parents as p>
          <tr>
-            <td>${p.name.prefixedName}</td>
+            <td>${p.name.prefixedName?html}</td>
             <td>${p.parentTypeName.prefixedName}</td>
             <td><a href="#" onclick="AdminConsole_parentClick('${p.parentRef}');return false;">${p.parentRef}</a></td></td>
             <td>${p.primary?string}</td>
@@ -280,7 +280,7 @@ ${url.serviceContext}/api/node/${nodeRef?replace("://","/")}/content;${prop?url}
       <@section label=msg("nodebrowser.permissions") />
       <table id="perminfo-table" class="node">
          <tr><td>${msg("nodebrowser.inherits")}: ${result.permissions.inherit?string}</td></tr>
-         <tr><td>${msg("nodebrowser.owner")}: ${result.permissions.owner!""}</td></tr>
+         <tr><td>${msg("nodebrowser.owner")}: <#if result.permissions.owner??>${result.permissions.owner?html}</#if></td></tr>
       </table>
       <table id="permissions-table" class="node grid">
          <tr>
@@ -291,7 +291,7 @@ ${url.serviceContext}/api/node/${nodeRef?replace("://","/")}/content;${prop?url}
          <#list result.permissions.entries as p>
          <tr>
             <td>${p.permission}</td>
-            <td>${p.authority}</td>
+            <td>${p.authority?html}</td>
             <td>${p.accessStatus}</td>
          </tr>
          </#list>

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.17</version>
+        <version>14.28-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -191,7 +191,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>3.8.3</version>
+            <version>${dependency.maven-artifact.version}</version>
         </dependency>
         <dependency>
             <groupId>de.schlichtherle.truezip</groupId>

repository/src/main/java/org/alfresco/repo/admin/patch/impl/SurfConfigFolderPatch.java

@@ -26,12 +26,6 @@
 
 package org.alfresco.repo.admin.patch.impl;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.admin.patch.AsynchronousPatch;
 import org.alfresco.repo.admin.patch.PatchExecuter;
@@ -55,6 +49,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.surf.util.I18NUtil;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Patch to add <i>cm:indexControl</i> aspect to sites' surf-config folders and
  * their children as well as to the shared surf-config folder(s) and its/their children.
@@ -382,8 +382,12 @@ public class SurfConfigFolderPatch extends AsynchronousPatch
             this.siteTypeQNameId = qnameDAO.getQName(SiteModel.TYPE_SITE);
         }
 
-        @Override
-        public synchronized int getTotalEstimatedWorkSize()
+        @Override public synchronized int getTotalEstimatedWorkSize()
+        {
+            return (int) getTotalEstimatedWorkSizeLong();
+        }
+
+        @Override public synchronized long getTotalEstimatedWorkSizeLong()
         {
             if (maxId == Long.MAX_VALUE)
             {
@@ -405,7 +409,7 @@ public class SurfConfigFolderPatch extends AsynchronousPatch
                     logger.debug("\tQ: Work count: " + workCount);
                 }
             }
-            return (int) workCount;
+            return workCount;
         }
 
         @Override

repository/src/main/java/org/alfresco/repo/batch/BatchProcessor.java

@@ -25,6 +25,18 @@
  */
 package org.alfresco.repo.batch;
 
+import org.alfresco.api.AlfrescoPublicApi;
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.node.integrity.IntegrityException;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.util.TraceableThreadFactory;
+import org.alfresco.util.transaction.TransactionListenerAdapter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationEventPublisher;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
@@ -43,18 +55,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.alfresco.api.AlfrescoPublicApi;
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.node.integrity.IntegrityException;
-import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.util.TraceableThreadFactory;
-import org.alfresco.util.transaction.TransactionListenerAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationEventPublisher;
-
 /**
  * A <code>BatchProcessor</code> manages the running and monitoring of a potentially long-running transactional batch
  * process. It iterates over a collection, and queues jobs that fire a worker on a batch of members. The queued jobs
@@ -158,10 +158,17 @@ public class BatchProcessor<T> implements BatchMonitor
                     new BatchProcessWorkProvider<T>()
                     {
                         boolean hasMore = true;
-                        public int getTotalEstimatedWorkSize()
+
+                        @Override public int getTotalEstimatedWorkSize()
+                        {
+                            return (int) getTotalEstimatedWorkSizeLong();
+                        }
+
+                        @Override public long getTotalEstimatedWorkSizeLong()
                         {
                             return collection.size();
                         }
+
                         public Collection<T> getNextWork()
                         {
                             // Only return the collection once

repository/src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java

@@ -1,44 +1,47 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 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%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2021 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.repo.content;
 
-import java.util.List;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.cache.SimpleCache;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.util.GUID;
-import org.alfresco.util.Pair;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.cache.SimpleCache;
+import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.repository.ContentIOException;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A store providing support for content store implementations that provide
@@ -416,4 +419,24 @@ public abstract class AbstractRoutingContentStore implements ContentStore
         }
         return deleted;
     }
+
+    @Override
+    @Experimental
+    public Map<String, String> getStorageProperties(String contentUrl) {
+        ContentStore contentStore = selectReadStore(contentUrl);
+
+        if (contentStore == null) {
+            if (logger.isTraceEnabled()) {
+                logger.trace("Storage properties not found for content URL: " + contentUrl);
+            }
+            return Collections.emptyMap();
+        }
+        if (logger.isTraceEnabled()) {
+            logger.trace("Getting storage properties from store: \n" +
+                    "   Content URL: " + contentUrl + "\n" +
+                    "   Store:       " + contentStore);
+        }
+
+        return contentStore.getStorageProperties(contentUrl);
+    }
 }

repository/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java

@@ -45,6 +45,7 @@ import org.alfresco.repo.policy.ClassPolicyDelegate;
 import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
@@ -649,6 +650,23 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
         return directAccessUrl;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @Experimental
+    public Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
+    {
+        final ContentData contentData = getContentData(nodeRef, propertyQName);
+
+        if (contentData == null || contentData.getContentUrl() == null)
+        {
+            throw new IllegalArgumentException("The supplied nodeRef " + nodeRef + " and property name: " + propertyQName + " has no content.");
+        }
+
+        return store.getStorageProperties(contentData.getContentUrl());
+    }
+
     protected String getFileName(NodeRef nodeRef)
     {
         String fileName = null;
@@ -672,4 +690,4 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
         }
          return validFor;
     }
-}
+}

repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java

@@ -25,6 +25,7 @@
  */
 package org.alfresco.repo.content.caching;
 
+import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -35,12 +36,12 @@ import org.alfresco.repo.content.caching.quota.QuotaManagerStrategy;
 import org.alfresco.repo.content.caching.quota.UnlimitedQuotaStrategy;
 import org.alfresco.repo.content.filestore.FileContentStore;
 import org.alfresco.repo.content.filestore.SpoofedTextContentReader;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentStreamListener;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.DirectAccessUrl;
-import org.alfresco.service.cmr.repository.NodeRef;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.BeanNameAware;
@@ -67,7 +68,7 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
     private final static Log log = LogFactory.getLog(CachingContentStore.class);
     // NUM_LOCKS absolutely must be a power of 2 for the use of locks to be evenly balanced
     private final static int numLocks = 256;
-    private final static ReentrantReadWriteLock[] locks; 
+    private final static ReentrantReadWriteLock[] locks;
     private ContentStore backingStore;
     private ContentCache cache;
     private QuotaManagerStrategy quota = new UnlimitedQuotaStrategy();
@@ -381,6 +382,13 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
         }
     }
 
+    @Override
+    @Experimental
+    public Map<String, String> getStorageProperties(final String contentUrl)
+    {
+        return backingStore.getStorageProperties(contentUrl);
+    }
+
     /**
      * Get a ReentrantReadWriteLock for a given URL. The lock is from a pool rather than
      * per URL, so some contention is expected.

repository/src/main/java/org/alfresco/repo/content/replication/AggregatingContentStore.java

@@ -25,7 +25,10 @@
  */
 package org.alfresco.repo.content.replication;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -36,11 +39,11 @@ import org.alfresco.repo.content.ContentContext;
 import org.alfresco.repo.content.ContentStore;
 import org.alfresco.repo.content.UnsupportedContentUrlException;
 import org.alfresco.repo.content.caching.CachingContentStore;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.DirectAccessUrl;
-import org.alfresco.service.cmr.repository.NodeRef;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -64,9 +67,10 @@ import org.apache.commons.logging.LogFactory;
  * @see CachingContentStore
  */
 public class AggregatingContentStore extends AbstractContentStore
-{    
+{
     private static final Log logger = LogFactory.getLog(AggregatingContentStore.class);
-    
+    public static final String REPLICATING_CONTENT_STORE_NOT_INITIALISED = "ReplicatingContentStore not initialised";
+
     private ContentStore primaryStore;
     private List<ContentStore> secondaryStores;
     
@@ -134,7 +138,7 @@ public class AggregatingContentStore extends AbstractContentStore
     {
         if (primaryStore == null)
         {
-            throw new AlfrescoRuntimeException("ReplicatingContentStore not initialised");
+            throw new AlfrescoRuntimeException(REPLICATING_CONTENT_STORE_NOT_INITIALISED);
         }
         
         // get a read lock so that we are sure that no replication is underway
@@ -173,7 +177,7 @@ public class AggregatingContentStore extends AbstractContentStore
     {
         if (primaryStore == null)
         {
-            throw new AlfrescoRuntimeException("ReplicatingContentStore not initialised");
+            throw new AlfrescoRuntimeException(REPLICATING_CONTENT_STORE_NOT_INITIALISED);
         }
 
         // get a read lock so that we are sure that no replication is underway
@@ -243,7 +247,7 @@ public class AggregatingContentStore extends AbstractContentStore
     {
         // get the writer
         ContentWriter writer = primaryStore.getWriter(ctx);
-                
+
         return writer;
     }
 
@@ -321,7 +325,7 @@ public class AggregatingContentStore extends AbstractContentStore
     {
         if (primaryStore == null)
         {
-            throw new AlfrescoRuntimeException("ReplicatingContentStore not initialised");
+            throw new AlfrescoRuntimeException(REPLICATING_CONTENT_STORE_NOT_INITIALISED);
         }
 
         // get a read lock so that we are sure that no replication is underway
@@ -400,4 +404,48 @@ public class AggregatingContentStore extends AbstractContentStore
             readLock.unlock();
         }
     }
+
+    @Override
+    @Experimental
+    public Map<String, String> getStorageProperties(String contentUrl)
+    {
+        if (primaryStore == null) {
+            throw new AlfrescoRuntimeException(REPLICATING_CONTENT_STORE_NOT_INITIALISED);
+        }
+
+        // get a read lock so that we are sure that no replication is underway
+        readLock.lock();
+        try {
+            Optional<Map<String, String>> objectStoragePropertiesMap = Optional.empty();
+            // Check the primary store
+            try {
+                objectStoragePropertiesMap = Optional.of(primaryStore.getStorageProperties(contentUrl));
+            } catch (UnsupportedContentUrlException e) {
+                if (logger.isTraceEnabled()) {
+                    logger.trace("Primary store could not handle content URL: " + contentUrl);
+                }
+            }
+
+            if (objectStoragePropertiesMap.isEmpty()) {// the content is not in the primary store so we have to go looking for it
+                for (ContentStore store : secondaryStores) {
+                    try {
+                        objectStoragePropertiesMap = Optional.of(store.getStorageProperties(contentUrl));
+                    } catch (UnsupportedContentUrlException e) {
+                        if (logger.isTraceEnabled()) {
+                            logger.trace("Secondary store " + store + " could not handle content URL: " + contentUrl);
+                        }
+                    }
+
+                    if (objectStoragePropertiesMap.isPresent()) {
+                        return objectStoragePropertiesMap.get();
+                    }
+                }
+                throw new UnsupportedContentUrlException(this, contentUrl);
+            }
+            return objectStoragePropertiesMap.orElse(Collections.emptyMap());
+
+        } finally {
+            readLock.unlock();
+        }
+    }
 }

repository/src/main/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java

@@ -1,51 +1,52 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 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%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2021 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.repo.tenant;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import org.alfresco.repo.content.AbstractRoutingContentStore;
-import org.alfresco.repo.content.ContentContext;
-import org.alfresco.repo.content.ContentStore;
-import org.alfresco.repo.domain.tenant.TenantAdminDAO;
-import org.alfresco.repo.domain.tenant.TenantEntity;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.transaction.TransactionService;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import org.alfresco.repo.content.AbstractRoutingContentStore;
+import org.alfresco.repo.content.ContentContext;
+import org.alfresco.repo.content.ContentStore;
+import org.alfresco.repo.domain.tenant.TenantAdminDAO;
+import org.alfresco.repo.domain.tenant.TenantEntity;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.Experimental;
+import org.alfresco.service.transaction.TransactionService;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 /**
  * Content Store that supports tenant routing, if multi-tenancy is enabled.
@@ -270,6 +271,13 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
             return -1;
         }
     }
-    
+
+    @Experimental
+    @Override
+    public Map<String, String> getStorageProperties(String contentUrl)
+    {
+        return getTenantContentStore().getStorageProperties(contentUrl);
+    }
+
     protected abstract ContentStore initContentStore(ApplicationContext ctx, String contentRoot);
 }

repository/src/main/java/org/alfresco/service/cmr/repository/ContentService.java

@@ -28,9 +28,13 @@ package org.alfresco.service.cmr.repository;
 
 import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.service.Auditable;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
 import org.alfresco.service.namespace.QName;
 
+import java.util.Collections;
+import java.util.Map;
+
 /**
  * Provides methods for accessing and transforming content.
  * <p>
@@ -194,4 +198,22 @@ public interface ContentService
      */
     @Auditable(parameters = {"nodeRef", "validFor"})
     DirectAccessUrl requestContentDirectUrl(NodeRef nodeRef, boolean attachment, Long validFor);
+
+    /**
+     * Gets a key-value (String-String) collection of storage headers/properties with their respective values for a specific node reference.
+     * A particular Cloud Connector will fill in that data with Cloud Storage Provider generic data.
+     * Map may be also filled in with entries consisting of pre-defined Alfresco keys of {@code ObjectStorageProps} and their values.
+     * If empty Map is returned - no connector is present or connector is not supporting retrieval of the properties
+     * or cannot determine the properties.
+     *
+     * @param nodeRef a reference to a node having a content property
+     * @param propertyQName the name of the property, which must be of type <b>content</b>
+     * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values for a given {@link NodeRef}.
+     */
+    @Auditable
+    @Experimental
+    default Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
+    {
+        return Collections.emptyMap();
+    }
 }

repository/src/main/resources/alfresco/public-services-security-context.xml

@@ -497,6 +497,7 @@
                org.alfresco.service.cmr.repository.ContentService.getTempWriter=ACL_ALLOW
                org.alfresco.service.cmr.repository.ContentService.requestContentDirectUrl=ACL_NODE.0.sys:base.ReadContent
                org.alfresco.service.cmr.repository.ContentService.isContentDirectUrlEnabled=ACL_ALLOW
+               org.alfresco.service.cmr.repository.ContentService.getStorageProperties=ACL_NODE.0.sys:base.ReadContent
                org.alfresco.service.cmr.repository.ContentService.*=ACL_DENY
             </value>
         </property>

repository/src/test/java/org/alfresco/repo/content/ContentServiceImplUnitTest.java

@@ -25,8 +25,10 @@
  */
 package org.alfresco.repo.content;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyLong;
@@ -41,6 +43,7 @@ import static org.mockito.MockitoAnnotations.openMocks;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException;
 import org.alfresco.repo.content.directurl.SystemWideDirectUrlConfig;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -50,6 +53,9 @@ import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
+import java.util.Collections;
+import java.util.Map;
+
 /**
  * Unit tests for content service implementation.
  *
@@ -64,6 +70,13 @@ public class ContentServiceImplUnitTest
     private static final Long SYS_MAX_EXPIRY_TIME_IN_SECS = 300L;
 
     private static final NodeRef NODE_REF = new NodeRef("content://Node/Ref");
+    public static final String SOME_CONTENT_URL = "someContentUrl";
+    private static final NodeRef NODE_REF_2 = new NodeRef("content://Node/Ref2");;
+
+    private static final String X_AMZ_HEADER_1 = "x-amz-header1";
+    private static final String VALUE_1 = "value1";
+    private static final String X_AMZ_HEADER_2 = "x-amz-header-2";
+    private static final String VALUE_2 = "value2";
 
     @InjectMocks
     private ContentServiceImpl contentService;
@@ -77,12 +90,15 @@ public class ContentServiceImplUnitTest
     @Mock
     private ContentData mockContentData;
 
+    @Mock
+    private DictionaryService mockDictionaryService;
+
     @Before
     public void setup()
     {
         openMocks(this);
         when(mockNodeService.getProperty(NODE_REF, ContentModel.PROP_CONTENT)).thenReturn(mockContentData);
-        when(mockContentData.getContentUrl()).thenReturn("someContentUrl");
+        when(mockContentData.getContentUrl()).thenReturn(SOME_CONTENT_URL);
         when(mockContentData.getMimetype()).thenReturn("someMimetype");
         when(mockNodeService.getProperty(NODE_REF, ContentModel.PROP_NAME)).thenReturn("someFilename");
     }
@@ -148,6 +164,49 @@ public class ContentServiceImplUnitTest
         verify(mockContentStore, times(1)).requestContentDirectUrl(anyString(), eq(true), anyString(), anyString(), anyLong());
     }
 
+    @Test
+    public void shouldReturnStoragePropertiesWhenTheyExist()
+    {
+        final Map<String, String> storageObjectPropsMap = Map.of(X_AMZ_HEADER_1, VALUE_1, X_AMZ_HEADER_2, VALUE_2);
+        when(mockContentStore.getStorageProperties(SOME_CONTENT_URL)).thenReturn(storageObjectPropsMap);
+
+        final Map<String, String> objectStorageProperties = contentService.getStorageProperties(NODE_REF, ContentModel.PROP_CONTENT);
+        assertFalse(objectStorageProperties.isEmpty());
+        assertEquals(storageObjectPropsMap, objectStorageProperties);
+    }
+
+    @Test
+    public void shouldReturnEmptyStoragePropertiesWhenTheyDontExist()
+    {
+        when(mockContentStore.getStorageProperties(SOME_CONTENT_URL)).thenReturn(Collections.emptyMap());
+
+        final Map<String, String> objectStorageProperties = contentService.getStorageProperties(NODE_REF, ContentModel.PROP_CONTENT);
+        assertTrue(objectStorageProperties.isEmpty());
+    }
+
+    @Test
+    public void getStoragePropertiesThrowsExceptionWhenNoContentFound()
+    {
+        final String dummyContentProperty = "dummy";
+        when(mockNodeService.getProperty(NODE_REF_2, ContentModel.PROP_CONTENT)).thenReturn(dummyContentProperty);
+        when(mockDictionaryService.getProperty(ContentModel.PROP_CONTENT)).thenReturn(null);
+
+        assertThrows(IllegalArgumentException.class, () -> {
+            contentService.getStorageProperties(NODE_REF_2, ContentModel.PROP_CONTENT);
+        });
+    }
+
+    @Test
+    public void getStoragePropertiesThrowsExceptionWhenNoContentUrlFound()
+    {
+        final ContentData contentWithoutUrl = new ContentData(null, null, 0, null);
+        when(mockNodeService.getProperty(NODE_REF_2, ContentModel.PROP_CONTENT)).thenReturn(contentWithoutUrl);
+
+        assertThrows(IllegalArgumentException.class, () -> {
+            contentService.getStorageProperties(NODE_REF_2, ContentModel.PROP_CONTENT);
+        });
+    }
+
     /* Helper method to set system-wide direct access url configuration settings */
     private void setupSystemWideDirectAccessConfig(Boolean isEnabled)
     {

repository/src/test/java/org/alfresco/repo/content/caching/CachingContentStoreTest.java

@@ -46,6 +46,7 @@ import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.Locale;
+import java.util.Map;
 
 import org.alfresco.repo.content.ContentContext;
 import org.alfresco.repo.content.ContentStore;
@@ -521,4 +522,22 @@ public class CachingContentStoreTest
         when(backingStore.requestContentDirectUrl(anyString(), eq(true), anyString(), anyString(), anyLong())).thenReturn(new DirectAccessUrl());
         cachingStore.requestContentDirectUrl("url", true,"someFile", "someMimeType", 30L);
     }
+
+    @Test
+    public void shouldReturnSomeStorageProperties()
+    {
+        final Map<String, String> propertiesMap = Map.of("x-amz-header1", "value1", "x-amz-header2", "value2");
+        final String contentUrl = "url";
+        when(backingStore.getStorageProperties(contentUrl)).thenReturn(propertiesMap);
+        final Map<String, String> storageProperties = cachingStore.getStorageProperties(contentUrl);
+        assertFalse(storageProperties.isEmpty());
+        assertEquals(propertiesMap, storageProperties);
+    }
+
+    @Test
+    public void shouldReturnEmptyStorageProperties()
+    {
+        Map<String, String> storageProperties = cachingStore.getStorageProperties("url");
+        assertTrue(storageProperties.isEmpty());
+    }
 }

repository/src/test/java/org/alfresco/repo/content/replication/AggregatingContentStoreTest.java

@@ -27,7 +27,9 @@ package org.alfresco.repo.content.replication;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.alfresco.repo.content.AbstractWritableContentStoreTest;
 import org.alfresco.repo.content.ContentContext;
@@ -58,6 +60,8 @@ import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Tests read and write functionality for the aggregating store.
@@ -72,7 +76,11 @@ import static org.mockito.Mockito.when;
 public class AggregatingContentStoreTest extends AbstractWritableContentStoreTest
 {
     private static final String SOME_CONTENT = "The No. 1 Ladies' Detective Agency";
-    
+    public static final String X_AMZ_HEADER_1 = "x-amz-header1";
+    public static final String VALUE_1 = "value1";
+    public static final String X_AMZ_HEADER_2 = "x-amz-header2";
+    public static final String VALUE_2 = "value2";
+
     private AggregatingContentStore aggregatingStore;
     private ContentStore primaryStore;
     private List<ContentStore> secondaryStores;
@@ -307,4 +315,49 @@ public class AggregatingContentStoreTest extends AbstractWritableContentStoreTes
         directAccessUrl = aggStore.requestContentDirectUrl("urlSecSupported", true, "anyfilename", "anyMimetype", 30L);
         assertNotNull(directAccessUrl);
     }
+
+    @Test
+    public void shouldReturnStoragePropertiesFromPrimaryStore()
+    {
+        final String contentUrl = "url";
+        final Map<String, String> primaryStorePropertiesMap = Map.of(X_AMZ_HEADER_1, VALUE_1, X_AMZ_HEADER_2, VALUE_2);;
+        when(primaryStoreMock.getStorageProperties(contentUrl)).thenReturn(primaryStorePropertiesMap);
+
+        final Map<String, String> storageProperties = aggregatingStore.getStorageProperties(contentUrl);
+
+        assertFalse(storageProperties.isEmpty());
+        assertEquals(primaryStorePropertiesMap, storageProperties);
+        verify(secondaryStoreMock, times(0)).getStorageProperties(contentUrl);
+    }
+
+    @Test
+    public void shouldReturnStoragePropertiesFromSecondaryStore()
+    {
+        final String contentUrl = "url";
+        final Map<String, String> secondaryStorePropertiesMap = Map.of(X_AMZ_HEADER_1, VALUE_1, X_AMZ_HEADER_2, VALUE_2);;
+        when(primaryStoreMock.getStorageProperties(contentUrl)).thenReturn(Collections.emptyMap());
+        when(secondaryStoreMock.getStorageProperties(contentUrl)).thenReturn(secondaryStorePropertiesMap);
+
+        final Map<String, String> storageProperties = aggregatingStore.getStorageProperties(contentUrl);
+
+        assertFalse(storageProperties.isEmpty());
+        assertEquals(secondaryStorePropertiesMap, storageProperties);
+        verify(secondaryStoreMock, times(1)).getStorageProperties(contentUrl);
+        verify(primaryStoreMock, times(1)).getStorageProperties(contentUrl);
+    }
+
+    @Test
+    public void shouldReturnEmptyStorageProperties()
+    {
+        final String contentUrl = "url";
+        when(primaryStoreMock.getStorageProperties(contentUrl)).thenReturn(Collections.emptyMap());
+        when(secondaryStoreMock.getStorageProperties(contentUrl)).thenReturn(Collections.emptyMap());
+
+        final Map<String, String> storageProperties = aggregatingStore.getStorageProperties(contentUrl);
+
+        assertTrue(storageProperties.isEmpty());
+        verify(secondaryStoreMock, times(1)).getStorageProperties(contentUrl);
+        verify(primaryStoreMock, times(1)).getStorageProperties(contentUrl);
+    }
+
 }

repository/src/test/java/org/alfresco/util/BeanExtenderUnitTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -36,7 +36,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.alfresco.util.GUID;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -44,7 +43,6 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
@@ -82,8 +80,6 @@ public class BeanExtenderUnitTest
     @Before
     public void before() throws Exception
     {
-        MockitoAnnotations.initMocks(this);
-
         // setup common interactions
         doReturn(mockedPropertyValuesBean).when(mockedBeanDefinition).getPropertyValues();
         doReturn(mockedPropertyValuesExtendingBean).when(mockedExtendingBeanDefinition).getPropertyValues();
@@ -139,7 +135,6 @@ public class BeanExtenderUnitTest
         beanExtender.setBeanName(BEAN_NAME);
         beanExtender.setExtendingBeanName(EXTENDING_BEAN_NAME);
         doReturn(false).when(mockedBeanFactory).containsBean(BEAN_NAME);
-        doReturn(true).when(mockedBeanFactory).containsBean(EXTENDING_BEAN_NAME);
 
         // expecting exception
         exception.expect(NoSuchBeanDefinitionException.class);
@@ -230,7 +225,6 @@ public class BeanExtenderUnitTest
         doReturn(mockedExtendingBeanDefinition).when(mockedBeanFactory).getBeanDefinition(EXTENDING_BEAN_NAME);
 
         // bean class names
-        doReturn("a").when(mockedBeanDefinition).getBeanClassName();
         doReturn(null).when(mockedExtendingBeanDefinition).getBeanClassName();
 
         PropertyValue mockedPropertyValueOne = generateMockedPropertyValue("one", "1");

scripts/travis/init.sh

@@ -9,10 +9,8 @@ mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml"
 find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
 
 # Docker Logins
-if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
-  echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
-fi
+echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
+echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
 
 popd
 set +vex

scripts/travis/source_clear.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+echo "=========================== Starting SourceClear Script ==========================="
+PS4="\[\e[35m\]+ \[\e[m\]"
+set +e -v -x
+pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
+
+mvn -B -q clean install \
+    -DskipTests \
+    -Dmaven.javadoc.skip=true \
+    com.srcclr:srcclr-maven-plugin:scan \
+    -Dcom.srcclr.apiToken=${SRCCLR_API_TOKEN} > scan.log
+
+SUCCESS=$?   # this will read exit code of the previous command
+
+if [ -z "$VERACODE_FAILS_BUILD" ] || [ "$VERACODE_FAILS_BUILD" = false ] ; then
+    SUCCESS=0
+fi
+
+cat scan.log | grep -e 'Full Report Details' -e 'Failed'
+
+popd
+set +vex
+echo "=========================== Finishing SourceClear Script =========================="
+
+exit ${SUCCESS}