Merge branch 'main' into create_tid_2

camunda-community-hub · Jul 17, 2024 · 814ddb8 · 814ddb8
2 parents f87d352 + c1a2cf0
commit 814ddb8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 1 deletion.
diff --git a/src/main/java/org/camunda/automator/definition/ScenarioStep.java b/src/main/java/org/camunda/automator/definition/ScenarioStep.java
@@ -264,6 +264,7 @@ public String getId() {
     return getType() + " " + switch (getType()) {
       case STARTEVENT -> getProcessId() + "(" + getTaskId() + ")";
       case SERVICETASK -> getTopic();
+
       default -> "";
     };
   }

diff --git a/src/main/java/org/camunda/automator/engine/flow/CreateProcessInstanceThread.java b/src/main/java/org/camunda/automator/engine/flow/CreateProcessInstanceThread.java
@@ -77,9 +77,11 @@ public List<String> getListProcessInstances() {
     return listStartProcess.stream().flatMap(t -> t.listProcessInstances.stream()).collect(Collectors.toList());
   }
 
+
   public int getNumberOfRunningThreads() {
     return (int) listStartProcess.stream().filter(t->t.isRunning()).count();
   }
+
   public int getTotalCreation() {
     return listStartProcess.stream().mapToInt(t -> t.nbCreation).sum();
   }
@@ -115,7 +117,9 @@ private class StartProcess implements Runnable {
      * the batch number
      */
     boolean isOverload = false;
+
     boolean isRunning = false;
+
     Duration durationToCreateProcessInstances;
 
     /**
@@ -197,10 +201,12 @@ public void run() {
           break;
         }
       }
+
       isRunning=false;
     }
     public boolean isRunning() {
       return isRunning;
+
     }
   }
 }
diff --git a/src/main/java/org/camunda/automator/engine/flow/RunScenarioFlowStartEvent.java b/src/main/java/org/camunda/automator/engine/flow/RunScenarioFlowStartEvent.java
@@ -35,6 +35,11 @@ public RunScenarioFlowStartEvent(TaskScheduler scheduler,
     super(scenarioStep, runScenario, runResult);
     this.scheduler = scheduler;
   }
+  @Override
+  public String getTopic() {
+    return getScenarioStep().getTaskId();
+  }
+
 
   @Override
   public String getTopic() {
@@ -47,7 +52,9 @@ public String getTopic() {
   public void execute() {
     stopping = false;
     isRunning = true;
+
     startEventRunnable = new StartEventRunnable(scheduler, getScenarioStep(), getRunScenario(), this, runResult);
+
     startEventRunnable.start();
   }
 
@@ -126,9 +133,11 @@ public void run() {
           logger.info("Stop now [" + getId() + "]");
           if (nbOverloaded > 0)
             runResult.addError(scenarioStep,
+
                 "Overloaded:" + "" + nbOverloaded + " TotalCreation:" + totalCreation // total creation we see
                     + " TheoricNumberExpectred:" + (scenarioStep.getNumberOfExecutions() * executionBatchNumber)
                     // expected
+
                     + " Process[" + scenarioStep.getProcessId() + "] Can't create PI at the required frequency");
           if (totalFailed > 0)
             runResult.addError(scenarioStep,
@@ -147,9 +156,11 @@ public void run() {
       boolean isOverloadSection = false;
 
       // generate process instance in multiple threads
+
       createProcessInstanceThread = new CreateProcessInstanceThread(executionBatchNumber, scenarioStep, runScenario,
           runResult);
 
+
       // creates all process instances, return when finish OR when duration is reach
       createProcessInstanceThread.createProcessInstances(durationToCreateProcessInstances);
 
@@ -170,8 +181,10 @@ public void run() {
       Duration durationToWait = durationToCreateProcessInstances.minusMillis(end - begin);
       if (durationToWait.isNegative()) {
         durationToWait = Duration.ZERO;
+
       }
 
+
       // report now
       if (runScenario.getRunParameters().showLevelMonitoring() || createProcessInstanceThread.isOverload()) {
         logger.info("Step #{}-{}" + " Create (real/scenario)[{}/{} {}]" // Overload marker

diff --git a/src/main/java/org/camunda/automator/engine/flow/RunScenarioFlows.java b/src/main/java/org/camunda/automator/engine/flow/RunScenarioFlows.java
@@ -83,6 +83,8 @@ public void execute(RunResult runResult) {
     logger.info("ScenarioFlow: ------ TheEnd");
   }
 
+
+
   /**
    * Start execution
    *
@@ -118,8 +120,10 @@ private List<RunScenarioFlowBasic> startExecution(List<RunScenarioFlowBasic> lis
             runServiceTaskOp.get().pleaseStop();
         } else {
           if (runServiceTaskOp.isEmpty()) {
+
             RunScenarioFlowServiceTask runServiceTask = new RunScenarioFlowServiceTask(
                 serviceAccess.getTaskScheduler("serviceTask"), scenarioStep, runScenario, new RunResult(runScenario));
+
             runServiceTask.execute();
             listFlows.add(runServiceTask);
           } else {
@@ -137,8 +141,10 @@ private List<RunScenarioFlowBasic> startExecution(List<RunScenarioFlowBasic> lis
             runUserTaskOpt.get().pleaseStop();
         } else {
           if (runUserTaskOpt.isEmpty()) {
+
             RunScenarioFlowUserTask runUserTask = new RunScenarioFlowUserTask(
                 serviceAccess.getTaskScheduler("userTask"), scenarioStep, 0, runScenario, new RunResult(runScenario));
+
             runUserTask.execute();
             listFlows.add(runUserTask);
           } else {
@@ -151,10 +157,12 @@ private List<RunScenarioFlowBasic> startExecution(List<RunScenarioFlowBasic> lis
     return listFlows;
   }
 
+
   private Optional<RunScenarioFlowBasic> getFromList(List<RunScenarioFlowBasic> listTasks, String topic) {
     return listTasks.stream().filter(t -> t.getTopic().equals(topic)).findFirst();
   }
 
+
   /**
    * Wait end of execution.  according to the time in the scenario, wait this time
    *

diff --git a/src/main/java/org/camunda/automator/engine/flow/RunScenarioWarmingUp.java b/src/main/java/org/camunda/automator/engine/flow/RunScenarioWarmingUp.java
@@ -80,6 +80,7 @@ public void warmingUp(RunResult runResult) {
           .toList());
     }
 
+
     logger.info("WarmingUp: Start ---- {} operations (Scenario/Policy: serviceTask:{}/{} userTask: {}/{})",
         listOperationWarmingUp.size(), // size of operations
         warmingUp.useServiceTasks, // scenario allow service task?
@@ -88,6 +89,7 @@ public void warmingUp(RunResult runResult) {
         runScenario.getRunParameters().isUserTask() // pod can run User Task?
     );
 
+
     for (ScenarioStep scenarioStep : listOperationWarmingUp) {
       switch (scenarioStep.getType()) {
       case STARTEVENT -> {

diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
@@ -4,4 +4,6 @@ __________                                                                   __
  |    |     |  | \(  <_> )  \__\  ___/ \___ \ \___ \  /_____/  / __ \|  |  /|  | (  <_> )  Y Y  \/ __ \|  | (  <_> )  | \/
  |____|     |__|   \____/ \___  >___  >____  >____  >         (____  /____/ |__|  \____/|__|_|  (____  /__|  \____/|__|
                               \/    \/     \/     \/               \/                         \/     \/
-                                                                                                              (v1.4.0.c)
+
+                                                                                                                (v1.4.0)
+