KOGITO-8979 - Data Index PostgreSQL persistence addon

apache · Aug 28, 2023 · f23108b · f23108b
1 parent a9afd0a
commit f23108b
Show file tree

Hide file tree

Showing 161 changed files with 1,344 additions and 305 deletions.
diff --git a/.../integration-tests-data-index-service/integration-tests-data-index-service-common/pom.xml b/.../integration-tests-data-index-service/integration-tests-data-index-service-common/pom.xml
@@ -18,50 +18,30 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
-      <version>${version.org.testcontainers}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.rest-assured</groupId>
-      <artifactId>rest-assured</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.rest-assured</groupId>
-      <artifactId>json-path</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>compile</scope>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>data-index-test-utils</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>${jandex-maven-plugin.group-id}</groupId>
         <artifactId>jandex-maven-plugin</artifactId>

diff --git a/...ito/index/AbstractProcessDataIndexIT.java → ...ito/index/AbstractProcessDataIndexIT.java b/...ito/index/AbstractProcessDataIndexIT.java → ...ito/index/AbstractProcessDataIndexIT.java
diff --git a/...integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/...integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
@@ -61,6 +61,29 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>integration-tests-data-index-service-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>data-index-test-utils</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>data-index-common</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-quarkus-test-utils</artifactId>

