[incubator-kie-issues-1439] UserTask Decouple codegen and interface f…

…rom engine
apache · Sep 11, 2024 · ad6bef1 · ad6bef1
1 parent 8f1a822
commit ad6bef1
Show file tree

Hide file tree

Showing 30 changed files with 331 additions and 696 deletions.
diff --git a/...e/onboarding-quarkus/src/main/java/org/kie/kogito/examples/BaseWorkItemHandlerConfig.java b/...e/onboarding-quarkus/src/main/java/org/kie/kogito/examples/BaseWorkItemHandlerConfig.java
@@ -31,7 +31,7 @@
 import org.kie.kogito.addons.k8s.LocalEndpointDiscovery;
 import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller;
 import org.kie.kogito.examples.onboarding.DecisionTaskWorkItemHandler;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemHandler;
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
 import jakarta.annotation.PostConstruct;

diff --git a/...quarkus/src/main/java/org/kie/kogito/examples/onboarding/DecisionTaskWorkItemHandler.java b/...quarkus/src/main/java/org/kie/kogito/examples/onboarding/DecisionTaskWorkItemHandler.java
@@ -19,15 +19,18 @@
 package org.kie.kogito.examples.onboarding;
 
 import java.util.Map;
+import java.util.Optional;
 
 import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemManager;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItem;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemHandler;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemManager;
+import org.kie.kogito.internal.process.workitem.WorkItemTransition;
+import org.kie.kogito.process.workitems.impl.DefaultKogitoWorkItemHandler;
 
 import jakarta.ws.rs.HttpMethod;
 
