Add support for using Camunda 8.8 without Kafka leveraging execution-listener #34

Author: stephanpelikan

adapters/camunda7/src/main/java/io/vanillabp/cockpit/adapter/camunda7/usertask/Camunda7UserTaskHandler.java

@@ -9,7 +9,6 @@
 import io.vanillabp.cockpit.adapter.common.usertask.events.UserTaskCancelledEvent;
 import io.vanillabp.cockpit.adapter.common.usertask.events.UserTaskCompletedEvent;
 import io.vanillabp.cockpit.adapter.common.usertask.events.UserTaskEventImpl;
-import io.vanillabp.cockpit.adapter.common.usertask.events.UserTaskLifecycleEvent;
 import io.vanillabp.cockpit.adapter.common.usertask.events.UserTaskUpdatedEvent;
 import io.vanillabp.cockpit.commons.utils.DateTimeUtil;
 import io.vanillabp.spi.cockpit.details.DetailsEvent;
@@ -404,25 +403,6 @@ private UserTaskEventImpl prefillUserTaskDetails(
 
     }
 
-    private void fillLifecycleEvent(
-            final String workflowModuleId,
-            final DelegateTask delegateTask,
-            final UserTaskLifecycleEvent event) {
-        
-        event.setEventId(
-                System.nanoTime()
-                + "@"
-                + delegateTask.getProcessInstanceId()
-                + "#"
-                + delegateTask.getId());
-        event.setWorkflowModuleId(workflowModuleId);
-        event.setComment(
-                delegateTask.getDeleteReason());
-        event.setTimestamp(OffsetDateTime.now());
-        event.setUserTaskId(
-                delegateTask.getId());
-    }
-
     @SuppressWarnings("unchecked")
     private UserTaskDetails callUserTaskDetailsProviderMethod(
             final DelegateTask delegateTask,

adapters/camunda7/src/main/java/io/vanillabp/cockpit/adapter/camunda7/workflow/Camunda7WorkflowEventHandler.java

@@ -6,6 +6,12 @@
 import io.vanillabp.cockpit.adapter.camunda7.workflow.publishing.WorkflowEvent;
 import io.vanillabp.cockpit.adapter.common.properties.VanillaBpCockpitProperties;
 import io.vanillabp.cockpit.adapter.common.workflow.WorkflowPublishing;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import org.camunda.bpm.engine.HistoryService;
 import org.camunda.bpm.engine.RepositoryService;
 import org.camunda.bpm.engine.history.HistoricProcessInstance;
@@ -18,13 +24,6 @@
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.springframework.util.StringUtils;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
 public class Camunda7WorkflowEventHandler {
     private static final Logger logger = LoggerFactory
             .getLogger(Camunda7WorkflowEventHandler.class);
@@ -104,7 +103,7 @@ private io.vanillabp.cockpit.adapter.common.workflow.events.WorkflowEvent proces
             logger.trace("No workflow handler available for bpmnProcessId '{}'", processInstance.getProcessDefinitionId());
             return null;
         }
-        final String bpmnProcessName = processInstance.getProcessDefinitionKey();
+
         final var processDefinition = repositoryService.getProcessDefinition(processInstance.getProcessDefinitionId());
         final String bpmnProcessVersion;
         if (StringUtils.hasText(processDefinition.getVersionTag())) {
@@ -115,8 +114,7 @@ private io.vanillabp.cockpit.adapter.common.workflow.events.WorkflowEvent proces
             bpmnProcessVersion = Integer.toString(processDefinition.getVersion());
         }
 
-        return workflowHandler.wrapProcessInstance(
-                processInstance, bpmnProcessName, bpmnProcessVersion);
+        return workflowHandler.wrapProcessInstance(processInstance, bpmnProcessVersion);
 
     }
 

adapters/camunda7/src/main/java/io/vanillabp/cockpit/adapter/camunda7/workflow/Camunda7WorkflowHandler.java

@@ -7,6 +7,7 @@
 import io.vanillabp.cockpit.adapter.common.workflow.events.WorkflowCompletedEvent;
 import io.vanillabp.cockpit.adapter.common.workflow.events.WorkflowCreatedEvent;
 import io.vanillabp.cockpit.adapter.common.workflow.events.WorkflowEvent;
+import io.vanillabp.cockpit.adapter.common.workflow.events.WorkflowEventImpl;
 import io.vanillabp.cockpit.adapter.common.workflow.events.WorkflowUpdatedEvent;
 import io.vanillabp.spi.cockpit.workflow.PrefilledWorkflowDetails;
 import io.vanillabp.spi.cockpit.workflow.WorkflowDetails;
