Migrate to last version of API

camunda-community-hub · Dec 6, 2024 · f35800d · f35800d
1 parent 83869cc
commit f35800d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/org/camunda/automator/AutomatorRest.java b/src/main/java/org/camunda/automator/AutomatorRest.java
@@ -34,6 +34,7 @@ public class AutomatorRest {
     public static final String JSON_MESSAGE = "message";
     public static final String JSON_INFO = "info";
     private static final Logger logger = LoggerFactory.getLogger(AutomatorRest.class.getName());
+    public static final String JSON_STATUS_V_NOTEXIST = "NOTEXIST";
     private final ConfigurationStartup configurationStartup;
     private final ContentManager contentManager;
     private final AutomatorAPI automatorAPI;
@@ -76,7 +77,7 @@ public Map<String, Object> getUnitTest(@RequestParam(name = "id") String unitTes
         if (resultTest != null) {
             return resultTest;
         } else {
-            return Map.of("status", "NOTEXIST");
+            return Map.of(AutomatorRest.JSON_STATUS, JSON_STATUS_V_NOTEXIST);
         }
     }
 
@@ -85,7 +86,7 @@ public List<Map<String, Object>> getListUnitTest() {
         List<Map<String, Object>> listUnitTest = new ArrayList<>();
         for (Map.Entry entryTest : cacheExecution.entrySet()) {
             if (entryTest.getValue() instanceof Map<?, ?> resultMap) {
-                listUnitTest.add(Map.of("id", entryTest.getKey(),
+                listUnitTest.add(Map.of(AutomatorRest.JSON_ID, entryTest.getKey(),
                         JSON_SCENARIO_NAME, getSecureValue(resultMap.get(JSON_SCENARIO_NAME))));
             } else {
                 listUnitTest.add(Map.of(JSON_ID, entryTest.getKey(),
@@ -159,8 +160,8 @@ private void startTest(String scenarioName, String serverName, String unitTestId
     }
 
     /**
-     * @param runResult
-     * @return
+     * @param runResult result to transform in JSON
+     * @return result ready for a JSON format
      */
     private Map<String, Object> resultToJson(RunResult runResult) {
         Map<String, Object> resultMap = new HashMap<>();
@@ -198,9 +199,9 @@ private Map<String, Object> completeMessage(Map<String, Object> result, StatusTe
      * Connect to the BPM Engine
      *
      * @param scenario      scenario to use to connect
-     * @param runParameters
-     * @param result
-     * @return
+     * @param runParameters running parameters
+     * @param result result of the connection
+     * @return BPMN Engine
      */
     private BpmnEngine connectToEngine(Scenario scenario, RunParameters runParameters, Map<String, Object> result) {
         BpmnEngine bpmnEngine = null;

diff --git a/src/main/java/org/camunda/automator/bpmnengine/camunda8/BpmnEngineCamunda8.java b/src/main/java/org/camunda/automator/bpmnengine/camunda8/BpmnEngineCamunda8.java
@@ -382,7 +382,7 @@ public void throwBpmnServiceTask(String serviceTaskId,
      * @param filterTaskId      filter on the taskId
      * @param maxResult         maximum Result
      * @return list of Task
-     * @throws AutomatorException
+     * @throws AutomatorException in case of error
      */
     @Override
     public List<TaskDescription> searchTasksByProcessInstanceId(String processInstanceId, String filterTaskId, int maxResult)

diff --git a/src/main/java/org/camunda/automator/bpmnengine/camunda8/OperateClient.java b/src/main/java/org/camunda/automator/bpmnengine/camunda8/OperateClient.java
@@ -198,7 +198,7 @@ public List<String> activateServiceTasks(String processInstanceId, String servic
      * @param filterTaskId      filter on the taskId
      * @param maxResult         maximum Result
      * @return list of Task
-     * @throws AutomatorException
+     * @throws AutomatorException in case of error
      */
     public List<BpmnEngine.TaskDescription> searchTasksByProcessInstanceId(String processInstanceId, String filterTaskId, int maxResult)
             throws AutomatorException {

diff --git a/src/main/java/org/camunda/automator/definition/ScenarioExecution.java b/src/main/java/org/camunda/automator/definition/ScenarioExecution.java
@@ -1,7 +1,6 @@
 package org.camunda.automator.definition;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -77,7 +76,7 @@ public ScenarioExecution addStep(ScenarioStep step) {
     }
 
     public List<ScenarioStep> getSteps() {
-        return steps == null ? Collections.emptyList() : steps;
+        return steps;
     }
 
     public ScenarioVerification getVerifications() {

diff --git a/src/main/java/org/camunda/automator/engine/unit/RunScenarioUnitServiceTask.java b/src/main/java/org/camunda/automator/engine/unit/RunScenarioUnitServiceTask.java
@@ -62,6 +62,7 @@ public RunResult executeServiceTask(ScenarioStep step, RunResult result) {
                         try {
                             Thread.sleep(500);
                         } catch (InterruptedException e) {
+                            // nothing to do here
                         }
                     }
                 } while (listActivities.isEmpty() && System.currentTimeMillis() - beginTimeWait < waitingTimeInMs);

diff --git a/src/main/java/org/camunda/automator/services/AutomatorStartup.java b/src/main/java/org/camunda/automator/services/AutomatorStartup.java
@@ -24,7 +24,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Objects;
 
 @Service
 public class AutomatorStartup {
@@ -101,7 +101,6 @@ private List<Path> loadStartupScenario() {
                 } else {
                     logger.error("AutomatorStartup/StartupScenario:: Can't find File [{}/{}] or [{}]", configurationStartup.scenarioPath,
                             scenarioFileName, scenarioFileName);
-                    continue;
                 }
             }
 
@@ -113,8 +112,8 @@ private List<Path> loadStartupScenario() {
                     configurationStartup.getScenarioResourceAtStartupName());
         } else {
             List<Resource> scenarioResource = configurationStartup.getScenarioResourceAtStartup().stream()
-                    .filter(t -> t != null)
-                    .collect(Collectors.toList());
+                    .filter(Objects::nonNull)
+                    .toList();
 
             logger.info("Detect {} scenario [Resource] from variable [{}]",
                     scenarioResource.size(),