-public class DecisionTaskWorkItemHandler implements KogitoWorkItemHandler {
+public class DecisionTaskWorkItemHandler extends DefaultKogitoWorkItemHandler {
 
     private QuarkusDiscoveredEndpointCaller endpointCaller;
 
@@ -36,14 +39,9 @@ public DecisionTaskWorkItemHandler(QuarkusDiscoveredEndpointCaller endpointCalle
     }
 
     @Override
-    public void executeWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
+    public Optional<WorkItemTransition> activateWorkItemHandler(KogitoWorkItemManager manager, KogitoWorkItemHandler handler, KogitoWorkItem workItem, WorkItemTransition transition) {
         Map<String, Object> results = endpointCaller.discoverAndCall(workItem, System.getenv("NAMESPACE"), "Decision", HttpMethod.POST);
-        manager.completeWorkItem(workItem.getStringId(), results);
-    }
-
-    @Override
-    public void abortWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
-
+        return Optional.of(handler.completeTransition(workItem.getPhaseStatus(), results));
     }
 
     @Override

diff --git a/...ample/onboarding-quarkus/src/test/java/org/kie/kogito/examples/WorkItemHandlerConfig.java b/...ample/onboarding-quarkus/src/test/java/org/kie/kogito/examples/WorkItemHandlerConfig.java
@@ -19,7 +19,7 @@
 package org.kie.kogito.examples;
 
 import org.kie.kogito.examples.test.RecordedOutputWorkItemHandler;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemHandler;
 
 public class WorkItemHandlerConfig extends BaseWorkItemHandlerConfig {
 

diff --git a/...arding-quarkus/src/test/java/org/kie/kogito/examples/onboarding/OnboardingEndpointIT.java b/...arding-quarkus/src/test/java/org/kie/kogito/examples/onboarding/OnboardingEndpointIT.java
@@ -28,8 +28,8 @@
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.examples.test.RecordedOutputWorkItemHandler;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItem;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemHandler;
 import org.kie.kogito.process.ProcessConfig;
 import org.kie.kogito.testcontainers.quarkus.InfinispanQuarkusTestResource;
 

diff --git a/...ing-quarkus/src/test/java/org/kie/kogito/examples/test/RecordedOutputWorkItemHandler.java b/...ing-quarkus/src/test/java/org/kie/kogito/examples/test/RecordedOutputWorkItemHandler.java
@@ -20,26 +20,23 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 
-import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemManager;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItem;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemHandler;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemManager;
+import org.kie.kogito.internal.process.workitem.WorkItemTransition;
+import org.kie.kogito.process.workitems.impl.DefaultKogitoWorkItemHandler;
 
-public class RecordedOutputWorkItemHandler implements KogitoWorkItemHandler {
+public class RecordedOutputWorkItemHandler extends DefaultKogitoWorkItemHandler {
 
     private Map<String, Function<KogitoWorkItem, Map<String, Object>>> recorded = new HashMap<>();
 
     @Override
-    public void executeWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
+    public Optional<WorkItemTransition> activateWorkItemHandler(KogitoWorkItemManager manager, KogitoWorkItemHandler handler, KogitoWorkItem workItem, WorkItemTransition transition) {
         Map<String, Object> results = recorded.remove(workItem.getParameter("TaskName")).apply(workItem);
-
-        manager.completeWorkItem(workItem.getStringId(), results);
-    }
-
-    @Override
-    public void abortWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
-
+        return Optional.of(handler.completeTransition(workItem.getPhaseStatus(), results));
     }
 
     public void record(String name, Function<KogitoWorkItem, Map<String, Object>> item) {

diff --git a/...examples/process-error-handling/src/main/java/org/acme/wih/CustomTaskWorkItemHandler.java b/...examples/process-error-handling/src/main/java/org/acme/wih/CustomTaskWorkItemHandler.java
@@ -20,20 +20,23 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import org.kie.api.runtime.process.ProcessWorkItemHandlerException;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
-import org.kie.kogito.internal.process.runtime.KogitoWorkItemManager;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItem;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemHandler;
+import org.kie.kogito.internal.process.workitem.KogitoWorkItemManager;
+import org.kie.kogito.internal.process.workitem.WorkItemTransition;
+import org.kie.kogito.process.workitems.impl.DefaultKogitoWorkItemHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CustomTaskWorkItemHandler implements KogitoWorkItemHandler {
+public class CustomTaskWorkItemHandler extends DefaultKogitoWorkItemHandler {
 
     private static final Logger LOG = LoggerFactory.getLogger(CustomTaskWorkItemHandler.class);
 
     @Override
-    public void executeWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
+    public Optional<WorkItemTransition> activateWorkItemHandler(KogitoWorkItemManager manager, KogitoWorkItemHandler handler, KogitoWorkItem workItem, WorkItemTransition transition) {
         LOG.debug("start");
         LOG.debug("Passed parameters:");
 
@@ -51,15 +54,22 @@ public void executeWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manag
         if (input.matches("(RETRY|COMPLETE|RETHROW)")) {
             handleError(input);
         } else if (input.contentEquals("ABORT")) {
-            manager.abortWorkItem(workItem.getStringId());
+            return Optional.of(handler.abortTransition(workItem.getPhaseStatus()));
         } else {
             // Don’t forget to finish the work item otherwise the process
             // will be active infinitely and never will pass the flow
             // to the next node.
-            manager.completeWorkItem(workItem.getStringId(), results);
+            return Optional.of(handler.completeTransition(workItem.getPhaseStatus(), results));
         }
 
         LOG.debug("end");
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<WorkItemTransition> abortWorkItemHandler(KogitoWorkItemManager manager, KogitoWorkItemHandler handler, KogitoWorkItem workitem, WorkItemTransition transition) {
+        LOG.debug("ABORT!");
+        return Optional.empty();
     }
 
     private void handleError(String strategy) {
@@ -68,9 +78,4 @@ private void handleError(String strategy) {
                 new IllegalStateException(strategy + " strategy test"));
     }
 
-    @Override
-    public void abortWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
-        LOG.debug("ABORT!");
-        manager.abortWorkItem(workItem.getStringId());
-    }
 }
diff --git a/...-lifecycle-quarkus/src/main/java/org/acme/travels/config/CustomWorkItemHandlerConfig.java b/...-lifecycle-quarkus/src/main/java/org/acme/travels/config/CustomWorkItemHandlerConfig.java
@@ -18,8 +18,7 @@
  */
 package org.acme.travels.config;
 
-import org.acme.travels.usertasks.CustomHumanTaskLifeCycle;
-import org.jbpm.process.instance.impl.humantask.HumanTaskWorkItemHandler;
+import org.acme.travels.usertasks.CustomHumanTaskWorkItemHandler;
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
 import jakarta.enterprise.context.ApplicationScoped;
@@ -37,6 +36,6 @@
 @ApplicationScoped
 public class CustomWorkItemHandlerConfig extends DefaultWorkItemHandlerConfig {
     {
-        register("Human Task", new HumanTaskWorkItemHandler(new CustomHumanTaskLifeCycle()));
+        register("Human Task", new CustomHumanTaskWorkItemHandler());
     }
 }
diff --git a/...ustom-lifecycle-quarkus/src/main/java/org/acme/travels/usertasks/CompleteStartedOnly.java b/...ustom-lifecycle-quarkus/src/main/java/org/acme/travels/usertasks/CompleteStartedOnly.java
diff --git a/...-lifecycle-quarkus/src/main/java/org/acme/travels/usertasks/CustomHumanTaskLifeCycle.java b/...-lifecycle-quarkus/src/main/java/org/acme/travels/usertasks/CustomHumanTaskLifeCycle.java