Pump version of io.vanillabp:spring-boot-support

Pump versions of spring-boot-support and camunda client

Author: stephanpelikan

pom.xml

@@ -17,7 +17,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <camunda.version>7.20.0</camunda.version>
+    <camunda.version>7.24.0</camunda.version>
     <version.java>17</version.java>
   </properties>
 

spring-boot/pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.vanillabp</groupId>
       <artifactId>spring-boot-support</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.3</version>
     </dependency>
     <dependency>
       <groupId>org.camunda.bpm.springboot</groupId>

spring-boot/src/main/java/io/vanillabp/camunda7/deployment/Camunda7DeploymentAdapter.java

@@ -8,6 +8,9 @@
 import io.vanillabp.springboot.adapter.ModuleAwareBpmnDeployment;
 import io.vanillabp.springboot.adapter.VanillaBpProperties;
 import jakarta.annotation.PostConstruct;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.repository.ResumePreviousBy;
 import org.camunda.bpm.engine.spring.application.SpringProcessApplication;
@@ -22,6 +25,8 @@ public class Camunda7DeploymentAdapter extends ModuleAwareBpmnDeployment {
 
 	private static final Logger logger = LoggerFactory.getLogger(Camunda7DeploymentAdapter.class);
 
+    public static final String MODELCACHE_PREFIX = "C7_";
+
     private final ProcessEngine processEngine;
 
     private final SpringProcessApplication processApplication;
@@ -96,7 +101,7 @@ protected void doDeployment(
         }
 
         boolean hasDeployables = false;
-        
+
         for (final var resource : bpmns) {
             try (final var inputStream = resource.getInputStream()) {
                 deploymentBuilder.addInputStream(resource.getFilename(), inputStream);
@@ -121,9 +126,23 @@ protected void doDeployment(
         // BPMNs which are new will be parsed and wired as part of the deployment
         final String deploymentId;
         if (hasDeployables) {
-            deploymentId = deploymentBuilder
-                    .deployWithResult()
-                    .getId();
+            final var result = deploymentBuilder
+                    .deployWithResult();
+            deploymentId = result.getId();
+            Optional
+                    .ofNullable(result.getDeployedProcessDefinitions())
+                    .stream()
+                    .flatMap(Collection::stream)
+                    .map(definition -> Map.entry(
+                            definition.getResourceName(),
+                            processEngine
+                                    .getRepositoryService()
+                                    .getBpmnModelInstance(definition.getId())))
+                    .map(resourceModel -> Map.entry(
+                            MODELCACHE_PREFIX + resourceModel.getKey(),
+                            Map.<String, Object>entry(workflowModuleId, resourceModel.getValue())))
+                    .forEach(cacheItem -> ModuleAwareBpmnDeployment.bpmnModelCache.put(
+                            cacheItem.getKey(), cacheItem.getValue()));
         } else {
             deploymentId = "";
         }
@@ -144,7 +163,10 @@ protected void doDeployment(
                     try {
                         TaskWiringBpmnParseListener.setOldVersionBpmn(
                                 !definition.getDeploymentId().equals(deploymentId));
-                        processEngine.getRepositoryService().getProcessModel(definition.getId());
+                        final var model = processEngine.getRepositoryService().getBpmnModelInstance(definition.getId());
+                        ModuleAwareBpmnDeployment.bpmnModelCache.put(
+                                MODELCACHE_PREFIX + definition.getResourceName(),
+                                Map.entry(workflowModuleId, model));
                     } finally {
                         TaskWiringBpmnParseListener.setOldVersionBpmn(false);
                     }

spring-boot/src/main/java/io/vanillabp/camunda7/wiring/Camunda7Connectable.java

@@ -1,6 +1,7 @@
 package io.vanillabp.camunda7.wiring;
 
 import io.vanillabp.springboot.adapter.Connectable;
+import org.camunda.bpm.engine.repository.ProcessDefinition;
 
 public class Camunda7Connectable implements Connectable {
 
@@ -10,22 +11,26 @@ public static enum Type {
 
     private final Type type;
     private final String bpmnProcessId;
+    private final String versionInfo;
     private final String elementId;
     private final String taskDefinition;
 
     public Camunda7Connectable(
-            final String bpmnProcessId,
+            final ProcessDefinition processDefinition,
             final String elementId,
             final String taskDefinition,
             final Type type) {
 
-        this.bpmnProcessId = bpmnProcessId;
+        this.bpmnProcessId = processDefinition.getKey();
+        this.versionInfo = processDefinition.getVersionTag() != null
+                ? "%s (%d)".formatted(processDefinition.getVersionTag(), processDefinition.getVersion())
+                : Integer.toString(processDefinition.getVersion());
         this.elementId = elementId;
         this.taskDefinition = taskDefinition;
         this.type = type;
 
     }
-    
+
     public boolean applies(
             final String elementId,
             final String taskDefinition) {
@@ -34,7 +39,14 @@ public boolean applies(
                 || getTaskDefinition().equals(taskDefinition);
 
     }
-    
+
+    @Override
+    public String getVersionInfo() {
+
+        return versionInfo;
+
+    }
+
     @Override
     public boolean isExecutableProcess() {
 

spring-boot/src/main/java/io/vanillabp/camunda7/wiring/ProcessEntityAwareExpressionManager.java

@@ -1,15 +1,14 @@
 package io.vanillabp.camunda7.wiring;
 
 import io.vanillabp.camunda7.service.Camunda7ProcessService;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.function.Supplier;
 import org.camunda.bpm.engine.spring.SpringExpressionManager;
 import org.camunda.bpm.impl.juel.jakarta.el.CompositeELResolver;
 import org.camunda.bpm.impl.juel.jakarta.el.ELResolver;
 import org.springframework.context.ApplicationContext;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.function.Supplier;
-
 /*
  * Custom expression manager to resolve process entities and @WorkflowTask annotated methods
  */
@@ -38,11 +37,7 @@ protected ELResolver createElResolver() {
             processEntityELResolver = new ProcessEntityELResolver(
                     connectableServices);
 
-            toBeConnected
-                    .entrySet()
-                    .stream()
-                    .forEach(entry -> processEntityELResolver
-                            .addTaskHandler(entry.getKey(), entry.getValue()));
+            toBeConnected.forEach(processEntityELResolver::addTaskHandler);
             toBeConnected.clear();
 
         }

spring-boot/src/main/java/io/vanillabp/camunda7/wiring/TaskWiringBpmnParseListener.java

@@ -1,6 +1,10 @@
 package io.vanillabp.camunda7.wiring;
 
 import io.vanillabp.camunda7.Camunda7VanillaBpProperties;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import org.camunda.bpm.engine.impl.bpmn.behavior.DmnBusinessRuleTaskActivityBehavior;
 import org.camunda.bpm.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
 import org.camunda.bpm.engine.impl.bpmn.listener.DelegateExpressionExecutionListener;
@@ -18,11 +22,6 @@
 import org.camunda.bpm.engine.impl.variable.VariableDeclaration;
 import org.springframework.util.StringUtils;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 @SuppressWarnings("deprecation")
 public class TaskWiringBpmnParseListener implements BpmnParseListener {
 
@@ -148,10 +147,8 @@ public void parseUserTask(
                 org.camunda.bpm.engine.delegate.TaskListener.EVENTNAME_DELETE,
                 userTaskEventHandler);
 
-        final var bpmnProcessId = ((ProcessDefinitionEntity) activity.getProcessDefinition()).getKey();
-
         final var connectable = new Camunda7Connectable(
-                bpmnProcessId,
+                (ProcessDefinitionEntity) activity.getProcessDefinition(),
                 activity.getId(),
                 taskDefinition.getFormKey() != null ? taskDefinition.getFormKey().getExpressionText() : null,
                 Camunda7Connectable.Type.USERTASK);
@@ -169,10 +166,8 @@ private void connectListener(
             final Camunda7Connectable.Type type,
             final String expression) {
 
-        final var bpmnProcessId = ((ProcessDefinitionEntity) activity.getProcessDefinition()).getKey();
-        
         final var connectable = new Camunda7Connectable(
-                bpmnProcessId,
+                (ProcessDefinitionEntity) activity.getProcessDefinition(),
                 activity.getId(),
                 expression,
                 type);
@@ -239,7 +234,7 @@ private boolean connectTaskLike(
             final ScopeImpl scope,
             final ActivityImpl activity) {
 
-        final var bpmnProcessId = ((ProcessDefinitionEntity) activity.getProcessDefinition()).getKey();
+        final var processDefinition = (ProcessDefinitionEntity) activity.getProcessDefinition();
 
         final var delegateExpression = element.attributeNS(
                 BpmnParse.CAMUNDA_BPMN_EXTENSIONS_NS,
@@ -259,7 +254,7 @@ private boolean connectTaskLike(
             final var unwrappedDelegateExpression = unwrapExpression(activity, delegateExpression);
 
             connectable = new Camunda7Connectable(
-                    bpmnProcessId,
+                    processDefinition,
                     activity.getId(),
                     unwrappedDelegateExpression,
                     Camunda7Connectable.Type.DELEGATE_EXPRESSION);
@@ -269,15 +264,15 @@ private boolean connectTaskLike(
             final var unwrappedExpression = unwrapExpression(activity, expression);
 
             connectable = new Camunda7Connectable(
-                    bpmnProcessId,
+                    processDefinition,
                     activity.getId(),
                     unwrappedExpression,
                     Camunda7Connectable.Type.EXPRESSION);
 
         } else if (StringUtil.hasText(topic)) {
 
             connectable = new Camunda7Connectable(
-                    bpmnProcessId,
+                    processDefinition,
                     activity.getId(),
                     topic,
                     Camunda7Connectable.Type.EXTERNAL_TASK);
@@ -646,8 +641,8 @@ public void parseRootElement(
                     final var processService = taskWiring.wireService(
                             tbw.workflowModuleId,
                             tbw.bpmnProcessId,
-                            oldVersionBpmn.get().booleanValue() ? null : tbw.messageBasedStartEventsMessages,
-                            oldVersionBpmn.get().booleanValue() ? null : tbw.signalBasedStartEventsSignals);
+                            oldVersionBpmn.get() ? null : tbw.messageBasedStartEventsMessages,
+                            oldVersionBpmn.get() ? null : tbw.signalBasedStartEventsSignals);
                     tbw.connectables
                             .forEach(connectable -> taskWiring.wireTask(workflowModuleId.get(), processService, connectable));
                 });