Refactoring code, more multithreading

README.md

@@ -19,7 +19,6 @@ The Unit Test section covers these goals.
 
 The Load Test section covers these goals.
 
-
 Process-Automator executes scenario. One scenario pilot a process.
 
 It is possible to execute multiple at the same time to handle a use case like
@@ -313,3 +312,15 @@ automator.servers:
     audience: ""
     secret: "4BPUva1U4lDtoG2-torvAtx6w5RbHULUFhGZ-bBXOMWwZJG3d3VDlfPHjVO3Kz-N"
 ````
+
+# Build
+
+Rebuilt the image via
+````
+mvn clean install
+mvn springboot:build-image
+````
+
+The docker image is build using the Dockerfile present on the root level.
+
+Push the image to ghcr.io/camunda-community-hub/process-execution-automator:

doc/scenarioreference/README.md

@@ -251,6 +251,16 @@ Example:
 the variable `loopcrawl` will be a list of 500 random string.
 
 
+**generateuniqueid(<Prefix>)**
+Generate a unique sequential number.
+The prefix is used to allo wmultiple counter
+Example:
+````
+"tidblue": "generateuniqueid(blue)"
+"tidred": "generateuniqueid(red)"
+````
+Variables `tidblue` and `tidred` got a unique id, each following a different counter.
+
 
 ## Verification
 

pom.xml

@@ -5,7 +5,8 @@
 
   <groupId>org.camunda.community.automator</groupId>
   <artifactId>process-execution-automator</artifactId>
-  <version>1.3.0</version>
+  <version>1.4.0</version>
+  <!-- Change the banner.txt version -->
 
   <properties>
     <java.version>17</java.version>
@@ -222,7 +223,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>3.0.6</version>
+        <!-- <version>3.0.6</version> -->
         <configuration>
           <mainClass>org.camunda.automator.AutomatorApplication</mainClass>
           <classifier>exec</classifier>

src/main/java/org/camunda/automator/AutomatorAPI.java

