[1.40.x] Cherry pick KOGITO-9298 1.40.x (#1793)

* splitting job-service-postgresql into a common module * removing not needed config file * fix the version on the new jobs-service-postgresql-common module
apache · Jun 26, 2023 · 9e438a2 · 9e438a2
1 parent 9305cc6
commit 9e438a2
Show file tree

Hide file tree

Showing 30 changed files with 118 additions and 68 deletions.
diff --git a/jobs-service/jobs-service-inmemory/pom.xml b/jobs-service/jobs-service-inmemory/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.kie.kogito</groupId>
-            <artifactId>jobs-service-postgresql</artifactId>
+            <artifactId>jobs-service-postgresql-common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkiverse.embedded.postgresql</groupId>

diff --git a/jobs-service/jobs-service-inmemory/src/main/resources/application.properties b/jobs-service/jobs-service-inmemory/src/main/resources/application.properties
@@ -16,4 +16,5 @@
 
 quarkus.datasource.db-kind=postgresql
 quarkus.flyway.migrate-at-start=true
-quarkus.datasource.health.enabled=true
+quarkus.datasource.health.enabled=true
+quarkus.flyway.locations=db/jobs-service
diff --git a/jobs-service/jobs-service-postgresql-common/pom.xml b/jobs-service/jobs-service-postgresql-common/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>jobs-service</artifactId>
+        <version>1.40.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jobs-service-postgresql-common</artifactId>
+    <name>Kogito Apps :: Jobs Service :: PostgreSQL</name>
+    <description>Jobs Service (Timers and Async Jobs) PostgreSQL Common</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.kie.kogito</groupId>
+            <artifactId>jobs-service-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-flyway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.kogito</groupId>
+            <artifactId>jobs-service-common</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.kogito</groupId>
+            <artifactId>kogito-quarkus-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/...y/postgresql/PostgreSqlJobRepository.java → ...y/postgresql/PostgreSqlJobRepository.java b/...y/postgresql/PostgreSqlJobRepository.java → ...y/postgresql/PostgreSqlJobRepository.java
diff --git a/...greSqlJobServiceManagementRepository.java → ...greSqlJobServiceManagementRepository.java b/...greSqlJobServiceManagementRepository.java → ...greSqlJobServiceManagementRepository.java
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/beans.xml b/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/beans.xml
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/application.properties b/jobs-service/jobs-service-postgresql-common/src/main/resources/application.properties
@@ -0,0 +1,16 @@
+#
+# Copyright 2021 Red Hat, Inc. and/or its affiliates.
+#
+# Licensed 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.
+#
+quarkus.datasource.db-kind=postgresql
diff --git a/.../db/jobs-service/V2.0.0__Create_Table.sql → .../db/jobs-service/V2.0.0__Create_Table.sql b/.../db/jobs-service/V2.0.0__Create_Table.sql → .../db/jobs-service/V2.0.0__Create_Table.sql
diff --git a/...0.1__job_details_increase_job_id_size.sql → ...0.1__job_details_increase_job_id_size.sql b/...0.1__job_details_increase_job_id_size.sql → ...0.1__job_details_increase_job_id_size.sql
diff --git a/...V2.0.2__job_details_add_fire_time_col.sql → ...V2.0.2__job_details_add_fire_time_col.sql b/...V2.0.2__job_details_add_fire_time_col.sql → ...V2.0.2__job_details_add_fire_time_col.sql
diff --git a/...rvice/V2.0.3__Create_Table_Management.sql → ...rvice/V2.0.3__Create_Table_Management.sql b/...rvice/V2.0.3__Create_Table_Management.sql → ...rvice/V2.0.3__Create_Table_Management.sql
diff --git a/...-service/V3.0.0__Create_Jobs_Table_V2.sql → ...-service/V3.0.0__Create_Jobs_Table_V2.sql b/...-service/V3.0.0__Create_Jobs_Table_V2.sql → ...-service/V3.0.0__Create_Jobs_Table_V2.sql
diff --git a/...e/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql → ...e/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql b/...e/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql → ...e/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql
diff --git a/...ice/V3.0.2__Add_Execution_Timeout_Col.sql → ...ice/V3.0.2__Add_Execution_Timeout_Col.sql b/...ice/V3.0.2__Add_Execution_Timeout_Col.sql → ...ice/V3.0.2__Add_Execution_Timeout_Col.sql
diff --git a/...messaging/PostgreSqlCallbackResource.java → ...messaging/PostgreSqlCallbackResource.java b/...messaging/PostgreSqlCallbackResource.java → ...messaging/PostgreSqlCallbackResource.java
diff --git a/...ng/PostgreSqlEventSupportTestProfile.java → ...ng/PostgreSqlEventSupportTestProfile.java b/...ng/PostgreSqlEventSupportTestProfile.java → ...ng/PostgreSqlEventSupportTestProfile.java
diff --git a/...messaging/PostgreSqlMessagingApiTest.java → ...messaging/PostgreSqlMessagingApiTest.java b/...messaging/PostgreSqlMessagingApiTest.java → ...messaging/PostgreSqlMessagingApiTest.java
diff --git a/...PostgreSqlJobRepositoryExecutionTest.java → ...PostgreSqlJobRepositoryExecutionTest.java b/...PostgreSqlJobRepositoryExecutionTest.java → ...PostgreSqlJobRepositoryExecutionTest.java
diff --git a/...stgresql/PostgreSqlJobRepositoryTest.java → ...stgresql/PostgreSqlJobRepositoryTest.java b/...stgresql/PostgreSqlJobRepositoryTest.java → ...stgresql/PostgreSqlJobRepositoryTest.java
diff --git a/...qlJobServiceManagementRepositoryTest.java → ...qlJobServiceManagementRepositoryTest.java b/...qlJobServiceManagementRepositoryTest.java → ...qlJobServiceManagementRepositoryTest.java
diff --git a/...ce/KeycloakPostgreSqlJobResourceTest.java → ...ce/KeycloakPostgreSqlJobResourceTest.java b/...ce/KeycloakPostgreSqlJobResourceTest.java → ...ce/KeycloakPostgreSqlJobResourceTest.java
diff --git a/.../resource/KeycloakQuarkusTestProfile.java → .../resource/KeycloakQuarkusTestProfile.java b/.../resource/KeycloakQuarkusTestProfile.java → .../resource/KeycloakQuarkusTestProfile.java
diff --git a/...e/resource/PostgreSqlJobResourceTest.java → ...e/resource/PostgreSqlJobResourceTest.java b/...e/resource/PostgreSqlJobResourceTest.java → ...e/resource/PostgreSqlJobResourceTest.java
diff --git a/...ource/v2/PostgreSqlJobResourceV2Test.java → ...ource/v2/PostgreSqlJobResourceV2Test.java b/...ource/v2/PostgreSqlJobResourceV2Test.java → ...ource/v2/PostgreSqlJobResourceV2Test.java
diff --git a/...tgreSqlHttpRecipientPayloadTypesTest.java → ...tgreSqlHttpRecipientPayloadTypesTest.java b/...tgreSqlHttpRecipientPayloadTypesTest.java → ...tgreSqlHttpRecipientPayloadTypesTest.java
diff --git a/...tgreSqlSinkRecipientPayloadTypesTest.java → ...tgreSqlSinkRecipientPayloadTypesTest.java b/...tgreSqlSinkRecipientPayloadTypesTest.java → ...tgreSqlSinkRecipientPayloadTypesTest.java
diff --git a/...src/test/resources/application.properties → ...src/test/resources/application.properties b/...src/test/resources/application.properties → ...src/test/resources/application.properties
@@ -21,6 +21,7 @@ quarkus.oidc.tenant-enabled=false
 quarkus.datasource.db-kind=postgresql
 quarkus.flyway.migrate-at-start=true
 quarkus.flyway.clean-at-start=true
+quarkus.flyway.locations=db/jobs-service
 
 # Outgoing events for the event based API integration tests
 %events-support.mp.messaging.outgoing.kogito-job-service-job-request-events-emitter.connector=smallrye-kafka

diff --git a/jobs-service/jobs-service-postgresql/pom.xml b/jobs-service/jobs-service-postgresql/pom.xml
@@ -16,71 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.kie.kogito</groupId>
-            <artifactId>jobs-service-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-reactive-pg-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-flyway</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>jobs-service-common</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-test-utils</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
-            <scope>test</scope>
+            <artifactId>jobs-service-postgresql-common</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/...ce/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml b/...ce/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
@@ -28,9 +28,14 @@
       <groupId>io.quarkus.http</groupId>
       <artifactId>quarkus-http-core</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>io.quarkiverse.embedded.postgresql</groupId>
+      <artifactId>quarkus-embedded-postgresql</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>jobs-service-inmemory</artifactId>
+      <artifactId>jobs-service-postgresql-common</artifactId>
       <exclusions>
         <!-- excluding resteasy-reactive since kogito runtimes uses the classic -->
         <exclusion>

diff --git a/jobs-service/pom.xml b/jobs-service/pom.xml
@@ -18,6 +18,7 @@
     <module>jobs-service-internal-api</module>
     <module>jobs-recipients</module>
     <module>jobs-service-common</module>
+    <module>jobs-service-postgresql-common</module>
     <module>jobs-service-postgresql</module>
     <module>jobs-service-inmemory</module>
     <module>kogito-addons-jobs-service</module>
@@ -45,6 +46,11 @@
         <artifactId>jobs-service-internal-api</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>jobs-service-postgresql-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.kie.kogito</groupId>
           <artifactId>job-recipient-common-http</artifactId>