[Fix #3642] Fixing task deadline functionality

api/kogito-services/src/main/java/org/kie/kogito/services/uow/DefaultUnitOfWorkManager.java

@@ -37,6 +37,7 @@
  *
  */
 public class DefaultUnitOfWorkManager implements UnitOfWorkManager {
+    private static final DefaultUnitOfWorkManager instance = new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory());
     // uses thread local to associate unit of works to execution context/thread
     private ThreadLocal<UnitOfWork> currentUnitOfWork = new ThreadLocal<>();
     // uses pass through unit of work as fallback if no unit of work has been started
@@ -48,6 +49,10 @@ public class DefaultUnitOfWorkManager implements UnitOfWorkManager {
 
     private Set<UnitOfWorkEventListener> listeners = new LinkedHashSet<>();
 
+    public static DefaultUnitOfWorkManager get() {
+        return instance;
+    }
+
     public DefaultUnitOfWorkManager(UnitOfWorkFactory factory) {
         super();
         this.factory = factory;

jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/HumanTaskNodeInstance.java

@@ -63,12 +63,14 @@ protected InternalKogitoWorkItem createWorkItem(WorkItemNode workItemNode) {
     protected void addWorkItemListener() {
         super.addWorkItemListener();
         getProcessInstance().addEventListener(WORK_ITEM_TRANSITION, this, false);
+        getProcessInstance().addEventListener(TIMER_TRIGGERED_EVENT, this, false);
     }
 
     @Override
     protected void removeWorkItemListener() {
         super.removeWorkItemListener();
         getProcessInstance().removeEventListener(WORK_ITEM_TRANSITION, this, false);
+        getProcessInstance().removeEventListener(TIMER_TRIGGERED_EVENT, this, false);
     }
 
     protected String assignWorkItem(InternalKogitoWorkItem workItem) {

jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/AbstractProcessConfig.java

@@ -36,7 +36,6 @@
 import org.kie.kogito.process.WorkItemHandlerConfig;
 import org.kie.kogito.services.identity.NoOpIdentityProvider;
 import org.kie.kogito.services.signal.DefaultSignalManagerHub;
-import org.kie.kogito.services.uow.CollectingUnitOfWorkFactory;
 import org.kie.kogito.services.uow.DefaultUnitOfWorkManager;
 import org.kie.kogito.signal.SignalManagerHub;
 import org.kie.kogito.uow.UnitOfWorkManager;
@@ -67,8 +66,7 @@ protected AbstractProcessConfig(
         this.workItemHandlerConfig = mergeWorkItemHandler(workItemHandlerConfig, DefaultWorkItemHandlerConfig::new);
         this.processEventListenerConfig = merge(processEventListenerConfigs, processEventListeners);
         this.unitOfWorkManager = orDefault(unitOfWorkManager,
-                () -> new DefaultUnitOfWorkManager(
-                        new CollectingUnitOfWorkFactory()));
+                () -> DefaultUnitOfWorkManager.get());
         this.jobsService = orDefault(jobsService, () -> null);
         this.versionResolver = orDefault(versionResolver, () -> null);
         this.identityProvider = orDefault(identityProvider, NoOpIdentityProvider::new);

quarkus/addons/task-notification/runtime/pom.xml

@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-events-api</artifactId>
+      <artifactId>kogito-events-core</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java

@@ -24,6 +24,7 @@
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 import org.kie.kogito.event.DataEvent;
 import org.kie.kogito.event.EventPublisher;
+import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +43,7 @@ public class NotificationEventPublisher implements EventPublisher {
 
     @Override
     public void publish(DataEvent<?> event) {
-        if (event.getType().startsWith("UserTaskDeadline")) {
+        if (event instanceof UserTaskInstanceDeadlineDataEvent) {
             logger.debug("About to publish event {} to topic {}", event, CHANNEL_NAME);
             try {
                 emitter.send(event);

quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java

@@ -28,7 +28,6 @@
 import org.kie.kogito.process.Processes;
 import org.kie.kogito.process.version.ProjectVersionProcessVersionResolver;
 import org.kie.kogito.services.jobs.impl.InMemoryJobService;
-import org.kie.kogito.services.uow.CollectingUnitOfWorkFactory;
 import org.kie.kogito.services.uow.DefaultUnitOfWorkManager;
 import org.kie.kogito.uow.UnitOfWorkManager;
 
@@ -56,7 +55,7 @@ CorrelationService correlationService() {
     @DefaultBean
     @Produces
     UnitOfWorkManager unitOfWorkManager() {
-        return new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory());
+        return DefaultUnitOfWorkManager.get();
     }
 
     @DefaultBean

springboot/addons/task-notification/pom.xml

@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-events-api</artifactId>
+      <artifactId>kogito-events-core</artifactId>
     </dependency>
 
     <!-- test dependencies -->

springboot/addons/task-notification/src/main/java/org/kie/kogito/task/notification/spring/SpringNotificationEventPublisher.java

@@ -22,6 +22,7 @@
 
 import org.kie.kogito.event.DataEvent;
 import org.kie.kogito.event.EventPublisher;
+import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +43,7 @@ public class SpringNotificationEventPublisher implements EventPublisher {
 
     @Override
     public void publish(DataEvent<?> event) {
-        if (event.getType().startsWith("UserTaskDeadline")) {
+        if (event instanceof UserTaskInstanceDeadlineDataEvent) {
             logger.debug("About to publish event {} to Kafka topic {}", event, topic);
             try {
                 emitter.send(topic, event);