@@ -67,7 +67,7 @@ public Scenario loadFromInputStream(InputStream scenarioInputStream, String orig
   /**
    * Search the engine from the scenario
    *
-   * @param scenario            scenario
+   * @param scenario       scenario
    * @param bpmnEngineList different engine configuration
    * @return the engine, null if no engine exist, an exception if the connection is not possible
    */
@@ -76,13 +76,13 @@ public BpmnEngine getBpmnEngineFromScenario(Scenario scenario, BpmnEngineList bp
     try {
 
       if (scenario.getServerName() != null) {
-        return getBpmnEngine( bpmnEngineList.getByServerName(scenario.getServerName()), true);
+        return getBpmnEngine(bpmnEngineList.getByServerName(scenario.getServerName()), true);
       }
 
       return null;
     } catch (AutomatorException e) {
-      logger.error("Can't connect the engine for the scenario [{}] serverName[{}]: {}",
-          scenario.getName(), scenario.getServerName(), e.getMessage());
+      logger.error("Can't connect the engine for the scenario [{}] serverName[{}]: {}", scenario.getName(),
+          scenario.getServerName(), e.getMessage());
       throw e;
     }
 
@@ -121,8 +121,9 @@ public RunResult executeScenario(BpmnEngine bpmnEngine, RunParameters runParamet
   /*  Deploy a process in the server                                      */
   /* ******************************************************************** */
 
-  public BpmnEngine getBpmnEngine(BpmnEngineList.BpmnServerDefinition serverDefinition,boolean logDebug) throws AutomatorException {
-    return BpmnEngineFactory.getInstance().getEngineFromConfiguration( serverDefinition, logDebug);
+  public BpmnEngine getBpmnEngine(BpmnEngineList.BpmnServerDefinition serverDefinition, boolean logDebug)
+      throws AutomatorException {
+    return BpmnEngineFactory.getInstance().getEngineFromConfiguration(serverDefinition, logDebug);
   }
 
   /**

src/main/java/org/camunda/automator/AutomatorCLI.java

@@ -106,6 +106,15 @@ private static List<File> detectRecursiveScenario(File folderRecursive) {
     return listFiles;
   }
 
+  /**
+   * To reduce the number of warning
+   *
+   * @param message message to log out
+   */
+  private static void logOutLn(String message) {
+    System.out.println(message);
+  }
+
   public void run(String[] args) {
     if (!isRunningCLI)
       return;
@@ -223,13 +232,4 @@ public void run(String[] args) {
   }
 
   public enum ACTION {RUN, RECURSIVE, VERIFY, RUNVERIFY, RECURSIVVERIFY}
-
-  /**
-   * To reduce the number of warning
-   *
-   * @param message message to log out
-   */
-  private static void logOutLn(String message) {
-    System.out.println(message);
-  }
 }

src/main/java/org/camunda/automator/bpmnengine/BpmnEngine.java

@@ -105,13 +105,15 @@ List<String> searchUserTasksByProcessInstance(String processInstanceId, String u
   /**
    * @param workerId        workerId
    * @param topic           topic to register
+   * @param streamEnable    true if the stream enable is open
    * @param lockTime        lock time for the job
    * @param jobHandler      C7: must implement ExternalTaskHandler. C8: must implement JobHandler
    * @param backoffSupplier backOffStrategy
    * @return list of Service Task
    */
   RegisteredTask registerServiceTask(String workerId,
                                      String topic,
+                                     boolean streamEnable,
                                      Duration lockTime,
                                      Object jobHandler,
                                      FixedBackoffSupplier backoffSupplier);

src/main/java/org/camunda/automator/bpmnengine/BpmnEngineFactory.java

@@ -27,8 +27,7 @@ public static BpmnEngineFactory getInstance() {
     return bpmnEngineFactory;
   }
 
-  public BpmnEngine getEngineFromConfiguration(BpmnEngineList.BpmnServerDefinition serverDefinition,
-                                               boolean logDebug)
+  public BpmnEngine getEngineFromConfiguration(BpmnEngineList.BpmnServerDefinition serverDefinition, boolean logDebug)
       throws AutomatorException {
     BpmnEngine engine = cacheEngine.get(serverDefinition.serverType);
     if (engine != null)
@@ -45,7 +44,7 @@ public BpmnEngine getEngineFromConfiguration(BpmnEngineList.BpmnServerDefinition
 
         case CAMUNDA_8 -> BpmnEngineCamunda8.getFromServerDefinition(serverDefinition, logDebug);
 
-        case CAMUNDA_8_SAAS -> BpmnEngineCamunda8.getFromServerDefinition( serverDefinition, logDebug);
+        case CAMUNDA_8_SAAS -> BpmnEngineCamunda8.getFromServerDefinition(serverDefinition, logDebug);
 
         case DUMMY -> new BpmnEngineDummy(serverDefinition);
 

src/main/java/org/camunda/automator/bpmnengine/camunda7/BpmnEngineCamunda7.java

@@ -146,7 +146,7 @@ public void disconnection() throws AutomatorException {
   /**
    * Engine is ready. If not, a connection() method must be call
    *
-   * @return
+   * @return true if the engine is ready
    */
   public boolean isReady() {
     if (count > 2)
@@ -274,6 +274,7 @@ public void executeUserTask(String userTaskId, String userId, Map<String, Object
   @Override
   public RegisteredTask registerServiceTask(String workerId,
                                             String topic,
+                                            boolean streamEnable,
                                             Duration lockTime,
                                             Object jobHandler,
                                             FixedBackoffSupplier backoffSupplier) {

src/main/java/org/camunda/automator/bpmnengine/camunda8/BpmnEngineCamunda8.java

@@ -25,7 +25,6 @@
 import io.camunda.tasklist.exception.TaskListException;
 import io.camunda.zeebe.client.ZeebeClient;
 import io.camunda.zeebe.client.ZeebeClientBuilder;
-import io.camunda.zeebe.client.api.command.ClientStatusException;
 import io.camunda.zeebe.client.api.command.FinalCommandStep;
 import io.camunda.zeebe.client.api.response.ActivateJobsResponse;
 import io.camunda.zeebe.client.api.response.ActivatedJob;
@@ -63,15 +62,14 @@ public class BpmnEngineCamunda8 implements BpmnEngine {
   public static final String THIS_IS_A_COMPLETE_IMPOSSIBLE_VARIABLE_NAME = "ThisIsACompleteImpossibleVariableName";
   public static final int SEARCH_MAX_SIZE = 100;
   private final Logger logger = LoggerFactory.getLogger(BpmnEngineCamunda8.class);
-
-  private BpmnEngineList.BpmnServerDefinition serverDefinition;
   boolean hightFlowMode = false;
   /**
    * It is not possible to search user task for a specfic processInstance. So, to realize this, a marker is created in each process instance. Retrieving the user task,
    * the process instance can be found and correction can be done
    */
   Map<String, Long> cacheProcessInstanceMarker = new HashMap<>();
   Random random = new Random(System.currentTimeMillis());
+  private BpmnEngineList.BpmnServerDefinition serverDefinition;
   private ZeebeClient zeebeClient;
   private CamundaOperateClient operateClient;
   private CamundaTaskListClient taskClient;
@@ -281,7 +279,7 @@ public void connection() throws AutomatorException {
       }
 
       if (!isOk)
-        throw new AutomatorException("Invalid configuration " + analysis.toString());
+        throw new AutomatorException("Invalid configuration " + analysis);
 
       clientBuilder.numJobWorkerExecutionThreads(serverDefinition.workerExecutionThreads);
       clientBuilder.defaultJobWorkerMaxJobsActive(serverDefinition.workerMaxJobsActive);
@@ -330,7 +328,7 @@ public void disconnection() throws AutomatorException {
   /**
    * Engine is ready. If not, a connection() method must be call
    *
-   * @return
+   * @return true if the engine is ready
    */
   public boolean isReady() {
     return zeebeClient != null;
@@ -501,6 +499,7 @@ public List<String> searchUserTasks(String userTaskId, int maxResult) throws Aut
   @Override
   public RegisteredTask registerServiceTask(String workerId,
                                             String topic,
+                                            boolean streamEnable,
                                             Duration lockTime,
                                             Object jobHandler,
                                             FixedBackoffSupplier backoffSupplier) {
@@ -520,6 +519,7 @@ public RegisteredTask registerServiceTask(String workerId,
         .jobType(topic)
         .handler((JobHandler) jobHandler)
         .timeout(lockTime)
+        .streamEnabled(streamEnable) // according the parameter
         .name(workerId);
 
     if (backoffSupplier != null) {

src/main/java/org/camunda/automator/bpmnengine/dummy/BpmnEngineDummy.java

@@ -17,11 +17,9 @@
 
 public class BpmnEngineDummy implements BpmnEngine {
 
-  private final BpmnEngineList.BpmnServerDefinition serverDefinition;
   private final Logger logger = LoggerFactory.getLogger(BpmnEngineDummy.class);
 
   public BpmnEngineDummy(BpmnEngineList.BpmnServerDefinition serverDefinition) {
-    this.serverDefinition = serverDefinition;
   }
 
   @Override
@@ -30,9 +28,11 @@ public void init() {
   }
 
   public void connection() throws AutomatorException {
+    // nothing to do here
   }
 
   public void disconnection() throws AutomatorException {
+    // nothing to do here
   }
 
   /**
@@ -78,6 +78,7 @@ public void executeUserTask(String userTaskId, String userId, Map<String, Object
   @Override
   public RegisteredTask registerServiceTask(String workerId,
                                             String topic,
+                                            boolean streamEnable,
                                             Duration lockTime,
                                             Object jobHandler,
                                             FixedBackoffSupplier backoffSupplier) {