From 6d099af2bedc2ba0eb42e882ae1ea82991c5169e Mon Sep 17 00:00:00 2001
From: Helber Belmiro <helber.belmiro@gmail.com>
Date: Tue, 8 Aug 2023 17:37:27 -0300
Subject: [PATCH] KOGITO-9158 Changed KnativeWorkItemHandler to extend
 RestWorkItemHandler

Signed-off-by: Helber Belmiro <helber.belmiro@gmail.com>
---
 .../KnativeWorkItemHandler.java                | 18 ++++++------------
 .../KnativeWorkItemHandlerProducer.java        |  7 +------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java
index 827a7105e7d..696c2685359 100644
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandler.java
@@ -21,14 +21,15 @@
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey;
 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.process.workitem.WorkItemExecutionException;
 import org.kogito.workitem.rest.RestWorkItemHandler;
 
+import io.vertx.mutiny.ext.web.client.WebClient;
+
 import static org.kie.kogito.addons.k8s.resource.catalog.KubernetesProtocol.KNATIVE;
 
-public final class KnativeWorkItemHandler implements KogitoWorkItemHandler {
+public final class KnativeWorkItemHandler extends RestWorkItemHandler {
 
     public static final String APPLICATION_CLOUDEVENTS_JSON_CHARSET_UTF_8 = "application/cloudevents+json; charset=UTF-8";
 
@@ -46,12 +47,10 @@ public final class KnativeWorkItemHandler implements KogitoWorkItemHandler {
 
     public static final String CLOUDEVENT_SENT_AS_PLAIN_JSON_ERROR_MESSAGE = "A Knative custom function argument cannot be a CloudEvent when the 'asCloudEvent' property are not set to 'true'";
 
-    private final KogitoWorkItemHandler delegate;
-
     private final KubernetesServiceCatalog kubernetesServiceCatalog;
 
-    public KnativeWorkItemHandler(KogitoWorkItemHandler delegate, KubernetesServiceCatalog kubernetesServiceCatalog) {
-        this.delegate = delegate;
+    public KnativeWorkItemHandler(WebClient httpClient, WebClient httpsClient, KubernetesServiceCatalog kubernetesServiceCatalog) {
+        super(httpClient, httpsClient);
         this.kubernetesServiceCatalog = kubernetesServiceCatalog;
     }
 
@@ -59,7 +58,7 @@ public KnativeWorkItemHandler(KogitoWorkItemHandler delegate, KubernetesServiceC
     public void executeWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
         Map<String, Object> parameters = workItem.getParameters();
         parameters.put(RestWorkItemHandler.URL, getUrl(parameters));
-        delegate.executeWorkItem(workItem, manager);
+        super.executeWorkItem(workItem, manager);
     }
 
     private String getUrl(Map<String, Object> parameters) {
@@ -79,9 +78,4 @@ private String getServiceAddress(Map<String, Object> parameters) {
     public String getName() {
         return NAME;
     }
-
-    @Override
-    public void abortWorkItem(KogitoWorkItem workItem, KogitoWorkItemManager manager) {
-        delegate.abortWorkItem(workItem, manager);
-    }
 }
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
index 4b620d22ac3..bc116f8fe15 100644
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
@@ -19,7 +19,6 @@
 import javax.inject.Inject;
 
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
-import org.kogito.workitem.rest.RestWorkItemHandler;
 import org.kogito.workitem.rest.RestWorkItemHandlerUtils;
 
 import io.vertx.ext.web.client.WebClientOptions;
@@ -36,11 +35,7 @@ public final class KnativeWorkItemHandlerProducer {
 
     @Produces
     KnativeWorkItemHandler createKnativeWorkItemHandler() {
-        return new KnativeWorkItemHandler(createRestWorkItemHandler(), kubernetesServiceCatalog);
-    }
-
-    private RestWorkItemHandler createRestWorkItemHandler() {
-        return new RestWorkItemHandler(getHttpClient(vertx), getHttpsClient());
+        return new KnativeWorkItemHandler(getHttpClient(vertx), getHttpsClient(), kubernetesServiceCatalog);
     }
 
     private WebClient getHttpsClient() {