[maven-release-plugin][skip ci] prepare release 17.7

* Revert "ACS-2744 Private action validation logic (#1051)"

This reverts commit 64998b5c53.

* Revert "[ACS-2747] Prevent private action execution from the V1 HTTP API. Added end-to-end test method. (#1108)"

This reverts commit 8edfd4bdce.

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>17.2</version>
+      <version>17.7</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>17.2</version>
+      <version>17.7</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>17.2</version>
+      <version>17.7</version>
    </parent>
 
    <build>

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>17.2</version>
+      <version>17.7</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>17.2</version>
+      <version>17.7</version>
    </parent>
 
    <properties>

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>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

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

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>17.2</version>
+      <version>17.7</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <properties>

data-model/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java

@@ -78,6 +78,10 @@ public class ObjectTypeIdLuceneBuilder extends BaseLuceneBuilder
         String field = getLuceneFieldName();
         String stringValue = getValueAsString(value);
         TypeDefinitionWrapper type = cmisDictionaryService.findType(stringValue);
+        if (type == null)
+        {
+            throw new CmisInvalidArgumentException("Unknown type: " + stringValue);
+        }
         return lqpa
                 .getFieldQuery(field, type.getAlfrescoClass().toString(), AnalysisMode.IDENTIFIER, luceneFunction);
     }

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <dependencies>

packaging/distribution/pom.xml

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

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <modules>

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.2</version>
+        <version>17.7</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>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <developers>

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/AbstractCmisE2ETest.java

@@ -0,0 +1,76 @@
+package org.alfresco.cmis.search;
+
+import java.lang.reflect.Method;
+
+import org.alfresco.cmis.CmisProperties;
+import org.alfresco.utility.Utility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+
+@ContextConfiguration("classpath:alfresco-cmis-context.xml")
+@Component
+@Scope(value = "prototype")
+public abstract class AbstractCmisE2ETest extends AbstractE2EFunctionalTest
+{
+    private static Logger LOGGER = LoggerFactory.getLogger(AbstractCmisE2ETest.class);
+
+    @Autowired
+    protected CmisProperties cmisProperties;
+
+    public String documentContent = "CMIS document content";
+
+    @BeforeMethod(alwaysRun = true)
+    public void showStartTestInfo(Method method)
+    {
+        LOGGER.info(String.format("*** STARTING Test: [%s] ***", method.getName()));
+    }
+
+    @AfterMethod(alwaysRun = true)
+    public void showEndTestInfo(Method method)
+    {
+        LOGGER.info(String.format("*** ENDING Test: [%s] ***", method.getName()));
+    }
+
+    public Integer getElasticWaitTimeInSeconds()
+    {
+        return cmisProperties.envProperty().getSolrWaitTimeInSeconds();
+    }
+
+    /**
+     * Repeat Elastic Query till results count returns expectedCountResults
+     * @param query CMIS Query to be executed
+     * @param expectedCountResults Number of results expected
+     * @return true when results count is equals to expectedCountResults
+     */
+    protected boolean waitForIndexing(String query, long expectedCountResults)
+    {
+
+        for (int searchCount = 1; searchCount <= SEARCH_MAX_ATTEMPTS; searchCount++)
+        {
+
+            try
+            {
+                cmisApi.withQuery(query).assertResultsCount().equals(expectedCountResults);
+                return true;
+            }
+            catch (AssertionError ae)
+            {
+                LOGGER.info(String.format("WaitForIndexing in Progress: %s", ae));
+            }
+
+
+            Utility.waitToLoopTime(getElasticWaitTimeInSeconds(), "Wait For Indexing");
+
+        }
+
+        return false;
+    }
+
+
+}

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/AbstractE2EFunctionalTest.java

