This is an automated email from the ASF dual-hosted git repository. mariofusco pushed a commit to branch q3lts in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-examples.git
commit 9f931f75dc3d29f94cf409eeea31c67a4fa15c9d Author: Ricardo Zanini <[email protected]> AuthorDate: Tue Dec 12 10:14:07 2023 -0300 Fix Loanbroker and Onboarding SpringBoot examples for Quarkus 3-LTS (#1840) * Fix Onboarding examples on Fabric8 library Signed-off-by: Ricardo Zanini <[email protected]> * Migrate Loanbroker example to Camel 4.x and CloudEvents to Jakarta Signed-off-by: Ricardo Zanini <[email protected]> --------- Signed-off-by: Ricardo Zanini <[email protected]> --- .../java/org/kie/kogito/examples/BaseWorkItemHandlerConfig.java | 6 +++--- .../kie/kogito/examples/onboarding/DecisionTaskWorkItemHandler.java | 4 ++-- .../org/kie/kogito/examples/onboarding/OnboardingEndpointIT.java | 4 ++-- .../onboarding-springboot/src/test/resources/application.properties | 2 ++ .../serverless-workflow-loanbroker-showcase/aggregator/pom.xml | 2 +- .../java/org/acme/serverless/loanbroker/flow/CreditBureauMock.java | 2 +- .../loanbroker-flow/src/test/resources/application.properties | 6 ++++++ .../serverless-workflow-loanbroker-showcase/loanbroker-ui/pom.xml | 2 +- .../serverless-workflow-loanbroker-showcase/pom.xml | 6 +++--- 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/BaseWorkItemHandlerConfig.java b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/BaseWorkItemHandlerConfig.java index cee65ad40..ab82bcc7c 100644 --- a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/BaseWorkItemHandlerConfig.java +++ b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/BaseWorkItemHandlerConfig.java @@ -25,9 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.inject.Inject; - -import jakarta.annotation.PostConstruct; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.kie.kogito.addons.k8s.Endpoint; import org.kie.kogito.addons.k8s.EndpointQueryKey; @@ -37,6 +34,9 @@ import org.kie.kogito.examples.onboarding.DecisionTaskWorkItemHandler; import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler; import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; + public abstract class BaseWorkItemHandlerConfig extends DefaultWorkItemHandlerConfig { @Inject diff --git a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/onboarding/DecisionTaskWorkItemHandler.java b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/onboarding/DecisionTaskWorkItemHandler.java index 012e7ba9e..25ffb1aa0 100644 --- a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/onboarding/DecisionTaskWorkItemHandler.java +++ b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/main/java/org/kie/kogito/examples/onboarding/DecisionTaskWorkItemHandler.java @@ -20,13 +20,13 @@ package org.kie.kogito.examples.onboarding; import java.util.Map; -import jakarta.ws.rs.HttpMethod; - 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 jakarta.ws.rs.HttpMethod; + public class DecisionTaskWorkItemHandler implements KogitoWorkItemHandler { private QuarkusDiscoveredEndpointCaller endpointCaller; diff --git a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/test/java/org/kie/kogito/examples/onboarding/OnboardingEndpointIT.java b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/test/java/org/kie/kogito/examples/onboarding/OnboardingEndpointIT.java index 63ca9d9aa..d640de590 100644 --- a/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/test/java/org/kie/kogito/examples/onboarding/OnboardingEndpointIT.java +++ b/kogito-quarkus-examples/onboarding-example/onboarding-quarkus/src/test/java/org/kie/kogito/examples/onboarding/OnboardingEndpointIT.java @@ -26,8 +26,6 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import jakarta.inject.Inject; - import org.junit.jupiter.api.Test; import org.kie.kogito.examples.test.RecordedOutputWorkItemHandler; import org.kie.kogito.internal.process.runtime.KogitoWorkItem; @@ -40,6 +38,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; +import jakarta.inject.Inject; + import static io.restassured.RestAssured.given; import static org.hamcrest.core.Is.is; diff --git a/kogito-springboot-examples/onboarding-springboot/src/test/resources/application.properties b/kogito-springboot-examples/onboarding-springboot/src/test/resources/application.properties index cdd3d4349..dd21c89b8 100644 --- a/kogito-springboot-examples/onboarding-springboot/src/test/resources/application.properties +++ b/kogito-springboot-examples/onboarding-springboot/src/test/resources/application.properties @@ -19,3 +19,5 @@ server.port=8080 org.acme.kogito.onboarding.local=true +spring.main.cloud-platform=KUBERNETES +spring.cloud.bootstrap.enabled=true \ No newline at end of file diff --git a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/aggregator/pom.xml b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/aggregator/pom.xml index 9be66c7b6..f86634e06 100644 --- a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/aggregator/pom.xml +++ b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/aggregator/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-http-restful-ws</artifactId> + <artifactId>cloudevents-http-restful-ws-jakarta</artifactId> <version>${version.io.cloudevents}</version> </dependency> <dependency> diff --git a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/java/org/acme/serverless/loanbroker/flow/CreditBureauMock.java b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/java/org/acme/serverless/loanbroker/flow/CreditBureauMock.java index b5d9cfe60..43a6d1a8d 100644 --- a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/java/org/acme/serverless/loanbroker/flow/CreditBureauMock.java +++ b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/java/org/acme/serverless/loanbroker/flow/CreditBureauMock.java @@ -43,7 +43,7 @@ public class CreditBureauMock implements QuarkusTestResourceLifecycleManager { wireMockServer.stubFor(get(urlPathMatching("/*")) .willReturn(aResponse() .withHeader("Content-Type", MediaType.APPLICATION_JSON) - .withBody("{ \"SSN\":\"123-45-6789\",\"score\":470,\"history\":4}}") + .withBody("{ \"SSN\":\"123-45-6789\",\"score\":470,\"history\":4 }") .withStatus(200))); // inject the endpoint to the generated RESTClient Stub diff --git a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/resources/application.properties b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/resources/application.properties index a6f411ba5..2cbd4686e 100644 --- a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/resources/application.properties +++ b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-flow/src/test/resources/application.properties @@ -18,3 +18,9 @@ # quarkus.http.test-port=0 + +# Act as a placeholder to avoid triggering Kubernetes Service Discovery during test runs +# The actual URLs are set by the Quarkus Test Runner +quarkus.knative.env.vars.kogito_service_cluster_url=http://localhost:8080 +quarkus.knative.env.vars.credit_bureau_url=http://localhost:8080 +quarkus.knative.env.vars.aggregator_url=http://localhost:8080 diff --git a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-ui/pom.xml b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-ui/pom.xml index cdd71c0cb..896bbf7c1 100644 --- a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-ui/pom.xml +++ b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/loanbroker-ui/pom.xml @@ -81,7 +81,7 @@ </dependency> <dependency> <groupId>io.cloudevents</groupId> - <artifactId>cloudevents-http-restful-ws</artifactId> + <artifactId>cloudevents-http-restful-ws-jakarta</artifactId> <version>${version.io.cloudevents}</version> </dependency> <dependency> diff --git a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/pom.xml b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/pom.xml index 15cbe74b7..b9a4632a4 100644 --- a/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/pom.xml +++ b/serverless-workflow-examples/serverless-workflow-loanbroker-showcase/pom.xml @@ -45,10 +45,10 @@ <version.com.github.tomakehurst>2.33.2</version.com.github.tomakehurst> <version.org.testcontainers>1.17.3</version.org.testcontainers> - <version.io.cloudevents>2.3.0</version.io.cloudevents> - <!-- See: https://camel.apache.org/camel-quarkus/2.14.x/index.html --> + <version.io.cloudevents>2.5.0</version.io.cloudevents> + <!-- See: https://camel.apache.org/categories/Camel-Quarkus/ --> <!-- Aligned with Quarkus. We don't use the Camel Quarkus platform BOM to avoid upgrade delays in our CI. Feel free to use the BOM in your projects, though --> - <version.org.apache.camel.quarkus>3.0.0-M1</version.org.apache.camel.quarkus> + <version.org.apache.camel.quarkus>3.2.3</version.org.apache.camel.quarkus> <version.surefire.plugin>3.0.0-M7</version.surefire.plugin> <version.compiler.plugin>3.8.1</version.compiler.plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
