Move to java-client-operate 8.5.8-rc1

camunda-community-hub · Aug 3, 2024 · dabc657 · dabc657
1 parent fa6078f
commit dabc657
Show file tree

Hide file tree

Showing 5 changed files with 208 additions and 105 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,8 +14,8 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.source>${java.version}</maven.compiler.source>
 
-    <zeebe.version>8.3.0</zeebe.version>
-    <zeebe-client.version>8.3.0</zeebe-client.version>
+    <version.zeebe>8.5.7</version.zeebe>
+    <version.zeebe-client>8.5.5</version.zeebe-client>
 
     <camunda7.version>7.19.0</camunda7.version>
 
@@ -52,12 +52,12 @@
     <dependency>
       <groupId>io.camunda.spring</groupId>
       <artifactId>spring-boot-starter-camunda</artifactId>
-      <version>${zeebe.version}</version>
+      <version>${version.zeebe}</version>
     </dependency>
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>zeebe-client-java</artifactId>
-      <version>${zeebe-client.version}</version>
+      <version>${version.zeebe-client}</version>
     </dependency>
 
     <dependency>
@@ -97,29 +97,31 @@
       <artifactId>camunda-operate-client-java</artifactId>
       <version>8.1.8.1</version>
     </dependency>
--->
-
-    <!-- https://github.com/camunda-community-hub/camunda-operate-client-java -->
-    <!--
     <dependency>
-      <groupId>io.camunda.spring</groupId>
-      <artifactId>spring-boot-starter-camunda-operate</artifactId>
-      <version>8.5.8-rc1</version>
+      <groupId>io.camunda</groupId>
+      <artifactId>camunda-tasklist-client-java</artifactId>
+      <version>1.6.1</version>
     </dependency>
 -->
 
+
+    <!-- https://github.com/camunda-community-hub/camunda-operate-client-java -->
     <dependency>
       <groupId>io.camunda.spring</groupId>
       <artifactId>java-client-operate</artifactId>
       <version>8.5.8-rc1</version>
     </dependency>
 
+    <!-- 1.6.1, 8.5.3.4 -->
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>camunda-tasklist-client-java</artifactId>
       <version>1.6.1</version>
     </dependency>
 
+
+
+
     <!-- C7 external task client -->
     <dependency>
       <groupId>javax.xml.bind</groupId>

diff --git a/src/main/java/org/camunda/automator/bpmnengine/BpmnEngineFactory.java b/src/main/java/org/camunda/automator/bpmnengine/BpmnEngineFactory.java
@@ -7,6 +7,7 @@
 package org.camunda.automator.bpmnengine;
 
 import org.camunda.automator.bpmnengine.camunda7.BpmnEngineCamunda7;
+import org.camunda.automator.bpmnengine.camunda8.BenchmarkStartPiExceptionHandlingStrategy;
 import org.camunda.automator.bpmnengine.camunda8.BpmnEngineCamunda8;
 import org.camunda.automator.bpmnengine.dummy.BpmnEngineDummy;
 import org.camunda.automator.configuration.BpmnEngineList;
@@ -15,18 +16,28 @@
 import java.util.EnumMap;
 import java.util.Map;
 
-/**
+
+/*
  * This can't be a Component, to be used in AutomatorAPI
  */
 public class BpmnEngineFactory {
 
   private static final BpmnEngineFactory bpmnEngineFactory = new BpmnEngineFactory();
   Map<BpmnEngineList.CamundaEngine, BpmnEngine> cacheEngine = new EnumMap<>(BpmnEngineList.CamundaEngine.class);
+  BenchmarkStartPiExceptionHandlingStrategy benchmarkStartPiExceptionHandlingStrategy=null;
 
+  private BpmnEngineFactory() {
+    // use the getInstance() method
+  }
   public static BpmnEngineFactory getInstance() {
     return bpmnEngineFactory;
   }
 
+  public static BpmnEngineFactory getInstance(BenchmarkStartPiExceptionHandlingStrategy benchmarkStartPiExceptionHandlingStrategy) {
+    bpmnEngineFactory.benchmarkStartPiExceptionHandlingStrategy = benchmarkStartPiExceptionHandlingStrategy;
+    return bpmnEngineFactory;
+  }
+
   public BpmnEngine getEngineFromConfiguration(BpmnEngineList.BpmnServerDefinition serverDefinition, boolean logDebug)
       throws AutomatorException {
     BpmnEngine engine = cacheEngine.get(serverDefinition.serverType);
@@ -42,9 +53,9 @@ public BpmnEngine getEngineFromConfiguration(BpmnEngineList.BpmnServerDefinition
       engine = switch (serverDefinition.serverType) {
         case CAMUNDA_7 -> new BpmnEngineCamunda7(serverDefinition, logDebug);
 
-        case CAMUNDA_8 -> BpmnEngineCamunda8.getFromServerDefinition(serverDefinition, logDebug);
+        case CAMUNDA_8 -> BpmnEngineCamunda8.getFromServerDefinition(serverDefinition, benchmarkStartPiExceptionHandlingStrategy, logDebug);
 
-        case CAMUNDA_8_SAAS -> BpmnEngineCamunda8.getFromServerDefinition(serverDefinition, logDebug);
+        case CAMUNDA_8_SAAS -> BpmnEngineCamunda8.getFromServerDefinition(serverDefinition, benchmarkStartPiExceptionHandlingStrategy, logDebug);
 
         case DUMMY -> new BpmnEngineDummy(serverDefinition);