@@ -0,0 +1,58 @@
+package org.alfresco.cmis.search;
+
+import org.alfresco.cmis.CmisWrapper;
+import org.alfresco.dataprep.SiteService.Visibility;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.data.DataSite;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.data.RandomData;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.network.ServerHealth;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.BeforeClass;
+
+@ContextConfiguration ("classpath:alfresco-cmis-context.xml")
+public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringContextTests
+{
+    /** The number of retries that a query will be tried before giving up. */
+    protected static final int SEARCH_MAX_ATTEMPTS = 20;
+
+    @Autowired
+    protected ServerHealth serverHealth;
+
+    @Autowired
+    protected DataSite dataSite;
+
+    @Autowired
+    protected DataContent dataContent;
+
+    @Autowired
+    protected CmisWrapper cmisApi;
+
+    @Autowired
+    protected DataUser dataUser;
+
+    protected UserModel testUser, adminUserModel;
+    protected SiteModel testSite;
+
+    protected static String unique_searchString;
+
+    @BeforeClass (alwaysRun = true)
+    public void setup()
+    {
+        serverHealth.assertServerIsOnline();
+
+        adminUserModel = dataUser.getAdminUser();
+        testUser = dataUser.createRandomTestUser("UserSearch");
+
+        testSite = new SiteModel(RandomData.getRandomName("SiteSearch"));
+        testSite.setVisibility(Visibility.PRIVATE);
+
+        testSite = dataSite.usingUser(testUser).createSite(testSite);
+
+        unique_searchString = testSite.getTitle().replace("SiteSearch", "Unique");
+    }
+}

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/SearchInFolderTests.java

@@ -0,0 +1,62 @@
+package org.alfresco.cmis.search;
+
+import org.alfresco.utility.Utility;
+import org.alfresco.utility.data.provider.XMLDataConfig;
+import org.alfresco.utility.data.provider.XMLTestDataProvider;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FileType;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.QueryModel;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class SearchInFolderTests extends AbstractCmisE2ETest
+{
+    private FolderModel parentFolder, subFolder1, subFolder2, subFolder3;
+    private FileModel subFile1, subFile2, subFile3, subFile4, subFile5;
+
+    @BeforeClass(alwaysRun = true)
+    public void createTestData() throws Exception
+    {
+        // create input data
+        parentFolder = FolderModel.getRandomFolderModel();
+        subFolder1 = FolderModel.getRandomFolderModel();
+        subFolder2 = FolderModel.getRandomFolderModel();
+        subFolder3 = new FolderModel("subFolder");
+        subFile5 = new FileModel("fifthFile.txt",FileType.TEXT_PLAIN, "fifthFile content");
+        subFile1 = new FileModel("firstFile", FileType.MSEXCEL);
+        subFile2 = FileModel.getRandomFileModel(FileType.MSPOWERPOINT2007);
+        subFile3 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN);
+        subFile4 = new FileModel("fourthFile", "fourthFileTitle", "fourthFileDescription", FileType.MSWORD2007);
+
+        cmisApi.authenticateUser(testUser).usingSite(testSite).createFolder(parentFolder)
+                .then().usingResource(parentFolder)
+                .createFile(subFile5).assertThat().contentIs("fifthFile content")
+                .createFolder(subFolder1)
+                .createFolder(subFolder2)
+                .createFolder(subFolder3)
+                .createFile(subFile1)
+                .createFile(subFile2)
+                .createFile(subFile3)
+                .createFile(subFile4);
+        // wait for index
+        Utility.waitToLoopTime(getElasticWaitTimeInSeconds());
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void cleanupEnvironment()
+    {
+        dataContent.deleteSite(testSite);
+    }
+
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+    @XMLDataConfig(file = "src/test/resources/search-in-folder.xml")
+    public void executeCMISQuery(QueryModel query)
+    {
+        String currentQuery = String.format(query.getValue(), parentFolder.getNodeRef());
+        cmisApi.authenticateUser(testUser);
+        Assert.assertTrue(waitForIndexing(currentQuery, query.getResults()), String.format("Result count not as expected for query: %s", currentQuery));
+    }
+}

packaging/tests/tas-cmis/src/test/resources/default.properties

