diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml index 001bec44501..2f75d992e53 100644 --- a/kogito-build/kogito-dependencies-bom/pom.xml +++ b/kogito-build/kogito-dependencies-bom/pom.xml @@ -51,7 +51,7 @@ 2.4.10 1.0.0-preview.20240207 2.0.2 - 2.6.0-lts + 2.7.0-lts 0.3.0 2.4.1 0.2.3 @@ -143,7 +143,7 @@ 3.9.6 2.2.1 - 3.7.1 + 3.13.0 3.2.0 4.0.0-alpha-2 2.1.0 diff --git a/quarkus/bom/pom.xml b/quarkus/bom/pom.xml index b2bdef86e5b..fe3db0e4978 100755 --- a/quarkus/bom/pom.xml +++ b/quarkus/bom/pom.xml @@ -84,6 +84,11 @@ quarkus-openapi-generator-deployment ${version.io.quarkiverse.openapi.generator} + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-oidc + ${version.io.quarkiverse.openapi.generator} + io.quarkiverse.asyncapi quarkus-asyncapi diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties index 24a07fd6c3d..61f30721621 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties @@ -37,7 +37,7 @@ quarkus.kafka.devservices.enabled=false quarkus.kubernetes-client.devservices.enabled=false # OpenApi client properties, see OperationsMockService, which is mocking these two services -quarkus.rest-client.multiplication.cluster1.url=${multiplication-service-mock.url} +quarkus.rest-client."multiplication.cluster1".url=${multiplication-service-mock.url} quarkus.rest-client.subtraction.url=${subtraction-service-mock.url} quarkus.rest-client.petstore_openapi_yaml.url=${petstore-service-mock.url} quarkus.rest-client.array_yaml.url=${array-service-mock.url} @@ -255,4 +255,6 @@ quarkus.http.auth.permission.default.policy=authenticated quarkus.security.users.embedded.enabled=true quarkus.security.users.embedded.plain-text=true -quarkus.security.users.embedded.users.buddy=buddy \ No newline at end of file +quarkus.security.users.embedded.users.buddy=buddy + +quarkus.test.arg-line=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005 \ No newline at end of file diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml index 6626278471a..d45bbd8d550 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml @@ -116,6 +116,10 @@ io.quarkiverse.openapi.generator quarkus-openapi-generator + + io.quarkiverse.openapi.generator + quarkus-openapi-generator-oidc + io.quarkiverse.asyncapi quarkus-asyncapi diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java index 6a021fdaa8c..12fecdfaaeb 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java @@ -18,7 +18,6 @@ */ package org.kie.kogito.serverless.workflow.openapi; -import java.io.IOException; import java.lang.reflect.ParameterizedType; import java.util.Collections; import java.util.Map; @@ -37,7 +36,6 @@ import io.quarkus.restclient.runtime.RestClientBuilderFactory; import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestFilter; public abstract class OpenApiWorkItemHandler extends WorkflowWorkItemHandler { @@ -45,12 +43,8 @@ public abstract class OpenApiWorkItemHandler extends WorkflowWorkItemHandler @Override protected Object internalExecute(KogitoWorkItem workItem, Map parameters) { Class clazz = getRestClass(); - T ref = RestClientBuilderFactory.build(clazz, calculatedConfigKey(workItem, parameters)).register(new ClientRequestFilter() { - @Override - public void filter(ClientRequestContext requestContext) throws IOException { - ProcessMeta.fromKogitoWorkItem(workItem).asMap().forEach((k, v) -> requestContext.getHeaders().put(k, Collections.singletonList(v))); - } - }).build(clazz); + T ref = RestClientBuilderFactory.build(clazz, calculatedConfigKey(workItem)).register( + (ClientRequestFilter) requestContext -> ProcessMeta.fromKogitoWorkItem(workItem).asMap().forEach((k, v) -> requestContext.getHeaders().put(k, Collections.singletonList(v)))).build(clazz); try { return internalExecute(ref, parameters); } catch (WebApplicationException ex) { @@ -58,7 +52,7 @@ public void filter(ClientRequestContext requestContext) throws IOException { } } - private Optional calculatedConfigKey(KogitoWorkItem workItem, Map parameters) { + private Optional calculatedConfigKey(KogitoWorkItem workItem) { String configKeyExpr = (String) workItem.getNodeInstance().getNode().getMetaData().get("configKey"); if (configKeyExpr == null) { return Optional.empty();