diff --git a/...s/src/test/java/org/kie/kogito/index/infinispan/AbstractProcessDataIndexInfinispanIT.java b/...s/src/test/java/org/kie/kogito/index/infinispan/AbstractProcessDataIndexInfinispanIT.java
@@ -18,7 +18,7 @@
 import org.kie.kogito.index.AbstractProcessDataIndexIT;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 public abstract class AbstractProcessDataIndexInfinispanIT extends AbstractProcessDataIndexIT {
 

diff --git a/...rvice-quarkus/src/test/java/org/kie/kogito/index/inmemory/ProcessDataIndexInMemoryIT.java b/...rvice-quarkus/src/test/java/org/kie/kogito/index/inmemory/ProcessDataIndexInMemoryIT.java
@@ -22,7 +22,7 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.quarkus.test.junit.TestProfile;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 @QuarkusIntegrationTest
 @TestProfile(InMemoryTestProfile.class)

diff --git a/...quarkus/src/test/java/org/kie/kogito/index/mongodb/AbstractProcessDataIndexMongoDBIT.java b/...quarkus/src/test/java/org/kie/kogito/index/mongodb/AbstractProcessDataIndexMongoDBIT.java
@@ -18,7 +18,7 @@
 import org.kie.kogito.index.AbstractProcessDataIndexIT;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 public abstract class AbstractProcessDataIndexMongoDBIT extends AbstractProcessDataIndexIT {
 

diff --git a/...e-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java b/...e-quarkus/src/test/java/org/kie/kogito/index/oracle/AbstractProcessDataIndexOracleIT.java
@@ -18,7 +18,7 @@
 import org.kie.kogito.index.AbstractProcessDataIndexIT;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 public abstract class AbstractProcessDataIndexOracleIT extends AbstractProcessDataIndexIT {
 

diff --git a/...s/src/test/java/org/kie/kogito/index/postgresql/AbstractProcessDataIndexPostgreSqlIT.java b/...s/src/test/java/org/kie/kogito/index/postgresql/AbstractProcessDataIndexPostgreSqlIT.java
@@ -18,7 +18,7 @@
 import org.kie.kogito.index.AbstractProcessDataIndexIT;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 public abstract class AbstractProcessDataIndexPostgreSqlIT extends AbstractProcessDataIndexIT {
 

diff --git a/...index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/InMemoryTestProfile.java b/...index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/InMemoryTestProfile.java
@@ -20,6 +20,7 @@
 import java.util.List;
 
 import org.kie.kogito.index.quarkus.http.KogitoServiceRandomPortQuarkusHttpTestResource;
+import org.kie.kogito.index.test.quarkus.DataIndexInMemoryQuarkusTestResource;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 

diff --git a/...st/java/org/kie/kogito/index/quarkus/http/DataIndexPostgreSqlHttpQuarkusTestResource.java b/...st/java/org/kie/kogito/index/quarkus/http/DataIndexPostgreSqlHttpQuarkusTestResource.java
diff --git a/...ce-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/InfinispanHttpTestProfile.java b/...ce-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/InfinispanHttpTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.http.DataIndexInfinispanHttpQuarkusTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class InfinispanHttpTestProfile implements QuarkusTestProfile {

diff --git a/...ava/org/kie/kogito/index/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java b/...ava/org/kie/kogito/index/quarkus/http/KogitoServiceRandomPortQuarkusHttpTestResource.java
@@ -18,10 +18,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.kie.kogito.index.resources.KogitoServiceRandomPortTestResource;
+import org.kie.kogito.index.test.quarkus.KogitoServiceRandomPortTestResource;
 import org.kie.kogito.test.resources.ConditionalQuarkusTestResource;
 
-import static org.kie.kogito.index.resources.KogitoServiceRandomPortTestResource.KOGITO_SERVICE_URL;
+import static org.kie.kogito.index.test.quarkus.KogitoServiceRandomPortTestResource.KOGITO_SERVICE_URL;
 
 public class KogitoServiceRandomPortQuarkusHttpTestResource extends ConditionalQuarkusTestResource {
 

diff --git a/...rvice-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/MongoDBHttpTestProfile.java b/...rvice-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/MongoDBHttpTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.http.DataIndexMongoDBHttpQuarkusTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class MongoDBHttpTestProfile implements QuarkusTestProfile {

diff --git a/...ervice-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java b/...ervice-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/OracleHttpTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.http.DataIndexOracleHttpQuarkusTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class OracleHttpTestProfile implements QuarkusTestProfile {

diff --git a/...ce-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/PostgreSqlHttpTestProfile.java b/...ce-quarkus/src/test/java/org/kie/kogito/index/quarkus/http/PostgreSqlHttpTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.http.DataIndexPostgreSqlHttpQuarkusTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class PostgreSqlHttpTestProfile implements QuarkusTestProfile {

diff --git a/...-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/InfinispanKafkaTestProfile.java b/...-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/InfinispanKafkaTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.kafka.DataIndexInfinispanQuarkusKafkaTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class InfinispanKafkaTestProfile implements QuarkusTestProfile {

diff --git a/...a/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java b/...a/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
@@ -18,10 +18,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.kie.kogito.index.resources.KogitoServiceRandomPortTestResource;
+import org.kie.kogito.index.test.quarkus.KogitoServiceRandomPortTestResource;
 import org.kie.kogito.test.resources.ConditionalQuarkusTestResource;
 
-import static org.kie.kogito.index.resources.KogitoServiceRandomPortTestResource.KOGITO_SERVICE_URL;
+import static org.kie.kogito.index.test.quarkus.KogitoServiceRandomPortTestResource.KOGITO_SERVICE_URL;
 
 public class KogitoServiceRandomPortQuarkusKafkaTestResource extends ConditionalQuarkusTestResource {
 

diff --git a/...ice-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/MongoDBKafkaTestProfile.java b/...ice-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/MongoDBKafkaTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.kafka.DataIndexMongoDBQuarkusKafkaTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class MongoDBKafkaTestProfile implements QuarkusTestProfile {

diff --git a/...vice-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java b/...vice-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/OracleKafkaTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.kafka.DataIndexOracleQuarkusKafkaTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class OracleKafkaTestProfile implements QuarkusTestProfile {

diff --git a/...-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/PostgreSqlKafkaTestProfile.java b/...-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/PostgreSqlKafkaTestProfile.java
@@ -19,6 +19,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.kie.kogito.index.test.quarkus.kafka.DataIndexPostgreSqlQuarkusKafkaTestResource;
+
 import io.quarkus.test.junit.QuarkusTestProfile;
 
 public class PostgreSqlKafkaTestProfile implements QuarkusTestProfile {

diff --git a/...egration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/...egration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
@@ -37,11 +37,6 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>integration-tests-data-index-service-common</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.rest-assured</groupId>
-      <artifactId>rest-assured</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-addons-springboot-events-process-kafka</artifactId>
@@ -62,6 +57,38 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-addons-springboot-persistence-filesystem</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>integration-tests-data-index-service-common</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>data-index-test-utils</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>data-index-common</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>kogito-quarkus-test-utils</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>

diff --git a/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java b/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
@@ -27,7 +27,7 @@
 
 import io.restassured.RestAssured;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexInfinispanSpringTestResource.class })

diff --git a/...ndex-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java b/...ndex-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
@@ -27,7 +27,7 @@
 
 import io.restassured.RestAssured;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexMongoDBSpringTestResource.class })

diff --git a/...index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java b/...index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
@@ -27,7 +27,7 @@
 
 import io.restassured.RestAssured;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexOracleSpringTestResource.class })

diff --git a/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java b/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
@@ -27,7 +27,7 @@
 
 import io.restassured.RestAssured;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexPostgreSqlSpringTestResource.class })

diff --git a/...boot/src/test/java/org/kie/kogito/index/spring/DataIndexInfinispanSpringTestResource.java b/...boot/src/test/java/org/kie/kogito/index/spring/DataIndexInfinispanSpringTestResource.java
@@ -19,10 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.kie.kogito.index.resources.kafka.DataIndexInfinispanKafkaResource;
+import org.kie.kogito.index.test.quarkus.kafka.DataIndexInfinispanKafkaResource;
 import org.kie.kogito.test.resources.ConditionalSpringBootTestResource;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 public class DataIndexInfinispanSpringTestResource extends ConditionalSpringBootTestResource<DataIndexInfinispanKafkaResource> {
 

diff --git a/...ingboot/src/test/java/org/kie/kogito/index/spring/DataIndexMongoDBSpringTestResource.java b/...ingboot/src/test/java/org/kie/kogito/index/spring/DataIndexMongoDBSpringTestResource.java
@@ -19,10 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.kie.kogito.index.resources.kafka.DataIndexMongoDBKafkaResource;
+import org.kie.kogito.index.test.quarkus.kafka.DataIndexMongoDBKafkaResource;
 import org.kie.kogito.test.resources.ConditionalSpringBootTestResource;
 
-import static org.kie.kogito.index.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
+import static org.kie.kogito.index.test.Constants.KOGITO_DATA_INDEX_SERVICE_URL;
 
 public class DataIndexMongoDBSpringTestResource extends ConditionalSpringBootTestResource<DataIndexMongoDBKafkaResource> {