@@ -7,7 +7,7 @@ alfresco.port=8082
 admin.user=admin
 admin.password=admin
 
-solrWaitTimeInSeconds=30
+solrWaitTimeInSeconds=60
 
 # 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

packaging/tests/tas-cmis/src/test/resources/search-in-folder.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--CMIS Queries: passing the search query as first param and results expected -->
+<testData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<queries>
+		<query value="SELECT cmis:name, cmis:parentId, cmis:path, cmis:allowedChildObjectTypeIds FROM cmis:folder where IN_FOLDER('%s') AND cmis:name = 'subFolder'" expectedResults="1" />
+		<query value="SELECT cmis:name, cmis:objectId, cmis:lastModifiedBy, cmis:creationDate, cmis:contentStreamFileName FROM cmis:document where IN_FOLDER('%s') AND cmis:name = 'fourthFile'" expectedResults="1" />
+		<query value="SELECT cmis:parentId FROM cmis:folder where IN_FOLDER('%s')" expectedResults="3" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s')" expectedResults="5" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:name ASC" expectedResults="5" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:name DESC" expectedResults="5" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') ORDER BY cmis:lastModificationDate ASC"  expectedResults="3" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') ORDER BY cmis:lastModificationDate DESC"  expectedResults="3" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:createdBy DESC" expectedResults="5" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name IS NOT NULL" expectedResults="5" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND cmis:name IS NOT NULL" expectedResults="3" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name LIKE 'fourthFile'" expectedResults="1" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND NOT(cmis:name NOT IN ('subFolder'))" expectedResults="1" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name IN ('fourthFile', 'fifthFile.txt')" expectedResults="2" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name NOT IN ('fourthFile', 'fifthFile.txt')" expectedResults="3" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND cmis:name &lt;&gt; 'subFolder'" expectedResults="2" />
+		<query value="SELECT cmis:secondaryObjectTypeIds FROM cmis:folder where IN_FOLDER('%s') AND cmis:name = 'subFolder'" expectedResults="1" />
+	</queries>
+</testData> 

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.2</version>
+        <version>17.7</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>17.2</version>
+        <version>17.7</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>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/ActionsTests.java

@@ -11,7 +11,6 @@ import org.alfresco.rest.model.RestActionDefinitionModelsCollection;
 import org.alfresco.rest.model.RestNodeModel;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
@@ -22,14 +21,10 @@ import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.Properties;
-
 public class ActionsTests extends RestTest
 {
     private UserModel adminUser;
     private FileModel document;
-    private FolderModel folder;
-    private FileModel randomFile;
     private SiteModel publicSite;
 
     @BeforeClass(alwaysRun = true)
@@ -38,8 +33,6 @@ public class ActionsTests extends RestTest
         adminUser = dataUser.getAdminUser();
         publicSite = dataSite.createPublicRandomSite();
         document = dataContent.usingSite(publicSite).usingUser(adminUser).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-        folder = dataContent.usingUser(adminUser).createFolder();
-        randomFile = dataContent.usingUser(adminUser).usingResource(folder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
     }
 
     @TestRail(section = { TestGroup.REST_API,TestGroup.ACTIONS }, executionType = ExecutionType.SANITY,
@@ -113,22 +106,6 @@ public class ActionsTests extends RestTest
         });
     }
 
-    @TestRail(section = { TestGroup.REST_API,TestGroup.ACTIONS }, executionType = ExecutionType.SANITY,
-            description = "Test for private action execution from POST api/-default-/public/alfresco/versions/1/action-executions, should not be possible to execute private action using V1 REST API")
-    @Test(groups = { TestGroup.REST_API, TestGroup.ACTIONS, TestGroup.SANITY})
-    public void executePrivateActionV1RESTAPI() throws Exception
-    {
-        // 'count-children' action is expected to be private (not exposed) by default
-        String actionDefinitionId = "count-children";
-        JSONObject response = restClient.authenticateUser(adminUser)
-                .withCoreAPI()
-                .usingActions()
-                .executeAction(actionDefinitionId, folder);
-
-        restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN);
-        restClient.assertLastError().containsSummary("Action '" + actionDefinitionId + "' is not exposed within 'http-v1' execution source.");
-    }
-
     @TestRail (section = { TestGroup.REST_API, TestGroup.ACTIONS }, executionType = ExecutionType.SANITY,
             description = "Sanity test for POST /action-executions")
     @Test (groups = { TestGroup.REST_API, TestGroup.ACTIONS, TestGroup.SANITY })