@@ -68,21 +69,19 @@ protected Logger getLogger() {
 
     public WorkflowEvent wrapProcessInstance(
             final HistoricProcessInstance processInstance,
-            final String bpmnProcessName,
             final String bpmnProcessVersion) {
 
-        final String workflowModuleId = processService.getWorkflowModuleId();
-        
+        final var workflowModuleId = processService.getWorkflowModuleId();
+        final var i18nLanguages = properties.getI18nLanguages(workflowModuleId, bpmnProcessId);
+
         WorkflowEvent workflowEvent = null;
         if (processInstance.getEndTime() != null) {
-            WorkflowCompletedEvent workflowCompletedEvent = new WorkflowCompletedEvent();
-            fillLifecycleEvent(workflowModuleId, bpmnProcessId, bpmnProcessVersion, processInstance, workflowCompletedEvent);
+            WorkflowCompletedEvent workflowCompletedEvent = new WorkflowCompletedEvent(workflowModuleId, i18nLanguages);
+            fillWorkflowEvent((HistoricProcessInstanceEventEntity) processInstance, bpmnProcessId, bpmnProcessVersion, workflowCompletedEvent);
             workflowEvent = workflowCompletedEvent;
         } else {
-            WorkflowUpdatedEvent workflowUpdatedEvent = new WorkflowUpdatedEvent(
-                    workflowModuleId,
-                    properties.getI18nLanguages(workflowModuleId, bpmnProcessId));
-            fillWorkflowCreatedEvent(processInstance, bpmnProcessName, bpmnProcessVersion, workflowUpdatedEvent);
+            WorkflowUpdatedEvent workflowUpdatedEvent = new WorkflowUpdatedEvent(workflowModuleId, i18nLanguages);
+            fillWorkflowEvent((HistoricProcessInstanceEventEntity) processInstance, bpmnProcessId, bpmnProcessVersion, workflowUpdatedEvent);
             workflowEvent = workflowUpdatedEvent;
         }
         return workflowEvent;
@@ -97,34 +96,35 @@ public WorkflowEvent wrapProcessInstanceEvent(
     ) {
 
         final String workflowModuleId = processService.getWorkflowModuleId();
+        final var i18nLanguages = properties.getI18nLanguages(workflowModuleId, bpmnProcessId);
 
         WorkflowEvent workflowEvent;
 
         if (processInstanceEvent.isEventOfType(HistoryEventTypes.PROCESS_INSTANCE_START)) {
 
             WorkflowCreatedEvent workflowCreatedEvent = new WorkflowCreatedEvent(
                     workflowModuleId,
-                    properties.getI18nLanguages(workflowModuleId, bpmnProcessId)
+                    i18nLanguages
             );
 
-            fillWorkflowCreatedEvent(processInstanceEvent, bpmnProcessName, bpmnProcessVersion, workflowCreatedEvent);
+            fillWorkflowEvent(processInstanceEvent, bpmnProcessName, bpmnProcessVersion, workflowCreatedEvent);
             workflowEvent = workflowCreatedEvent;
 
         } else if (processInstanceEvent.isEventOfType(HistoryEventTypes.PROCESS_INSTANCE_END)) {
 
-            WorkflowCreatedEvent workflowLifecycleEvent = processInstanceEvent.getDeleteReason() != null ?
-                    new WorkflowCancelledEvent() :
-                    new WorkflowCompletedEvent();
+            WorkflowEventImpl workflowLifecycleEvent = processInstanceEvent.getDeleteReason() != null
+                    ? new WorkflowCancelledEvent(workflowModuleId, i18nLanguages)
+                    : new WorkflowCompletedEvent(workflowModuleId, i18nLanguages);
 
-            fillLifecycleEvent(workflowModuleId, bpmnProcessId, bpmnProcessVersion, processInstanceEvent, workflowLifecycleEvent);
+            fillWorkflowEvent(processInstanceEvent, bpmnProcessId, bpmnProcessVersion, workflowLifecycleEvent);
             workflowEvent = workflowLifecycleEvent;
 
         } else {
 
             WorkflowUpdatedEvent workflowUpdatedEvent = new WorkflowUpdatedEvent(
                     workflowModuleId,
-                    properties.getI18nLanguages(workflowModuleId, bpmnProcessId));
-            fillWorkflowCreatedEvent(processInstanceEvent, bpmnProcessName, bpmnProcessVersion, workflowUpdatedEvent);
+                    i18nLanguages);
+            fillWorkflowEvent(processInstanceEvent, bpmnProcessName, bpmnProcessVersion, workflowUpdatedEvent);
             workflowEvent = workflowUpdatedEvent;
         }
 
@@ -133,7 +133,7 @@ public WorkflowEvent wrapProcessInstanceEvent(
     }
 
 
-    private void fillWorkflowCreatedEvent(HistoricProcessInstance processInstance, String bpmnProcessName, String bpmnProcessVersion, WorkflowCreatedEvent workflowCreatedEvent) {
+    private void fillCreatedEvent(HistoricProcessInstance processInstance, String bpmnProcessName, String bpmnProcessVersion, WorkflowCreatedEvent workflowCreatedEvent) {
         final var bpmnProcessId = processInstance.getProcessDefinitionKey();
 
         final var prefilledWorkflowDetails = prefillWorkflowDetails(
@@ -159,20 +159,18 @@ private void fillWorkflowCreatedEvent(HistoricProcessInstance processInstance, S
                         : details);
     }
 
-    private void fillWorkflowCreatedEvent(
+    private void fillWorkflowEvent(
             HistoricProcessInstanceEventEntity processInstanceEvent,
             String bpmnProcessName,
             String bpmnProcessVersion,
-            WorkflowCreatedEvent workflowCreatedEvent
+            WorkflowEventImpl workflowCreatedEvent
     ) {
 
-
         final var bpmnProcessId = processInstanceEvent.getProcessDefinitionKey();
 
         final var prefilledWorkflowDetails = prefillWorkflowDetails(
                 bpmnProcessId,
                 bpmnProcessVersion,
-                bpmnProcessName,
                 processInstanceEvent,
                 workflowCreatedEvent);
 
@@ -196,7 +194,7 @@ private void fillWorkflowDetailsByCustomDetails(
             final String bpmnProcessId,
             final String bpmnProcessVersion,
             final String bpmnProcessName,
-            WorkflowCreatedEvent event,
+            WorkflowEventImpl event,
             WorkflowDetails details
     ) {
         // a different object was returned then provided
@@ -287,12 +285,11 @@ private void fillWorkflowDetailsByCustomDetails(
 
     }
 
-    private WorkflowCreatedEvent prefillWorkflowDetails(
+    private WorkflowEventImpl prefillWorkflowDetails(
             final String bpmnProcessId,
             final String bpmnProcessVersion,
-            final String bpmnProcessName,
             final HistoricProcessInstanceEventEntity processInstanceEvent,
-            final WorkflowCreatedEvent event) {
+            final WorkflowEventImpl event) {
 
         final var prefilledWorkflowDetails = event;
 

adapters/camunda8/src/main/java/io/vanillabp/cockpit/adapter/camunda8/Camunda8AdapterConfiguration.java

@@ -11,6 +11,7 @@
 import io.vanillabp.cockpit.adapter.camunda8.workflow.Camunda8WorkflowEventHandler;
 import io.vanillabp.cockpit.adapter.camunda8.workflow.Camunda8WorkflowHandler;
 import io.vanillabp.cockpit.adapter.camunda8.workflow.Camunda8WorkflowWiring;
+import io.vanillabp.cockpit.adapter.camunda8.workflow.publishing.Camunda8WorkflowEventPublisher;
 import io.vanillabp.cockpit.adapter.common.CockpitCommonAdapterConfiguration;
 import io.vanillabp.cockpit.adapter.common.properties.VanillaBpCockpitProperties;
 import io.vanillabp.cockpit.adapter.common.service.AdapterConfigurationBase;
@@ -77,7 +78,7 @@ public class Camunda8AdapterConfiguration extends AdapterConfigurationBase<Camun
     @Autowired
     private Camunda8VanillaBpProperties properties;
 
-    private final Map<Class<?>, Camunda8BusinessCockpitService> cockpitServices = new HashMap<>();
+    private final Map<Class<?>, Camunda8BusinessCockpitService<?>> cockpitServices = new HashMap<>();
 
     @Override
     public String getAdapterId() {
@@ -90,12 +91,17 @@ public Camunda8UserTaskEventHandler camunda8BusinessCockpitUserTaskEventHandler(
     }
 
     @Bean
-    public Camunda8WorkflowEventHandler ccamunda8BusinessCockpitWorkflowEventHandler(
-            final ApplicationEventPublisher applicationEventPublisher,
-            final WorkflowPublishing workflowPublishing) {
-        return new Camunda8WorkflowEventHandler(applicationEventPublisher, workflowPublishing);
+    public Camunda8WorkflowEventHandler ccamunda8BusinessCockpitWorkflowEventHandler() {
+        return new Camunda8WorkflowEventHandler();
     }
 
+    @Bean
+    public Camunda8WorkflowEventPublisher camunda8BusinessCockpitWorkflowEventPublisher(
+            final WorkflowPublishing workflowPublishing) {
+
+        return new Camunda8WorkflowEventPublisher(
+                workflowPublishing);
+    }
 
     @Bean
     public Camunda8UserTaskEventPublisher camunda8BusinessCockpitUserTaskEventPublisher(
@@ -138,25 +144,33 @@ public Camunda8UserTaskWiring camunda8BusinessCockpitUserTaskWiring(
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
     public Camunda8WorkflowHandler camunda8WorkflowHandler(
             final VanillaBpCockpitProperties cockpitProperties,
+            final ApplicationEventPublisher applicationEventPublisher,
             final AdapterAwareProcessService<?> processService,
             final String bpmnProcessId,
-            final String bpmnProcessName,
+            final String bpmnProcessVersionInfo,
+            final String processTitle,
             final Optional<Configuration> templating,
+            final String aggregateIdPropertyName,
             final CrudRepository<Object, Object> workflowAggregateRepository,
             final Object bean,
             final Method method,
-            final List<MethodParameter> parameters) {
+            final List<MethodParameter> parameters,
+            final CamundaClient client) {
 
         final var result = new Camunda8WorkflowHandler(
                 cockpitProperties,
+                applicationEventPublisher,
                 processService,
                 bpmnProcessId,
-                bpmnProcessName,
+                bpmnProcessVersionInfo,
+                processTitle,
                 templating,
+                aggregateIdPropertyName,
                 workflowAggregateRepository,
                 bean,
                 method,
-                parameters);
+                parameters,
+                client);
         final var cockpitService = cockpitServices.get(processService.getWorkflowAggregateClass());
         if (cockpitService != null) {
             final var tenantId = properties.getTenantId(processService.getWorkflowModuleId());
@@ -208,9 +222,11 @@ public Camunda8UserTaskHandler camunda8UserTaskHandler(
     @Bean
     public Camunda8WorkflowWiring camunda8BusinessCockpitWorkflowWiring(
             final ApplicationContext applicationContext,
+            final ApplicationEventPublisher applicationEventPublisher,
             final VanillaBpCockpitProperties cockpitProperties,
             final Camunda8VanillaBpProperties camunda8Properties,
             final SpringBeanUtil springBeanUtil,
+            final SpringDataUtil springDataUtil,
             final Map<Class<?>, AdapterAwareProcessService<?>> connectableServices,
             @Qualifier(CockpitCommonAdapterConfiguration.TEMPLATING_QUALIFIER)
             final Optional<Configuration> templating,
@@ -219,9 +235,12 @@ public Camunda8WorkflowWiring camunda8BusinessCockpitWorkflowWiring(
             final ObjectProvider<Camunda8WorkflowHandler> workflowHandlers) {
         return new Camunda8WorkflowWiring(
                 applicationContext,
+                applicationEventPublisher,
+                workerId,
                 cockpitProperties,
                 camunda8Properties,
                 springBeanUtil,
+                springDataUtil,
                 new WorkflowMethodParameterFactory(),
                 connectableServices,
                 getConnectableServices(),
@@ -238,8 +257,6 @@ public Camunda8DeploymentAdapter camunda8BusinessCockpitDeploymentAdapter(
             final VanillaBpCockpitProperties cockpitProperties,
             final Camunda8UserTaskWiring camunda8UserTaskWiring,
             final Camunda8WorkflowWiring camunda8WorkflowWiring,
-            final Camunda8UserTaskEventHandler userTaskEventHandler,
-            final Camunda8WorkflowEventHandler workflowEventHandler,
             final ApplicationEventPublisher applicationEventPublisher) {
 
         return new Camunda8DeploymentAdapter(
@@ -249,8 +266,6 @@ public Camunda8DeploymentAdapter camunda8BusinessCockpitDeploymentAdapter(
                 cockpitProperties,
                 camunda8UserTaskWiring,
                 camunda8WorkflowWiring,
-                userTaskEventHandler,
-                workflowEventHandler,
                 applicationEventPublisher);
     }
 
@@ -296,7 +311,7 @@ public <WA> Camunda8BusinessCockpitService<?> newBusinessCockpitServiceImplement
             }
         }
 
-        final var result = new Camunda8BusinessCockpitService<WA>(
+        final var result = new Camunda8BusinessCockpitService<>(
                 workflowAggregateRepository,
                 workflowAggregateClass,
                 springDataUtil::getId,