From 0df7cb984245a1cd5653474ccae31f744f578f06 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Thu, 7 Nov 2024 12:46:24 +0530 Subject: [PATCH 1/9] Upgrade quarkus to 3.15 --- .../pom.xml | 4 ++++ .../pom.xml | 4 ++++ .../pom.xml | 4 ++++ .../pom.xml | 4 ++++ .../pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 8 ++++++++ .../runtime/pom.xml | 3 +++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../kogito-addons-quarkus-data-index-jpa/runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../integration-tests-sw/pom.xml | 4 ++++ .../runtime/pom.xml | 3 +++ .../jobs-recipients/job-http-recipient/deployment/pom.xml | 3 +++ .../jobs-recipients/job-http-recipient/runtime/pom.xml | 3 +++ .../jobs-recipients/job-sink-recipient/deployment/pom.xml | 3 +++ .../jobs-recipients/job-sink-recipient/runtime/pom.xml | 3 +++ .../deployment/pom.xml | 3 +++ .../runtime/pom.xml | 3 +++ kogito-apps-build-parent/pom.xml | 2 +- .../protobuf/domain/ProtoDomainModelProducer.java | 8 ++++++-- 42 files changed, 145 insertions(+), 3 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml index 222cfc2a72..75608e5d17 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus-devservice/pom.xml @@ -49,6 +49,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie.kogito kogito-quarkus-test-utils diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml index d244649644..052e20507f 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml @@ -50,6 +50,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kie-addons-quarkus-messaging diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml index e105b0f06a..bf36b0b348 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml @@ -49,6 +49,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie.kogito integration-tests-jobs-service-common diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml index 6cccd4aa7a..d096153c0a 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml @@ -49,6 +49,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kie-addons-quarkus-messaging diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml index fba2a2c5f1..ab48c6c519 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml @@ -53,6 +53,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kie-addons-quarkus-events-process diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml index d375851b4f..62a6c18019 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/pom.xml @@ -93,6 +93,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml index 6542f22985..6f9fe69514 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/deployment/pom.xml @@ -59,6 +59,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml index 2f9208cdc7..ed09689634 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kogito-addons-quarkus-data-index-persistence-infinispan diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml index f39cf266ce..d2864f4f70 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml @@ -74,6 +74,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml index f73c7e0344..548cefa975 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml @@ -63,6 +63,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml index d231cf9861..a534484748 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kogito-addons-quarkus-data-index-persistence-jpa diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/runtime/pom.xml index d5e883a863..c195ccaab1 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/runtime/pom.xml @@ -74,6 +74,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml index 121176e1fd..3ea196ae5b 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/deployment/pom.xml @@ -55,6 +55,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml index 077c266e2f..f1b74fd8b3 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kie-addons-quarkus-persistence-mongodb diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml index bbcd412d64..b9f60a2d57 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml @@ -70,6 +70,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml index dd2bfc35f9..71565c6e41 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/deployment/pom.xml @@ -67,6 +67,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml index 9f9152068d..a75ea37d00 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kogito-addons-quarkus-data-index-persistence-postgresql @@ -63,6 +67,10 @@ io.quarkus quarkus-jdbc-postgresql + + org.flywaydb + flyway-database-postgresql + org.kie.kogito data-index-test-utils diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml index 2610ca4376..4d3745427d 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/runtime/pom.xml @@ -78,6 +78,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml index 5d51ababa0..15ca92f227 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/pom.xml @@ -60,6 +60,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml index 51a2f3cd25..8d0c0c4996 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/deployment/pom.xml @@ -63,6 +63,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml index a0ac7ca881..456431a17e 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kogito-addons-quarkus-data-index-infinispan diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml index ba9cde99c7..8bf66d17ad 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml @@ -70,6 +70,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml index 1f46d877cd..672d8202cd 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml @@ -88,6 +88,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml index 58f4b1bdf7..0c0c1b0472 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kogito-addons-quarkus-data-index-inmemory diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml index 039e2dad86..4a8d43345f 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml @@ -82,6 +82,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/deployment/pom.xml index 9b04a7dcd6..f3970b9647 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/deployment/pom.xml @@ -76,6 +76,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml index 990859cdff..7174ca6e1d 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kogito-addons-quarkus-data-index-jpa diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/runtime/pom.xml index 5a9e0e2289..ee1debe833 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/runtime/pom.xml @@ -74,6 +74,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml index e9bf591d49..c5003c3a07 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/deployment/pom.xml @@ -63,6 +63,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml index 1327894771..4fde1ab1a3 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kie-addons-quarkus-persistence-mongodb diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml index a5666405d7..7d543de52c 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml @@ -74,6 +74,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml index 434a514962..c1b4ea0da3 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/deployment/pom.xml @@ -80,6 +80,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml index 6472e11164..c03ec5bd2a 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml @@ -43,6 +43,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-resteasy-client-oidc-filter + org.kie kogito-addons-quarkus-data-index-postgresql diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml index 0de5aa77c8..94c8d6d298 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml @@ -74,6 +74,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml index 9d66b1c5d7..d9c6671030 100644 --- a/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml +++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/pom.xml @@ -87,6 +87,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml index 1605df80c0..60604380a5 100644 --- a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml +++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml @@ -111,6 +111,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml index be9e71b4c6..5b9ef785f9 100644 --- a/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml +++ b/jobs-service/jobs-recipients/job-sink-recipient/deployment/pom.xml @@ -79,6 +79,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml index 79a7ddc30b..df276c7790 100644 --- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml +++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml @@ -117,6 +117,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml index 705ac833e2..2e5e294599 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml @@ -147,6 +147,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml index d791c29d9a..0aa04b332d 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml @@ -138,6 +138,9 @@ ${version.io.quarkus} + + -AlegacyConfigRoot=true + diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml index daec939b27..ccc5cf6150 100644 --- a/kogito-apps-build-parent/pom.xml +++ b/kogito-apps-build-parent/pom.xml @@ -62,7 +62,7 @@ ${project.version} - 6.4.8.Final + 6.6.0.Final 2.3.2 1.10.0 2.2.0 diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java index e637f10232..04b06b1d6e 100644 --- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java +++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java @@ -25,6 +25,7 @@ import org.infinispan.protostream.descriptors.Descriptor; import org.infinispan.protostream.descriptors.FieldDescriptor; import org.infinispan.protostream.descriptors.FileDescriptor; +import org.infinispan.protostream.descriptors.Option; import org.infinispan.protostream.impl.AnnotatedDescriptorImpl; import org.kie.kogito.persistence.api.proto.AttributeDescriptor; import org.kie.kogito.persistence.api.proto.DomainDescriptor; @@ -101,8 +102,11 @@ public String apply(FieldDescriptor fd) { case BOOLEAN: return Boolean.class.getName(); case MESSAGE: - if (fd.getOption("kogito_java_class") != null) { - return fd.getOption("kogito_java_class").getValue().toString(); + Option option = fd.getOptions().stream() + .filter(o -> "kogito_java_class".equals(o.getName())) + .findAny().orElse(null); + if (option != null) { + return option.getValue().toString(); } return fd.getMessageType().getFullName(); default: From 84754e42be5e37873d0a3fbe3939220b8f50395b Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Fri, 29 Nov 2024 18:03:56 +0530 Subject: [PATCH 2/9] Add quarkus test profiles for h2 and PostgresSql --- .../data-index-service-infinispan/pom.xml | 4 ++ jobs-service/jobs-service-storage-jpa/pom.xml | 5 ++ .../profiles/H2QuarkusTestProfile.java | 30 +++++++++++ .../PostgreSQLQuarkusTestProfile.java | 30 +++++++++++ ...veJobServiceManagementRepositoryTest.java} | 32 +----------- ...va => H2JPAReactiveJobRepositoryTest.java} | 7 ++- ...iveJobServiceManagementRepositoryTest.java | 33 ++++++++++++ ...stgresSqlJPAReactiveJobRepositoryTest.java | 51 +++++++++++++++++++ ...iveJobServiceManagementRepositoryTest.java | 33 ++++++++++++ .../service/resource/JPAJobResourceTest.java | 6 ++- .../src/test/resources/application.properties | 10 ++-- .../persistence-commons-infinispan/pom.xml | 4 ++ .../protobuf/ProtobufServiceTest.java | 2 +- 13 files changed, 208 insertions(+), 39 deletions(-) create mode 100644 jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/H2QuarkusTestProfile.java create mode 100644 jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/PostgreSQLQuarkusTestProfile.java rename jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/{JPAReactiveJobServiceManagementRepositoryTest.java => BaseJPAReactiveJobServiceManagementRepositoryTest.java} (74%) rename jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/{JPAReactiveJobRepositoryTest.java => H2JPAReactiveJobRepositoryTest.java} (82%) create mode 100644 jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/H2JPAReactiveJobServiceManagementRepositoryTest.java create mode 100644 jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobRepositoryTest.java create mode 100644 jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobServiceManagementRepositoryTest.java diff --git a/data-index/data-index-service/data-index-service-infinispan/pom.xml b/data-index/data-index-service/data-index-service-infinispan/pom.xml index 375cdf8cc1..684f54cba8 100644 --- a/data-index/data-index-service/data-index-service-infinispan/pom.xml +++ b/data-index/data-index-service/data-index-service-infinispan/pom.xml @@ -96,6 +96,10 @@ json-unit-assertj test + + org.infinispan + infinispan-client-hotrod + org.kie.kogito kogito-quarkus-test-utils diff --git a/jobs-service/jobs-service-storage-jpa/pom.xml b/jobs-service/jobs-service-storage-jpa/pom.xml index 99de150744..4e1594188e 100644 --- a/jobs-service/jobs-service-storage-jpa/pom.xml +++ b/jobs-service/jobs-service-storage-jpa/pom.xml @@ -78,6 +78,11 @@ quarkus-test-h2 test + + io.quarkus + quarkus-jdbc-postgresql + test + org.kie.kogito kogito-quarkus-test-utils diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/H2QuarkusTestProfile.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/H2QuarkusTestProfile.java new file mode 100644 index 0000000000..9b5c1296fe --- /dev/null +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/H2QuarkusTestProfile.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.kie.kogito.jobs.service.profiles; + +import io.quarkus.test.junit.QuarkusTestProfile; + +public class H2QuarkusTestProfile implements QuarkusTestProfile { + + @Override + public String getConfigProfile() { + return "test-h2"; + } +} diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/PostgreSQLQuarkusTestProfile.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/PostgreSQLQuarkusTestProfile.java new file mode 100644 index 0000000000..4301d1322c --- /dev/null +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/profiles/PostgreSQLQuarkusTestProfile.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.kie.kogito.jobs.service.profiles; + +import io.quarkus.test.junit.QuarkusTestProfile; + +public class PostgreSQLQuarkusTestProfile implements QuarkusTestProfile { + + @Override + public String getConfigProfile() { + return "test-postgresql"; + } +} diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/JPAReactiveJobServiceManagementRepositoryTest.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/BaseJPAReactiveJobServiceManagementRepositoryTest.java similarity index 74% rename from jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/JPAReactiveJobServiceManagementRepositoryTest.java rename to jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/BaseJPAReactiveJobServiceManagementRepositoryTest.java index 4ca80a3df7..8cb774ef2a 100644 --- a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/JPAReactiveJobServiceManagementRepositoryTest.java +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/BaseJPAReactiveJobServiceManagementRepositoryTest.java @@ -1,51 +1,21 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ package org.kie.kogito.jobs.service.repository.jpa; import java.time.OffsetDateTime; import java.util.concurrent.atomic.AtomicReference; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kie.kogito.jobs.service.model.JobServiceManagementInfo; import org.kie.kogito.jobs.service.repository.JobServiceManagementRepository; import org.kie.kogito.jobs.service.utils.DateUtil; -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.h2.H2DatabaseTestResource; -import io.quarkus.test.junit.QuarkusTest; - import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; -@QuarkusTest -@QuarkusTestResource(H2DatabaseTestResource.class) -class JPAReactiveJobServiceManagementRepositoryTest { - +public abstract class BaseJPAReactiveJobServiceManagementRepositoryTest { @Inject JobServiceManagementRepository tested; - @BeforeEach - void setUp() { - } - @Test void testGetAndUpdate() { String id = "instance-id-1"; diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/JPAReactiveJobRepositoryTest.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/H2JPAReactiveJobRepositoryTest.java similarity index 82% rename from jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/JPAReactiveJobRepositoryTest.java rename to jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/H2JPAReactiveJobRepositoryTest.java index d1fe3cafee..ceefab3aa0 100644 --- a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/JPAReactiveJobRepositoryTest.java +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/H2JPAReactiveJobRepositoryTest.java @@ -19,18 +19,21 @@ package org.kie.kogito.jobs.service.repository.jpa; import org.junit.jupiter.api.BeforeEach; +import org.kie.kogito.jobs.service.profiles.H2QuarkusTestProfile; import org.kie.kogito.jobs.service.repository.ReactiveJobRepository; import org.kie.kogito.jobs.service.repository.impl.BaseJobRepositoryTest; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.h2.H2DatabaseTestResource; import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; import jakarta.inject.Inject; @QuarkusTest -@QuarkusTestResource(H2DatabaseTestResource.class) -public class JPAReactiveJobRepositoryTest extends BaseJobRepositoryTest { +@QuarkusTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = true) +@TestProfile(H2QuarkusTestProfile.class) +public class H2JPAReactiveJobRepositoryTest extends BaseJobRepositoryTest { @Inject JPAReactiveJobRepository tested; diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/H2JPAReactiveJobServiceManagementRepositoryTest.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/H2JPAReactiveJobServiceManagementRepositoryTest.java new file mode 100644 index 0000000000..3a6fd1dd32 --- /dev/null +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/H2JPAReactiveJobServiceManagementRepositoryTest.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.kogito.jobs.service.repository.jpa; + +import org.kie.kogito.jobs.service.profiles.H2QuarkusTestProfile; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.h2.H2DatabaseTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; + +@QuarkusTest +@QuarkusTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = true) +@TestProfile(H2QuarkusTestProfile.class) +class H2JPAReactiveJobServiceManagementRepositoryTest extends BaseJPAReactiveJobServiceManagementRepositoryTest { + +} diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobRepositoryTest.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobRepositoryTest.java new file mode 100644 index 0000000000..e83abe5ac0 --- /dev/null +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobRepositoryTest.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.kogito.jobs.service.repository.jpa; + +import org.junit.jupiter.api.BeforeEach; +import org.kie.kogito.jobs.service.profiles.PostgreSQLQuarkusTestProfile; +import org.kie.kogito.jobs.service.repository.ReactiveJobRepository; +import org.kie.kogito.jobs.service.repository.impl.BaseJobRepositoryTest; +import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; + +import jakarta.inject.Inject; + +@QuarkusTest +@QuarkusTestResource(value = PostgreSqlQuarkusTestResource.class, restrictToAnnotatedClass = true) +@TestProfile(PostgreSQLQuarkusTestProfile.class) +public class PostgresSqlJPAReactiveJobRepositoryTest extends BaseJobRepositoryTest { + + @Inject + JPAReactiveJobRepository tested; + + @BeforeEach + public void setUp() throws Exception { + + super.setUp(); + } + + @Override + public ReactiveJobRepository tested() { + return tested; + } +} diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobServiceManagementRepositoryTest.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobServiceManagementRepositoryTest.java new file mode 100644 index 0000000000..a28de96cd7 --- /dev/null +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/PostgresSqlJPAReactiveJobServiceManagementRepositoryTest.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.kie.kogito.jobs.service.repository.jpa; + +import org.kie.kogito.jobs.service.profiles.PostgreSQLQuarkusTestProfile; +import org.kie.kogito.testcontainers.quarkus.PostgreSqlQuarkusTestResource; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; + +@QuarkusTest +@QuarkusTestResource(value = PostgreSqlQuarkusTestResource.class, restrictToAnnotatedClass = true) +@TestProfile(PostgreSQLQuarkusTestProfile.class) +class PostgresSqlJPAReactiveJobServiceManagementRepositoryTest extends BaseJPAReactiveJobServiceManagementRepositoryTest { + +} diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/resource/JPAJobResourceTest.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/resource/JPAJobResourceTest.java index 0fdc67d712..dd374d1a08 100644 --- a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/resource/JPAJobResourceTest.java +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/resource/JPAJobResourceTest.java @@ -18,12 +18,16 @@ */ package org.kie.kogito.jobs.service.resource; +import org.kie.kogito.jobs.service.profiles.H2QuarkusTestProfile; + import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.h2.H2DatabaseTestResource; import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; @QuarkusTest -@QuarkusTestResource(H2DatabaseTestResource.class) +@QuarkusTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = true) +@TestProfile(H2QuarkusTestProfile.class) public class JPAJobResourceTest extends BaseJobResourceTest { } diff --git a/jobs-service/jobs-service-storage-jpa/src/test/resources/application.properties b/jobs-service/jobs-service-storage-jpa/src/test/resources/application.properties index 2098cb5581..2ea054d823 100644 --- a/jobs-service/jobs-service-storage-jpa/src/test/resources/application.properties +++ b/jobs-service/jobs-service-storage-jpa/src/test/resources/application.properties @@ -19,12 +19,14 @@ # Kogito kogito.apps.persistence.type=jdbc # Data source -quarkus.datasource.db-kind=h2 -quarkus.datasource.username=kogito -quarkus.datasource.jdbc.url=jdbc:h2:mem:default;NON_KEYWORDS=VALUE,KEY +%test-h2.quarkus.datasource.db-kind=h2 +%test-h2.quarkus.datasource.username=kogito +%test-h2.quarkus.datasource.jdbc.url=jdbc:h2:mem:default;NON_KEYWORDS=VALUE,KEY +%test-postgresql.quarkus.datasource.db-kind=postgresql +%test-postgresql.quarkus.datasource.devservices.enabled=false kie.flyway.enabled=true # Disabling Security for tests quarkus.oidc.enabled=false quarkus.oidc.tenant-enabled=false quarkus.oidc.auth-server-url=none -quarkus.keycloak.devservices.enabled=false \ No newline at end of file +quarkus.keycloak.devservices.enabled=false diff --git a/persistence-commons/persistence-commons-infinispan/pom.xml b/persistence-commons/persistence-commons-infinispan/pom.xml index 51f921248e..a08482d6f0 100644 --- a/persistence-commons/persistence-commons-infinispan/pom.xml +++ b/persistence-commons/persistence-commons-infinispan/pom.xml @@ -49,6 +49,10 @@ io.quarkus quarkus-infinispan-client + + org.infinispan + infinispan-client-hotrod + diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java index 6cd674fd3b..daf3a1130d 100644 --- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java +++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java @@ -95,7 +95,7 @@ void registerProtoBufferTypeWithInvalidKogitoDescriptors() { exceptionMessage = e.getMessage(); } - assertTrue(exceptionMessage.contains("java.lang.IllegalStateException")); + assertTrue(exceptionMessage.contains("Syntax error in test")); verify(schemaEvent, never()).fire(any(SchemaRegisteredEvent.class)); verify(domainModelEvent, never()).fire(any(FileDescriptorRegisteredEvent.class)); From 5463fb71a36647774344c8c53df02fa58e7224d8 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Tue, 7 Jan 2025 11:04:57 +0530 Subject: [PATCH 3/9] Fix test failure --- .../kogito/index/service/AbstractDomainIndexingServiceIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java index 6eb3eb4b9c..586a723754 100644 --- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java +++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java @@ -88,7 +88,7 @@ void testAddBrokenProtoFile() { fail("Registering broken proto file should fail"); } catch (Exception ex) { assertThat(ex.getMessage()) - .isEqualTo("Failed to resolve type of field \"org.demo.travels.traveller\". Type not found : stringa"); + .isEqualTo("Failed to resolve type of field \"org.demo.travels.traveller\" in \"domainModel\". Type not found : stringa"); } } From aca491aea26e263f1dd9430e9aa9f2bb6aae034f Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Fri, 10 Jan 2025 13:41:01 +0530 Subject: [PATCH 4/9] Fix test failure- Unrestricted schema compatibility checks Fix test failure- Schema compatibility changes ISPN-15974 Fix test failure- Schema compatibility changes ISPN-15974 --- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../data-index-service-common/pom.xml | 4 +- .../AbstractDomainIndexingServiceIT.java | 56 ---------------- .../data-index-service-infinispan/pom.xml | 2 +- .../src/main/docker/docker-compose.yml | 2 +- .../src/test/docker/docker-compose.yml | 2 +- .../InfinispanDomainIndexingServiceIT.java | 67 +++++++++++++++++++ .../data-index-service-mongodb/pom.xml | 2 +- .../service/MongoDomainIndexingServiceIT.java | 60 +++++++++++++++++ .../data-index-service-postgresql/pom.xml | 2 +- .../explainability-service-messaging/pom.xml | 2 +- .../jobs-service-messaging-kafka/pom.xml | 2 +- .../trusty-service-common/pom.xml | 2 +- 16 files changed, 141 insertions(+), 70 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml index ad1b65312d..7eb024d549 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml @@ -59,7 +59,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkiverse.reactivemessaging.http diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml index 052e20507f..572713f618 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml @@ -60,7 +60,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka org.kie.kogito diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml index d096153c0a..c873c7fbce 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml @@ -59,7 +59,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka org.kie.kogito diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml index ab48c6c519..bb0e24b2c4 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml @@ -67,7 +67,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka diff --git a/data-index/data-index-service/data-index-service-common/pom.xml b/data-index/data-index-service/data-index-service-common/pom.xml index 7b8d09c534..8c2665671f 100644 --- a/data-index/data-index-service/data-index-service-common/pom.xml +++ b/data-index/data-index-service/data-index-service-common/pom.xml @@ -89,7 +89,7 @@ io.quarkus - quarkus-rest-client-reactive-jackson + quarkus-rest-client-jackson org.kie.kogito @@ -101,7 +101,7 @@ io.quarkus - quarkus-rest-client-reactive + quarkus-rest-client io.cloudevents diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java index 586a723754..1f3b101aca 100644 --- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java +++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java @@ -136,30 +136,6 @@ void testProtoWithoutSortingAttribute() throws Exception { .then().log().ifValidationFails().statusCode(200).body("data.Books", isA(Collection.class)); } - @Test - //Reproducer for KOGITO-172 - void testAddProtoFileTwice() throws Exception { - protobufService.registerProtoBufferType(getProtoBufferFileV1()); - given().contentType(ContentType.JSON) - .body("{ \"query\" : \"{Game{ player, id, name, metadata { processInstances { id } } } }\" }") - .when().post("/graphql") - .then().log().ifValidationFails().statusCode(200).body("data.Game", isA(Collection.class)); - given().contentType(ContentType.JSON) - .body("{ \"query\" : \"{ProcessInstances{ id, processId, rootProcessId, rootProcessInstanceId, parentProcessInstanceId } }\" }") - .when().post("/graphql") - .then().log().ifValidationFails().statusCode(200).body("data.ProcessInstances", isA(Collection.class)); - - protobufService.registerProtoBufferType(getProtoBufferFileV2()); - given().contentType(ContentType.JSON) - .body("{ \"query\" : \"{Game{ id, name, company, metadata { processInstances { id } } } }\" }") - .when().post("/graphql") - .then().log().ifValidationFails().statusCode(200).body("data.Game", isA(Collection.class)); - given().contentType(ContentType.JSON) - .body("{ \"query\" : \"{ProcessInstances{ id, processId, rootProcessId, rootProcessInstanceId, parentProcessInstanceId } }\" }") - .when().post("/graphql") - .then().log().ifValidationFails().statusCode(200).body("data.ProcessInstances", isA(Collection.class)); - } - @Test void testAddProtoFile() throws Exception { String processId = "travels"; @@ -779,38 +755,6 @@ private String getBrokenProtoBufferFile() { "\n"; } - private String getProtoBufferFileV1() { - return "package org.demo;\n" + - "import \"kogito-index.proto\";\n" + - "option kogito_model=\"Game\";\n" + - "option kogito_id=\"game\";\n" + - "/* @Indexed */\n" + - "message Game {\n" + - " optional string player = 1;\n" + - " /* @Field(index = Index.YES, store = Store.YES) @SortableField */\n" + - " optional string id = 2;\n" + - " optional string name = 3;\n" + - " optional org.kie.kogito.index.model.KogitoMetadata metadata = 4;\n" + - "}\n" + - "\n"; - } - - private String getProtoBufferFileV2() { - return "package org.demo;\n" + - "import \"kogito-index.proto\";\n" + - "option kogito_model=\"Game\";\n" + - "option kogito_id=\"game\";\n" + - "/* @Indexed */\n" + - "message Game {\n" + - " /* @Field(index = Index.YES, store = Store.YES) @SortableField */\n" + - " optional string id = 1;\n" + - " optional string name = 2;\n" + - " optional string company = 3;\n" + - " optional org.kie.kogito.index.model.KogitoMetadata metadata = 4;\n" + - "}\n" + - "\n"; - } - protected abstract String getProcessProtobufFileContent() throws Exception; protected abstract String getUserTaskProtobufFileContent() throws Exception; diff --git a/data-index/data-index-service/data-index-service-infinispan/pom.xml b/data-index/data-index-service/data-index-service-infinispan/pom.xml index 684f54cba8..a1736a0a4c 100644 --- a/data-index/data-index-service/data-index-service-infinispan/pom.xml +++ b/data-index/data-index-service/data-index-service-infinispan/pom.xml @@ -47,7 +47,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml index f66d29a002..4555200bde 100644 --- a/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml +++ b/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml @@ -22,7 +22,7 @@ version: '2.1' services: infinispan: - image: infinispan/server:14.0.4.Final + image: infinispan/server:15.0.8.Final container_name: infinispan ports: - 11222:11222 diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml index c1f396b628..426caf7a17 100644 --- a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml +++ b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml @@ -55,7 +55,7 @@ services: LOG_DIR: "/tmp/logs" infinispan: - image: infinispan/server:14.0.4.Final + image: infinispan/server:15.0.8.Final container_name: data-index-infinispan ports: - "11222:11222" diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java index 72980a8fcf..c2cd591628 100644 --- a/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java +++ b/data-index/data-index-service/data-index-service-infinispan/src/test/java/org/kie/kogito/index/service/InfinispanDomainIndexingServiceIT.java @@ -18,16 +18,30 @@ */ package org.kie.kogito.index.service; +import java.util.Collection; + +import org.junit.jupiter.api.Test; import org.kie.kogito.index.service.test.InMemoryMessageTestProfile; import org.kie.kogito.index.test.TestUtils; +import org.kie.kogito.persistence.protobuf.ProtobufService; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; +import io.restassured.http.ContentType; + +import jakarta.inject.Inject; + +import static io.restassured.RestAssured.given; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.isA; @QuarkusTest @TestProfile(InMemoryMessageTestProfile.class) class InfinispanDomainIndexingServiceIT extends AbstractDomainIndexingServiceIT { + @Inject + ProtobufService protobufService; + @Override protected String getProcessProtobufFileContent() throws Exception { return TestUtils.getTravelsProtoBufferFile(); @@ -37,4 +51,57 @@ protected String getProcessProtobufFileContent() throws Exception { protected String getUserTaskProtobufFileContent() throws Exception { return TestUtils.getDealsProtoBufferFile(); } + + @Test + // Schema compatibility checks introduced in ISPN-15974 + void testAddProtoFileTwice() throws Exception { + protobufService.registerProtoBufferType(getProtoBufferFileV1()); + given().contentType(ContentType.JSON) + .body("{ \"query\" : \"{Game{ player, id, name, metadata { processInstances { id } } } }\" }") + .when().post("/graphql") + .then().log().ifValidationFails().statusCode(200).body("data.Game", isA(Collection.class)); + given().contentType(ContentType.JSON) + .body("{ \"query\" : \"{ProcessInstances{ id, processId, rootProcessId, rootProcessInstanceId, parentProcessInstanceId } }\" }") + .when().post("/graphql") + .then().log().ifValidationFails().statusCode(200).body("data.ProcessInstances", isA(Collection.class)); + + try { + protobufService.registerProtoBufferType(getProtoBufferFileV2()); + } catch (Exception ex) { + assertThat(ex.getMessage()) + .contains("Incompatible schema changes"); + } + } + + private String getProtoBufferFileV1() { + return "package org.demo;\n" + + "import \"kogito-index.proto\";\n" + + "option kogito_model=\"Game\";\n" + + "option kogito_id=\"game\";\n" + + "/* @Indexed */\n" + + "message Game {\n" + + " optional string player = 1;\n" + + " /* @Field(index = Index.YES, store = Store.YES) @SortableField */\n" + + " optional string id = 2;\n" + + " optional string name = 3;\n" + + " optional org.kie.kogito.index.model.KogitoMetadata metadata = 4;\n" + + "}\n" + + "\n"; + } + + private String getProtoBufferFileV2() { + return "package org.demo;\n" + + "import \"kogito-index.proto\";\n" + + "option kogito_model=\"Game\";\n" + + "option kogito_id=\"game\";\n" + + "/* @Indexed */\n" + + "message Game {\n" + + " /* @Field(index = Index.YES, store = Store.YES) @SortableField */\n" + + " optional string id = 1;\n" + + " optional string name = 2;\n" + + " optional string company = 3;\n" + + " optional org.kie.kogito.index.model.KogitoMetadata metadata = 4;\n" + + "}\n" + + "\n"; + } } diff --git a/data-index/data-index-service/data-index-service-mongodb/pom.xml b/data-index/data-index-service/data-index-service-mongodb/pom.xml index 7c2ead3652..454050a56a 100644 --- a/data-index/data-index-service/data-index-service-mongodb/pom.xml +++ b/data-index/data-index-service/data-index-service-mongodb/pom.xml @@ -47,7 +47,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java index d03507570f..3eec6c1834 100644 --- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java +++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java @@ -18,12 +18,19 @@ */ package org.kie.kogito.index.service; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.Test; import org.kie.kogito.index.service.test.InMemoryMessageTestProfile; import org.kie.kogito.index.test.TestUtils; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; +import java.util.Collection; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.isA; + @QuarkusTest @TestProfile(InMemoryMessageTestProfile.class) class MongoDomainIndexingServiceIT extends AbstractDomainIndexingServiceIT { @@ -37,4 +44,57 @@ protected String getProcessProtobufFileContent() throws Exception { protected String getUserTaskProtobufFileContent() throws Exception { return TestUtils.readFileContent("deals-mongo.proto"); } + @Test + void testAddProtoFileTwice() throws Exception { + protobufService.registerProtoBufferType(getProtoBufferFileV1()); + given().contentType(ContentType.JSON) + .body("{ \"query\" : \"{Game{ player, id, name, metadata { processInstances { id } } } }\" }") + .when().post("/graphql") + .then().log().ifValidationFails().statusCode(200).body("data.Game", isA(Collection.class)); + given().contentType(ContentType.JSON) + .body("{ \"query\" : \"{ProcessInstances{ id, processId, rootProcessId, rootProcessInstanceId, parentProcessInstanceId } }\" }") + .when().post("/graphql") + .then().log().ifValidationFails().statusCode(200).body("data.ProcessInstances", isA(Collection.class)); + + protobufService.registerProtoBufferType(getProtoBufferFileV2()); + given().contentType(ContentType.JSON) + .body("{ \"query\" : \"{Game{ id, name, company, metadata { processInstances { id } } } }\" }") + .when().post("/graphql") + .then().log().ifValidationFails().statusCode(200).body("data.Game", isA(Collection.class)); + given().contentType(ContentType.JSON) + .body("{ \"query\" : \"{ProcessInstances{ id, processId, rootProcessId, rootProcessInstanceId, parentProcessInstanceId } }\" }") + .when().post("/graphql") + .then().log().ifValidationFails().statusCode(200).body("data.ProcessInstances", isA(Collection.class)); + } + private String getProtoBufferFileV1() { + return "package org.demo;\n" + + "import \"kogito-index.proto\";\n" + + "option kogito_model=\"Game\";\n" + + "option kogito_id=\"game\";\n" + + "/* @Indexed */\n" + + "message Game {\n" + + " optional string player = 1;\n" + + " /* @Field(index = Index.YES, store = Store.YES) @SortableField */\n" + + " optional string id = 2;\n" + + " optional string name = 3;\n" + + " optional org.kie.kogito.index.model.KogitoMetadata metadata = 4;\n" + + "}\n" + + "\n"; + } + + private String getProtoBufferFileV2() { + return "package org.demo;\n" + + "import \"kogito-index.proto\";\n" + + "option kogito_model=\"Game\";\n" + + "option kogito_id=\"game\";\n" + + "/* @Indexed */\n" + + "message Game {\n" + + " /* @Field(index = Index.YES, store = Store.YES) @SortableField */\n" + + " optional string id = 1;\n" + + " optional string name = 2;\n" + + " optional string company = 3;\n" + + " optional org.kie.kogito.index.model.KogitoMetadata metadata = 4;\n" + + "}\n" + + "\n"; + } } diff --git a/data-index/data-index-service/data-index-service-postgresql/pom.xml b/data-index/data-index-service/data-index-service-postgresql/pom.xml index 43f999c6fa..b048156cc3 100644 --- a/data-index/data-index-service/data-index-service-postgresql/pom.xml +++ b/data-index/data-index-service/data-index-service-postgresql/pom.xml @@ -47,7 +47,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/explainability/explainability-service-messaging/pom.xml b/explainability/explainability-service-messaging/pom.xml index c586ccd9dc..8615b69205 100644 --- a/explainability/explainability-service-messaging/pom.xml +++ b/explainability/explainability-service-messaging/pom.xml @@ -47,7 +47,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka org.kie.kogito diff --git a/jobs-service/jobs-service-messaging-kafka/pom.xml b/jobs-service/jobs-service-messaging-kafka/pom.xml index beb82658ed..651bb9977b 100644 --- a/jobs-service/jobs-service-messaging-kafka/pom.xml +++ b/jobs-service/jobs-service-messaging-kafka/pom.xml @@ -63,7 +63,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.smallrye.reactive diff --git a/trusty/trusty-service/trusty-service-common/pom.xml b/trusty/trusty-service/trusty-service-common/pom.xml index 8c53ec2e92..e961bd3768 100644 --- a/trusty/trusty-service/trusty-service-common/pom.xml +++ b/trusty/trusty-service/trusty-service-common/pom.xml @@ -55,7 +55,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka org.kie.kogito From d5954e7540ced469223c203078b1d91892fb7ab8 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Wed, 22 Jan 2025 14:12:12 +0530 Subject: [PATCH 5/9] Upgrade infinispan to 15.0.11.Final --- .../src/main/docker/docker-compose.yml | 2 +- .../src/test/docker/docker-compose.yml | 2 +- kogito-apps-build-parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml index 4555200bde..7ff9398297 100644 --- a/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml +++ b/data-index/data-index-service/data-index-service-infinispan/src/main/docker/docker-compose.yml @@ -22,7 +22,7 @@ version: '2.1' services: infinispan: - image: infinispan/server:15.0.8.Final + image: infinispan/server:15.0.11.Final container_name: infinispan ports: - 11222:11222 diff --git a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml index 426caf7a17..9f4fed2fab 100644 --- a/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml +++ b/data-index/data-index-service/data-index-service-infinispan/src/test/docker/docker-compose.yml @@ -55,7 +55,7 @@ services: LOG_DIR: "/tmp/logs" infinispan: - image: infinispan/server:15.0.8.Final + image: infinispan/server:15.0.11.Final container_name: data-index-infinispan ports: - "11222:11222" diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml index ccc5cf6150..a6172d6c3e 100644 --- a/kogito-apps-build-parent/pom.xml +++ b/kogito-apps-build-parent/pom.xml @@ -62,7 +62,7 @@ ${project.version} - 6.6.0.Final + 6.6.3.Final 2.3.2 1.10.0 2.2.0 From 693aa8e6ee3466f36e66e396bcae464f3f8de928 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Thu, 23 Jan 2025 15:33:19 +0530 Subject: [PATCH 6/9] Some artifacts renaming as per migration guide 3.9 --- explainability/explainability-service-messaging/pom.xml | 2 +- jobs-service/jobs-service-common/pom.xml | 6 +++--- jobs-service/jobs-service-messaging-kafka/pom.xml | 2 +- .../runtime/pom.xml | 4 ++-- .../kogito-addons-quarkus-jobs/pom.xml | 4 ++-- trusty/trusty-service/trusty-service-common/pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/explainability/explainability-service-messaging/pom.xml b/explainability/explainability-service-messaging/pom.xml index 8615b69205..bcd307f935 100644 --- a/explainability/explainability-service-messaging/pom.xml +++ b/explainability/explainability-service-messaging/pom.xml @@ -43,7 +43,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus diff --git a/jobs-service/jobs-service-common/pom.xml b/jobs-service/jobs-service-common/pom.xml index 6b19b74d56..5441c0e28d 100644 --- a/jobs-service/jobs-service-common/pom.xml +++ b/jobs-service/jobs-service-common/pom.xml @@ -63,7 +63,7 @@ io.quarkus - quarkus-resteasy-reactive + quarkus-rest io.quarkus @@ -83,7 +83,7 @@ io.quarkus - quarkus-resteasy-reactive-jackson + quarkus-rest-jackson com.fasterxml.jackson.datatype @@ -117,7 +117,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging diff --git a/jobs-service/jobs-service-messaging-kafka/pom.xml b/jobs-service/jobs-service-messaging-kafka/pom.xml index 651bb9977b..d0a6ee1960 100644 --- a/jobs-service/jobs-service-messaging-kafka/pom.xml +++ b/jobs-service/jobs-service-messaging-kafka/pom.xml @@ -59,7 +59,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml index 0aa04b332d..1a08be158f 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml @@ -64,11 +64,11 @@ io.quarkus - quarkus-resteasy-reactive + quarkus-rest io.quarkus - quarkus-resteasy-reactive-jackson + quarkus-rest-jackson io.quarkus diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml index d1e67de208..a27688c488 100644 --- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml +++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs/pom.xml @@ -65,11 +65,11 @@ io.quarkus - quarkus-resteasy-reactive + quarkus-rest io.quarkus - quarkus-resteasy-reactive-jackson + quarkus-rest-jackson io.quarkus diff --git a/trusty/trusty-service/trusty-service-common/pom.xml b/trusty/trusty-service/trusty-service-common/pom.xml index e961bd3768..9c5579793e 100644 --- a/trusty/trusty-service/trusty-service-common/pom.xml +++ b/trusty/trusty-service/trusty-service-common/pom.xml @@ -51,7 +51,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging + quarkus-messaging io.quarkus From e0b9b95d2fb11c8a915e4f27f5f39191a093790c Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Mon, 27 Jan 2025 14:43:41 +0530 Subject: [PATCH 7/9] Updating quarkus.package.type property as per migration guide --- .../integration-tests-trusty-service-quarkus/pom.xml | 2 +- data-index/data-index-service/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- .../integration-tests-process/pom.xml | 2 +- .../integration-tests-sw/pom.xml | 2 +- jitexecutor-native/pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml index 2b4ea70d92..abe44d6485 100644 --- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml @@ -135,7 +135,7 @@ - native + true diff --git a/data-index/data-index-service/pom.xml b/data-index/data-index-service/pom.xml index cdc2c04d47..140a8edf12 100644 --- a/data-index/data-index-service/pom.xml +++ b/data-index/data-index-service/pom.xml @@ -48,7 +48,7 @@ - jar + jar diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml index 63ebdfe24b..92a7a8dce9 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-process/pom.xml @@ -105,7 +105,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml index ed09689634..8b7adbf92d 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/integration-tests-sw/pom.xml @@ -114,7 +114,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml index dc97fc4543..c7a1958d7d 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml @@ -122,7 +122,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml index a534484748..cbd904956d 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-sw/pom.xml @@ -125,7 +125,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml index 4d983333b9..8cfd8d1a04 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml @@ -105,7 +105,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml index f1b74fd8b3..d4d24a75b2 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-sw/pom.xml @@ -114,7 +114,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml index 5b664be5ea..99496b9d38 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml @@ -116,7 +116,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml index a75ea37d00..6690abb1d7 100644 --- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/pom.xml @@ -137,7 +137,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml index 3932306aff..55608936a0 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-process/pom.xml @@ -104,7 +104,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml index 456431a17e..6bfdd21355 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/integration-tests-sw/pom.xml @@ -104,7 +104,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml index 9b9dd4872d..e28957129f 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml @@ -100,7 +100,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml index 0c0c1b0472..30902ba7d7 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-sw/pom.xml @@ -100,7 +100,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml index f724fcdadc..7891e4775f 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml @@ -112,7 +112,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml index 7174ca6e1d..c1e577d128 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-sw/pom.xml @@ -112,7 +112,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml index d866905155..2f5d27e80c 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml @@ -104,7 +104,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml index 4fde1ab1a3..e60acfc7ed 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-sw/pom.xml @@ -104,7 +104,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml index 86e8c2e46d..f1fc79bce2 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml @@ -112,7 +112,7 @@ - native + true **/*IT.java diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml index c03ec5bd2a..f30a5a1736 100644 --- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml +++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/pom.xml @@ -112,7 +112,7 @@ - native + true **/*IT.java diff --git a/jitexecutor-native/pom.xml b/jitexecutor-native/pom.xml index 38fbe63194..2cf8597bb1 100644 --- a/jitexecutor-native/pom.xml +++ b/jitexecutor-native/pom.xml @@ -35,7 +35,7 @@ org.kie.kogito.jitexecutor.runner true - native + true From a2c2fbc160cea169d4b277525d0218d045793a58 Mon Sep 17 00:00:00 2001 From: Rishiraj Anand Date: Mon, 27 Jan 2025 20:18:43 +0530 Subject: [PATCH 8/9] fix formatting error --- .../index/service/MongoDomainIndexingServiceIT.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java index 3eec6c1834..d9346f6b55 100644 --- a/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java +++ b/data-index/data-index-service/data-index-service-mongodb/src/test/java/org/kie/kogito/index/service/MongoDomainIndexingServiceIT.java @@ -18,15 +18,15 @@ */ package org.kie.kogito.index.service; -import io.restassured.http.ContentType; +import java.util.Collection; + import org.junit.jupiter.api.Test; import org.kie.kogito.index.service.test.InMemoryMessageTestProfile; import org.kie.kogito.index.test.TestUtils; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; - -import java.util.Collection; +import io.restassured.http.ContentType; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.isA; @@ -44,6 +44,7 @@ protected String getProcessProtobufFileContent() throws Exception { protected String getUserTaskProtobufFileContent() throws Exception { return TestUtils.readFileContent("deals-mongo.proto"); } + @Test void testAddProtoFileTwice() throws Exception { protobufService.registerProtoBufferType(getProtoBufferFileV1()); @@ -66,6 +67,7 @@ void testAddProtoFileTwice() throws Exception { .when().post("/graphql") .then().log().ifValidationFails().statusCode(200).body("data.ProcessInstances", isA(Collection.class)); } + private String getProtoBufferFileV1() { return "package org.demo;\n" + "import \"kogito-index.proto\";\n" + From 20a05d9517db6721fa1576072edf85131bf57030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= Date: Fri, 24 Jan 2025 10:58:46 +0100 Subject: [PATCH 9/9] - fix formatting + Header --- ...tiveJobServiceManagementRepositoryTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/BaseJPAReactiveJobServiceManagementRepositoryTest.java b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/BaseJPAReactiveJobServiceManagementRepositoryTest.java index 8cb774ef2a..4b079307f2 100644 --- a/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/BaseJPAReactiveJobServiceManagementRepositoryTest.java +++ b/jobs-service/jobs-service-storage-jpa/src/test/java/org/kie/kogito/jobs/service/repository/jpa/BaseJPAReactiveJobServiceManagementRepositoryTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.kie.kogito.jobs.service.repository.jpa; import java.time.OffsetDateTime;