@@ -164,7 +141,7 @@ public class ActionsTests extends RestTest
                 withCoreAPI().
                 usingActions().
                 getActionDefinitionById("add-features");
-
+        
         restClient.assertStatusCodeIs(HttpStatus.OK);
         assertFalse(restActionDefinition.getId().isEmpty());
         restActionDefinition.getId().equals("add-features");

packaging/tests/tas-webdav/pom.xml

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

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.2</version>
+        <version>17.7</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>17.2</version>
+    <version>17.7</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -147,7 +147,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>17.2</tag>
+        <tag>17.7</tag>
     </scm>
 
     <distributionManagement>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <dependencies>

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

@@ -26,14 +26,11 @@
 package org.alfresco.rest.api.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.action.ActionExecutionContext;
-import org.alfresco.repo.action.RuntimeActionService;
 import org.alfresco.rest.api.Actions;
 import org.alfresco.rest.api.model.Action;
 import org.alfresco.rest.api.model.ActionDefinition;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
-import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.resource.parameters.SortColumn;
@@ -75,9 +72,6 @@ public class ActionsImpl implements Actions
     private NamespaceService namespaceService;
     private NodeService nodeService;
     private NamespacePrefixResolver prefixResolver;
-    private RuntimeActionService runtimeActionService;
-
-    private final String HTTP_V1_EXECUTION_SOURCE = "http-v1";
 
     public void setActionService(ActionService actionService)
     {
@@ -104,11 +98,6 @@ public class ActionsImpl implements Actions
         this.prefixResolver = prefixResolver;
     }
 
-    public void setRuntimeActionService(RuntimeActionService runtimeActionService)
-    {
-        this.runtimeActionService = runtimeActionService;
-    }
-
     @Override
     public ActionDefinition getActionDefinitionById(String actionDefinitionId)
     {
@@ -274,16 +263,6 @@ public class ActionsImpl implements Actions
             throw new EntityNotFoundException(action.getActionDefinitionId());
         }
 
-        final ActionExecutionContext actionExecutionContext = ActionExecutionContext
-                .builder(actionDef.getName())
-                .withExecutionSource(HTTP_V1_EXECUTION_SOURCE)
-                .build();
-
-        if (!runtimeActionService.isExposed(actionExecutionContext))
-        {
-            throw new PermissionDeniedException("Action '" + actionDef.getName() + "' is not exposed within '" + HTTP_V1_EXECUTION_SOURCE + "' execution source.");
-        }
-
         // targetId is optional, however, currently targetId must be a valid node ID.
         NodeRef actionedUponNodeRef = null;
         if (action.getTargetId() != null && !action.getTargetId().isEmpty())

remote-api/src/main/resources/alfresco/public-rest-context.xml

@@ -566,7 +566,6 @@
         <property name="namespaceService" ref="NamespaceService"/>
         <property name="nodeService" ref="NodeService"/>
         <property name="prefixResolver" ref="namespaceService"/>
-        <property name="runtimeActionService" ref="actionService"/>
     </bean>
     <bean id="Actions" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces" value="org.alfresco.rest.api.Actions"/>

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.2</version>
+        <version>17.7</version>
     </parent>
 
     <dependencies>

repository/src/main/java/org/alfresco/repo/action/ActionExecutionContext.java

