From 4c5ba6575a4dfb579b10366ea9dbecb61820fa1c Mon Sep 17 00:00:00 2001 From: Helber Belmiro Date: Wed, 23 Aug 2023 11:25:38 -0300 Subject: [PATCH 1/3] Fixed tests for quarkus-lts Signed-off-by: Helber Belmiro --- quarkus/addons/knative/serving/integration-tests/pom.xml | 6 ++++++ .../integration-tests/pom.xml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/quarkus/addons/knative/serving/integration-tests/pom.xml b/quarkus/addons/knative/serving/integration-tests/pom.xml index f1354419700..ce77fcba79d 100644 --- a/quarkus/addons/knative/serving/integration-tests/pom.xml +++ b/quarkus/addons/knative/serving/integration-tests/pom.xml @@ -91,6 +91,12 @@ kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils test + + + org.kie.kogito + kogito-quarkus-serverless-workflow-deployment + test + diff --git a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml index 772b7d16695..b52249930ce 100644 --- a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml +++ b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml @@ -68,6 +68,11 @@ wiremock-jre8 test + + org.kie.kogito + kogito-quarkus-serverless-workflow-deployment + test + From f0a4d46298c6a8f8a6c64c6aa3789bf47221edc6 Mon Sep 17 00:00:00 2001 From: Helber Belmiro Date: Wed, 23 Aug 2023 12:04:53 -0300 Subject: [PATCH 2/3] Fixed compilation error. Signed-off-by: Helber Belmiro --- .../workflow/openapi/WorkflowOpenApiHandlerGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java index 06d572ada9e..315815dde18 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java @@ -88,7 +88,7 @@ private WorkflowHandlerGeneratedFile generateHandler(KogitoBuildContext context, BlockStmt body = executeMethod.createBody(); MethodCallExpr methodCallExpr = new MethodCallExpr(new NameExpr(OPEN_API_REF), m.name()); final NameExpr parameters = new NameExpr(WORK_ITEM_PARAMETERS); - if (m.returnType().name().equals(DotName.createSimple(Response.class))) { + if (m.returnType().name().equals(DotName.createSimple(Response.class.getName()))) { body.addStatement(methodCallExpr).addStatement(new ReturnStmt(new NullLiteralExpr())); } else { body.addStatement(new ReturnStmt(methodCallExpr)); From 55b66e671fd64e8eb5b6f21c912c911917d61eac Mon Sep 17 00:00:00 2001 From: Helber Belmiro Date: Wed, 23 Aug 2023 12:35:29 -0300 Subject: [PATCH 3/3] Removed jetbrains annotation. Signed-off-by: Helber Belmiro --- .../serving/deployment/customfunctions/KnativeTypeHandler.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/quarkus/addons/knative/serving/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/deployment/customfunctions/KnativeTypeHandler.java b/quarkus/addons/knative/serving/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/deployment/customfunctions/KnativeTypeHandler.java index b46269a3871..48784698604 100644 --- a/quarkus/addons/knative/serving/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/deployment/customfunctions/KnativeTypeHandler.java +++ b/quarkus/addons/knative/serving/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/deployment/customfunctions/KnativeTypeHandler.java @@ -23,7 +23,6 @@ import org.jbpm.ruleflow.core.RuleFlowNodeContainerFactory; import org.jbpm.ruleflow.core.factory.NodeFactory; import org.jbpm.ruleflow.core.factory.WorkItemNodeFactory; -import org.jetbrains.annotations.NotNull; import org.kie.kogito.addons.quarkus.knative.serving.customfunctions.CloudEventKnativeParamsDecorator; import org.kie.kogito.addons.quarkus.knative.serving.customfunctions.KnativeWorkItemHandler; import org.kie.kogito.addons.quarkus.knative.serving.customfunctions.Operation; @@ -85,7 +84,6 @@ public class KnativeTypeHandler extends WorkItemTypeHandler { functionRef); } - @NotNull private static List getPayloadFields(FunctionRef functionRef) { List payloadFields = new ArrayList<>();