NXP-30316: Rename bulk action from automation-ui to automationUi

nuxeo · Jun 4, 2021 · 5b6234d · 5b6234d
1 parent e900783
commit 5b6234d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...s/src/main/java/org/nuxeo/ecm/automation/core/operations/services/bulk/BulkRunAction.java b/...s/src/main/java/org/nuxeo/ecm/automation/core/operations/services/bulk/BulkRunAction.java
@@ -22,6 +22,7 @@
 import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import static org.nuxeo.ecm.automation.core.operations.services.bulk.AbstractAutomationBulkAction.OPERATION_ID;
+import static org.nuxeo.ecm.automation.core.operations.services.bulk.AutomationBulkActionUi.ACTION_NAME;
 
 import java.io.IOException;
 import java.util.stream.Collectors;
@@ -164,12 +165,12 @@ public BulkStatus run() throws IOException, OperationException {
         }
         if (queryLimit > 0) {
             builder.queryLimit(queryLimit);
-        } else if ("automation-ui".equals(action) && params.containsKey(OPERATION_ID)) {
+        } else if (ACTION_NAME.equals(action) && params.containsKey(OPERATION_ID)) {
             // automation actions from UI can be limited
             String operationId = (String) params.get(OPERATION_ID);
             int limit = AutomationBulkActionUi.getQueryLimit(operationId);
             if (limit > 0) {
-                log.debug("Set queryLimit to: {} for automation-ui operationId: {}", limit, operationId);
+                log.debug("Set queryLimit to: {} for {} operationId: {}", limit, ACTION_NAME, operationId);
                 builder.queryLimit(limit);
             }
         }

diff --git a/...m/nuxeo-automation/nuxeo-automation-features/src/main/resources/OSGI-INF/bulk-contrib.xml b/...m/nuxeo-automation/nuxeo-automation-features/src/main/resources/OSGI-INF/bulk-contrib.xml
@@ -7,7 +7,7 @@
     <action name="automation" inputStream="bulk/automation" bucketSize="100" batchSize="10" httpEnabled="true"
       validationClass="org.nuxeo.ecm.automation.core.operations.services.bulk.validation.AutomationBulkValidation" />
 
-    <action name="automation-ui" inputStream="bulk/automationUi" bucketSize="100" batchSize="10" httpEnabled="true"
+    <action name="automationUi" inputStream="bulk/automationUi" bucketSize="100" batchSize="10" httpEnabled="true"
       validationClass="org.nuxeo.ecm.automation.core.operations.services.bulk.validation.AutomationBulkValidation" />
   </extension>
 
@@ -18,7 +18,7 @@
       <policy name="default" maxRetries="3" delay="1s" continueOnFailure="true" />
     </streamProcessor>
 
-    <streamProcessor name="automation-ui"
+    <streamProcessor name="automationUi"
       class="org.nuxeo.ecm.automation.core.operations.services.bulk.AutomationBulkActionUi" defaultConcurrency="2"
       defaultPartitions="2">
       <policy name="default" maxRetries="3" delay="1s" continueOnFailure="true" />

diff --git a/...java/org/nuxeo/ecm/automation/core/operations/services/bulk/TestAutomationBulkAction.java b/...java/org/nuxeo/ecm/automation/core/operations/services/bulk/TestAutomationBulkAction.java
@@ -22,6 +22,7 @@
 import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.nuxeo.ecm.automation.core.operations.services.bulk.AutomationBulkActionUi.ACTION_NAME;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -100,7 +101,7 @@ public void testSetPropertyActionFromAutomation() throws Exception {
     public void testSetPropertyActionFromAutomationUi() throws Exception {
         String nxql = "SELECT * FROM ComplexDoc WHERE ecm:isProxy = 0";
         String title = "title set from automation UI";
-        doTestSetPropertyActionFromAutomation("automation-ui", nxql, title);
+        doTestSetPropertyActionFromAutomation(ACTION_NAME, nxql, title);
         // The configuration service sets a queryLimit=3 for this operationId
         int count = 0;
         for (DocumentModel doc : session.query(nxql)) {