@@ -1,93 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2022 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.action;
-
-import java.util.Objects;
-
-/**
- * Instances of this class are responsible for holding an action id with additional data used to identify the action's
- * execution context like:
- * <ul>
- *     <li>REST API</li>
- *     <li>rules execution</li>
- *     <li>...</li>
- * </ul>
- */
-public class ActionExecutionContext
-{
-    private final String actionId;
-    private final String executionSource;
-
-    private ActionExecutionContext(String actionId, String executionSource)
-    {
-        this.actionId = actionId;
-        this.executionSource = executionSource;
-    }
-
-    String getActionId()
-    {
-        return actionId;
-    }
-
-    String getExecutionSource()
-    {
-        return executionSource;
-    }
-
-    boolean isExecutionSourceKnown()
-    {
-        return Objects.nonNull(executionSource);
-    }
-
-    public static Builder builder(final String actionId)
-    {
-        Objects.requireNonNull(actionId);
-        return new Builder(actionId);
-    }
-
-    public static class Builder
-    {
-        private final String actionId;
-        private String executionSource;
-
-        private Builder(String actionId)
-        {
-            this.actionId = actionId;
-        }
-
-        public ActionExecutionContext build()
-        {
-            return new ActionExecutionContext(actionId, executionSource);
-        }
-
-        public Builder withExecutionSource(final String executionSource)
-        {
-            Objects.requireNonNull(executionSource);
-            this.executionSource = executionSource;
-            return this;
-        }
-    }
-}

repository/src/main/java/org/alfresco/repo/action/ActionServiceImpl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -33,14 +33,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.evaluator.ActionConditionEvaluator;
@@ -127,8 +120,6 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
     private ActionTrackingService actionTrackingService;
     private PolicyComponent policyComponent;
     private ActionServiceMonitor monitor;
-    private Properties configProperties;
-    private ActionExecutionValidator actionExecutionValidator;
 
     /**
      * The asynchronous action execution queues map of name, queue
@@ -245,17 +236,7 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
     {
         this.asynchronousActionExecutionQueues = asynchronousActionExecutionQueues;
     }
-
-    public void setConfigurationProperties(Properties properties)
-    {
-        this.configProperties = properties;
-    }
-
-    protected Properties getConfigurationProperties()
-    {
-        return configProperties;
-    }
-
+    
     /**
      * This method registers an {@link AsynchronousActionExecutionQueue} with the {@link ActionService}.
      * @param key String
@@ -275,11 +256,6 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
                     ActionModel.TYPE_ACTION_PARAMETER, new JavaBehaviour(this, "getCopyCallback"));
         this.policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onCopyComplete"),
                     ActionModel.TYPE_ACTION_PARAMETER, new JavaBehaviour(this, "onCopyComplete"));
-        if (configProperties == null)
-        {
-            configProperties = applicationContext.getBean("global-properties", Properties.class);
-        }
-        actionExecutionValidator = new ActionExecutionValidator(configProperties::getProperty, actionDefinitions::containsKey);
     }
 
     /**
@@ -1894,58 +1870,5 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
         LoggingAwareExecuter executer = (LoggingAwareExecuter) this.applicationContext.getBean(action.getActionDefinitionName());
         return executer.onLogException(logger,t, message);
     }
-
-    @Override
-    public boolean isExposed(ActionExecutionContext actionExecutionContext)
-    {
-        return actionExecutionValidator.isExposed(actionExecutionContext);
-    }
-
-    static class ActionExecutionValidator
-    {
-        private final Function<String, String> config;
-        private final Predicate<String> isPublic;
-
-        ActionExecutionValidator(Function<String, String> config, Predicate<String> isPublic)
-        {
-            this.config = Objects.requireNonNull(config);
-            this.isPublic = Objects.requireNonNull(isPublic);
-        }
-
-        boolean isExposed(ActionExecutionContext actionExecutionContext)
-        {
-            Objects.requireNonNull(actionExecutionContext);
-            return isExposedInConfig(actionExecutionContext).orElseGet(() -> isPublic(actionExecutionContext));
-        }
-
-        private Optional<Boolean> isExposedInConfig(ActionExecutionContext actionExecutionContext)
-        {
-            return getConfigKeys(actionExecutionContext).
-                    map(config).
-                    filter(Objects::nonNull).
-                    map(Boolean::parseBoolean).
-                    findFirst();
-        }
-
-        private Boolean isPublic(ActionExecutionContext actionExecutionContext)
-        {
-            return isPublic.test(actionExecutionContext.getActionId());
-        }
-
-        private static Stream<String> getConfigKeys(ActionExecutionContext actionExecutionContext)
-        {
-            if (actionExecutionContext.isExecutionSourceKnown())
-            {
-                return Stream.of(
-                        getConfigKey(actionExecutionContext.getExecutionSource(), actionExecutionContext.getActionId()),
-                        getConfigKey(actionExecutionContext.getActionId()));
-            }
-            return Stream.of(getConfigKey(actionExecutionContext.getActionId()));
-        }
-
-        static String getConfigKey(String... parts)
-        {
-            return Stream.of(parts).collect(Collectors.joining(".", "org.alfresco.repo.action.", ".exposed"));
-        }
-    }
+    
 }

repository/src/main/java/org/alfresco/repo/action/RuntimeActionService.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -125,14 +125,4 @@ public interface RuntimeActionService
      * @return true if it was handled, false for default handling
      */
     public boolean onLogException(Action action, Log logger, Throwable t, String message);
-
-    /**
-     * Allows you to check if an action can be executed/used in a given execution context
-     * @param actionExecutionContext describes action and its execution context
-     * @return true if action can be executed, false otherwise
-     */
-    default boolean isExposed(ActionExecutionContext actionExecutionContext)
-    {
-        return true;
-    }
 }

repository/src/main/resources/alfresco/action-services-context.xml

@@ -75,9 +75,6 @@
         <property name="monitor">
             <ref bean="actionServiceMonitor"/>
         </property>
-        <property name="configurationProperties">
-            <ref bean="global-properties"/>
-        </property>
     </bean>
 
     <bean id="defaultAsynchronousActionExecutionQueue" class="org.alfresco.repo.action.AsynchronousActionExecutionQueueImpl" init-method="init">
@@ -477,7 +474,7 @@
             <ref bean="NodeService" />
         </property>
         <property name="cociService">
-            <ref bean="checkOutCheckInService"></ref>
+            <ref bean="CheckOutCheckInService"></ref>
         </property>
         <property name="applicableTypes">
             <list>
@@ -491,7 +488,7 @@
             <ref bean="NodeService" />
         </property>
         <property name="cociService">
-            <ref bean="checkOutCheckInService"></ref>
+            <ref bean="CheckOutCheckInService"></ref>
         </property>
         <property name="applicableTypes">
             <list>

repository/src/test/java/org/alfresco/AllUnitTestsSuite.java

@@ -176,7 +176,6 @@ import org.junit.runners.Suite;
     org.alfresco.repo.action.CompositeActionImplTest.class,
     org.alfresco.repo.action.CompositeActionConditionImplTest.class,
     org.alfresco.repo.action.executer.TransformActionExecuterTest.class,
-    org.alfresco.repo.action.PrivateActionValidationTest.class,
     org.alfresco.repo.audit.AuditableAnnotationTest.class,
     org.alfresco.repo.audit.PropertyAuditFilterTest.class,
     org.alfresco.repo.audit.access.NodeChangeTest.class,

repository/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -25,27 +25,28 @@
  */
 package org.alfresco.repo.action;
 
-import static org.alfresco.repo.action.ActionExecutionContext.builder;
-
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
 import org.alfresco.repo.action.evaluator.InCategoryEvaluator;
 import org.alfresco.repo.action.evaluator.NoConditionEvaluator;
 import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
+import org.alfresco.repo.action.executer.ActionExecuter;
 import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
 import org.alfresco.repo.action.executer.AddFeaturesActionExecuter;
 import org.alfresco.repo.action.executer.CheckInActionExecuter;
 import org.alfresco.repo.action.executer.CheckOutActionExecuter;
 import org.alfresco.repo.action.executer.CompositeActionExecuter;
 import org.alfresco.repo.action.executer.MoveActionExecuter;
+import org.alfresco.repo.action.executer.ScriptActionExecuter;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -64,14 +65,19 @@ import org.alfresco.service.cmr.action.CompositeActionCondition;
 import org.alfresco.service.cmr.action.ParameterDefinition;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.test_category.BaseSpringTestsCategory;
+import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -97,18 +103,13 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
     private NodeRef nodeRef;
     private NodeRef folder;
     private RetryingTransactionHelper transactionHelper;
-    private Properties globalConfig;
-    private RuntimeActionService runtimeActionService;
-
     
     @Before
     public void before() throws Exception
     {
         super.before();
 
-        this.transactionHelper = applicationContext.getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
-        this.globalConfig = applicationContext.getBean("global-properties", Properties.class);
-        this.runtimeActionService = this.applicationContext.getBean("actionService", RuntimeActionService.class);
+        this.transactionHelper = (RetryingTransactionHelper)this.applicationContext.getBean("retryingTransactionHelper");
 
         // Create the node used for tests
         this.nodeRef = this.nodeService.createNode(
@@ -1294,89 +1295,6 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
        assertEquals(123455, action.getExecutionEndDate().getTime());
        assertEquals(null, action.getExecutionFailureMessage());
     }
-
-    @Test
-    public void testActionExposureBasedOnConfiguration()
-    {
-        globalConfig.remove("org.alfresco.repo.action.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.source.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.public-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.source.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.public-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.source.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.public-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.public-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.public-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.public-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.source.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.private-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.source.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.private-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.source.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.private-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.private-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.private-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.private-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-    }
-
-    @Test
-    public void testIfGlobalConfigurationIsUsedEvenIfNotInjectedBySpring()
-    {
-        TestExtendedActionServiceImpl extended = applicationContext.getBean("extendedActionServiceWithoutConfigurationProperty", TestExtendedActionServiceImpl.class);
-
-        assertNotNull(extended.getConfigurationProperties());
-        assertSame(globalConfig, extended.getConfigurationProperties());
-    }
     
     /**
      * This method returns an {@link Action} which will fail when executed.
@@ -1591,26 +1509,8 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
            throw new ActionServiceTransientException("action failed intentionally in " + TransientFailActionExecuter.class.getSimpleName());
        }
     }
+    
 
-    public static class NoOpActionExecuter extends ActionExecuterAbstractBase
-    {
-        @Override
-        protected void addParameterDefinitions(List<ParameterDefinition> paramList)
-        {
-            //do nothing
-        }
-
-        @Override
-        protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
-        {
-            //do nothing
-        }
-    }
-
-    public static class TestExtendedActionServiceImpl extends ActionServiceImpl
-    {
-
-    }
     
     protected static class CancellableSleepAction extends ActionImpl implements CancellableAction
     {

repository/src/test/java/org/alfresco/repo/action/PrivateActionValidationTest.java

@@ -1,152 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2022 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.action;
-
-import static org.alfresco.repo.action.ActionExecutionContext.builder;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.repo.action.ActionServiceImpl.ActionExecutionValidator;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class PrivateActionValidationTest
-{
-    @Test
-    public void shouldFailOnNullContext()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(), Set.of());
-
-        try
-        {
-            validator.isExposed(null);
-        }
-        catch (NullPointerException e)
-        {
-            assertNotNull(e);
-            return;
-        }
-        fail("Expected NPE.");
-    }
-
-    @Test
-    public void privateActionShouldNotBeExposedByDefault()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(), Set.of());
-
-        Assert.assertFalse(validator.isExposed(builder("privateA").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void publicActionShouldBeExposedByDefault()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(), Set.of("publicA"));
-
-        Assert.assertTrue(validator.isExposed(builder("publicA").build()));
-        Assert.assertTrue(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void privateActionShouldBeExposedByConfigurationBasedOnActionId()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.privateA.exposed", "true"), Set.of());
-
-        Assert.assertTrue(validator.isExposed(builder("privateA").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test2").build()));
-
-        Assert.assertFalse(validator.isExposed(builder("privateB").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test2").build()));
-    }
-
-    @Test
-    public void privateActionShouldBeExposedByConfigurationBasedOnActionIdAndExecutionSource()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.privateA.exposed", "true"), Set.of());
-
-        Assert.assertFalse(validator.isExposed(builder("privateA").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateA").withExecutionSource("test2").build()));
-
-        Assert.assertFalse(validator.isExposed(builder("privateB").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test2").build()));
-    }
-
-    @Test
-    public void executionSourceConfigurationShouldTakePrecedenceOverGeneralConfigurationForPrivateAction()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.privateA.exposed", "true",
-                "org.alfresco.repo.action.privateA.exposed", "false"), Set.of());
-
-        Assert.assertFalse(validator.isExposed(builder("privateA").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void publicActionShouldNotBeExposedByConfigurationBasedOnActionId()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.publicA.exposed", "false"), Set.of("publicA"));
-
-        Assert.assertFalse(validator.isExposed(builder("publicA").build()));
-        Assert.assertFalse(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void publicActionShouldNotBeExposedByConfigurationBasedOnActionIdAndExecutionSource()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.publicA.exposed", "false"), Set.of("publicA"));
-
-        Assert.assertTrue(validator.isExposed(builder("publicA").build()));
-        Assert.assertFalse(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void executionSourceConfigurationShouldTakePrecedenceOverGeneralConfigurationForPublicAction()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.publicA.exposed", "false",
-                "org.alfresco.repo.action.publicA.exposed", "true"), Set.of("publicA"));
-
-        Assert.assertTrue(validator.isExposed(builder("publicA").build()));
-        Assert.assertFalse(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    private ActionExecutionValidator givenActionExecutionValidator(Map<String, String> configuration, Set<String> publicActions)
-    {
-        return new ActionExecutionValidator(configuration::get, publicActions::contains);
-    }
-}

repository/src/test/resources/org/alfresco/repo/action/test-action-services-context.xml

@@ -11,18 +11,6 @@
          <value>1000</value>
       </property>
    </bean>
-
-   <bean id="public-test-action" class="org.alfresco.repo.action.ActionServiceImplTest$NoOpActionExecuter" parent="action-executer">
-      <property name="publicAction">
-         <value>true</value>
-      </property>
-   </bean>
-
-   <bean id="private-test-action" class="org.alfresco.repo.action.ActionServiceImplTest$NoOpActionExecuter" parent="action-executer">
-      <property name="publicAction">
-         <value>false</value>
-      </property>
-   </bean>
    
    <bean id="sleepActionFilter" class="org.alfresco.repo.action.ActionServiceImplTest$SleepActionFilter" parent="baseActionFilter">
        <property name="name">
@@ -43,28 +31,4 @@
    <bean id="transient-fail-action"
          class="org.alfresco.repo.action.ActionServiceImplTest$TransientFailActionExecuter"
          parent="action-executer" />
-
-   <bean id="extendedActionServiceWithoutConfigurationProperty" class="org.alfresco.repo.action.ActionServiceImplTest$TestExtendedActionServiceImpl" init-method="init">
-      <property name="policyComponent">
-         <ref bean="policyComponent" />
-      </property>
-      <property name="nodeService">
-         <ref bean="NodeService" />
-      </property>
-      <property name="searchService">
-         <ref bean="ADMSearchService" />
-      </property>
-      <property name="authenticationContext">
-         <ref bean="authenticationContext" />
-      </property>
-      <property name="actionTrackingService">
-         <ref bean="actionTrackingService" />
-      </property>
-      <property name="dictionaryService">
-         <ref bean="DictionaryService" />
-      </property>
-      <property name="monitor">
-         <ref bean="actionServiceMonitor"/>
-      </property>
-   </bean>
 </beans>