This is an automated email from the ASF dual-hosted git repository.
tiagodolphine pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new e17fe7b1f [KOGITO-9886] fix IT for data-index and jobs-service with
process-definitions events (#1913)
e17fe7b1f is described below
commit e17fe7b1f1e14cc34a60d5d3534fde8c222eebb1
Author: Tiago Dolphine <[email protected]>
AuthorDate: Thu Nov 23 08:41:25 2023 -0300
[KOGITO-9886] fix IT for data-index and jobs-service with
process-definitions events (#1913)
* KOGITO-9886 fix IT for data-index and jobs-service with
process-definitions events
---
.../src/main/resources/application.properties | 8 +++++++-
.../KogitoServiceRandomPortQuarkusKafkaTestResource.java | 1 +
.../src/test/resources/application.properties | 4 ++++
.../src/main/resources/application.properties | 6 +++++-
.../service/messaging/BlockingMessagingEventConsumer.java | 11 ++++++++---
.../service/messaging/ReactiveMessagingEventConsumer.java | 8 ++++++++
.../main/resources/META-INF/microprofile-config.properties | 10 ++++++++++
.../test/quarkus/DataIndexInMemoryQuarkusTestResource.java | 2 ++
.../http/AbstractDataIndexHttpQuarkusTestResource.java | 2 ++
9 files changed, 47 insertions(+), 5 deletions(-)
diff --git
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties
index b067d2556..3f50675a3 100644
---
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties
+++
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties
@@ -30,4 +30,10 @@
mp.messaging.outgoing.kogito-usertaskinstances-events.connector=smallrye-kafka
mp.messaging.outgoing.kogito-usertaskinstances-events.topic=kogito-usertaskinstances-events
mp.messaging.outgoing.kogito-usertaskinstances-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
mp.messaging.outgoing.kogito-usertaskinstances-events.group.id=kogito-data-index-it
-mp.messaging.outgoing.kogito-usertaskinstances-events.auto.offset.reset=earliest
\ No newline at end of file
+mp.messaging.outgoing.kogito-usertaskinstances-events.auto.offset.reset=earliest
+
+mp.messaging.outgoing.kogito-processdefinitions-events.connector=smallrye-kafka
+mp.messaging.outgoing.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.outgoing.kogito-processdefinitions-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+mp.messaging.outgoing.kogito-processdefinitions-events.group.id=kogito-data-index-it
+mp.messaging.outgoing.kogito-processdefinitions-events.auto.offset.reset=earliest
diff --git
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
index 29dbfccfc..393a2290b 100644
---
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
+++
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/kafka/KogitoServiceRandomPortQuarkusKafkaTestResource.java
@@ -50,6 +50,7 @@ public class KogitoServiceRandomPortQuarkusKafkaTestResource
extends Conditional
properties.put(QUARKUS_SERVICE_HTTP_PORT,
String.valueOf(getTestResource().getMappedPort()));
properties.put(KOGITO_SERVICE_URL,
"http://host.testcontainers.internal:"; + getTestResource().getMappedPort());
properties.put("mp.messaging.outgoing.kogito-processinstances-events.connector",
"smallrye-kafka");
+
properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.connector",
"smallrye-kafka");
properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.connector",
"smallrye-kafka");
return properties;
diff --git
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties
index 4dde403fc..5521cae26 100644
---
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties
+++
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties
@@ -29,6 +29,10 @@
mp.messaging.outgoing.kogito-processinstances-events.connector=smallrye-kafka
mp.messaging.outgoing.kogito-processinstances-events.topic=kogito-processinstances-events
mp.messaging.outgoing.kogito-processinstances-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+mp.messaging.outgoing.kogito-processdefinitions-events.connector=smallrye-kafka
+mp.messaging.outgoing.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.outgoing.kogito-processdefinitions-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+
mp.messaging.outgoing.kogito-usertaskinstances-events.connector=smallrye-kafka
mp.messaging.outgoing.kogito-usertaskinstances-events.topic=kogito-usertaskinstances-events
mp.messaging.outgoing.kogito-usertaskinstances-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
diff --git
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
index bc7397429..b215aedc6 100644
---
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
+++
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
@@ -62,6 +62,10 @@
mp.messaging.outgoing.kogito-variables-events.connector=smallrye-kafka
mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events
mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+mp.messaging.outgoing.kogito-processdefinitions-events.connector=smallrye-kafka
+mp.messaging.outgoing.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.outgoing.kogito-processdefinitions-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer
+
kogito.persistence.type=filesystem
-quarkus.devservices.enabled=false
\ No newline at end of file
+quarkus.devservices.enabled=false
diff --git
a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
index e30127e73..c6c008e53 100644
---
a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
+++
b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
@@ -25,6 +25,7 @@ import javax.transaction.Transactional;
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.kie.kogito.event.DataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.index.event.KogitoJobCloudEvent;
@@ -35,9 +36,7 @@ import org.slf4j.LoggerFactory;
import io.quarkus.arc.properties.IfBuildProperty;
import io.smallrye.reactive.messaging.annotations.Blocking;
-import static
org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
-import static
org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
-import static
org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
+import static
org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.*;
@ApplicationScoped
@IfBuildProperty(name = "kogito.data-index.blocking", stringValue = "true")
@@ -77,4 +76,10 @@ public class BlockingMessagingEventConsumer {
indexingService.indexJob(event.getData());
}
+ @Incoming(KOGITO_PROCESSDEFINITIONS_EVENTS)
+ @Blocking
+ @Transactional
+ public void onProcessDefinitionsEvent(ProcessDefinitionDataEvent event) {
+ LOGGER.debug("Received but skipping ProcessDefinition DataEvent\n{}",
event);
+ }
}
diff --git
a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
index d2d372361..fc5d30695 100644
---
a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
+++
b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
@@ -24,6 +24,7 @@ import javax.inject.Inject;
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.kie.kogito.event.DataEvent;
+import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.index.event.KogitoJobCloudEvent;
@@ -41,6 +42,7 @@ public class ReactiveMessagingEventConsumer {
private static final Logger LOGGER =
LoggerFactory.getLogger(ReactiveMessagingEventConsumer.class);
public static final String KOGITO_PROCESSINSTANCES_EVENTS =
"kogito-processinstances-events";
+ public static final String KOGITO_PROCESSDEFINITIONS_EVENTS =
"kogito-processdefinitions-events";
public static final String KOGITO_USERTASKINSTANCES_EVENTS =
"kogito-usertaskinstances-events";
public static final String KOGITO_JOBS_EVENTS = "kogito-jobs-events";
@@ -81,4 +83,10 @@ public class ReactiveMessagingEventConsumer {
.onItem().ignore().andContinueWithNull();
}
+ @Incoming(KOGITO_PROCESSDEFINITIONS_EVENTS)
+ public Uni<Void> onProcessDefinitionsEvent(ProcessDefinitionDataEvent
event) {
+ //to nothing from now
+ return Uni.createFrom().nullItem();
+ }
+
}
diff --git
a/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties
b/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties
index 9e98c3e6c..dea9835d9 100644
---
a/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties
+++
b/data-index/data-index-service/data-index-service-common/src/main/resources/META-INF/microprofile-config.properties
@@ -63,6 +63,8 @@ kogito.data-index.vertx-graphql.ui.tenant=web-app-tenant
mp.messaging.incoming.kogito-processinstances-events.connector=quarkus-http
mp.messaging.incoming.kogito-processinstances-events.path=/processes
+mp.messaging.incoming.kogito-processdefinitions-events.connector=quarkus-http
+mp.messaging.incoming.kogito-processdefinitions-events.path=/definitions
mp.messaging.incoming.kogito-usertaskinstances-events.connector=quarkus-http
mp.messaging.incoming.kogito-usertaskinstances-events.path=/tasks
mp.messaging.incoming.kogito-jobs-events.connector=quarkus-http
@@ -70,6 +72,8 @@ mp.messaging.incoming.kogito-jobs-events.path=/jobs
%kafka-events-support.mp.messaging.incoming.kogito-processinstances-events.connector=smallrye-kafka
%kafka-events-support.mp.messaging.incoming.kogito-processinstances-events.value.deserializer=org.kie.kogito.index.service.messaging.ProcessInstanceDataEventDeserializer
+%kafka-events-support.mp.messaging.incoming.kogito-processdefinitions-events.connector=smallrye-kafka
+
%kafka-events-support.mp.messaging.incoming.kogito-usertaskinstances-events.connector=smallrye-kafka
%kafka-events-support.mp.messaging.incoming.kogito-usertaskinstances-events.value.deserializer=org.kie.kogito.index.service.messaging.UserTaskInstanceDataEventDeserializer
%kafka-events-support.mp.messaging.incoming.kogito-jobs-events.connector=smallrye-kafka
@@ -94,6 +98,12 @@
mp.messaging.incoming.kogito-jobs-events.enable.auto.commit=false
mp.messaging.incoming.kogito-jobs-events.auto.offset.reset=earliest
mp.messaging.incoming.kogito-jobs-events.isolation.level=read_committed
+mp.messaging.incoming.kogito-processdefinitions-events.topic=kogito-processdefinitions-events
+mp.messaging.incoming.kogito-processdefinitions-events.group.id=kogito-data-index-jobs
+mp.messaging.incoming.kogito-processdefinitions-events.enable.auto.commit=false
+mp.messaging.incoming.kogito-processdefinitions-events.auto.offset.reset=earliest
+mp.messaging.incoming.kogito-processdefinitions-events.isolation.level=read_committed
+
%http-events-support.mp.messaging.incoming.kogito-processinstances-events.connector=quarkus-http
%http-events-support.mp.messaging.incoming.kogito-usertaskinstances-events.connector=quarkus-http
%http-events-support.mp.messaging.incoming.kogito-jobs-events.connector=quarkus-http
\ No newline at end of file
diff --git
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java
index ee389bfb0..caf191899 100644
---
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java
+++
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/DataIndexInMemoryQuarkusTestResource.java
@@ -39,6 +39,8 @@ public class DataIndexInMemoryQuarkusTestResource extends
ConditionalQuarkusTest
properties.putAll(getTestResource().getProperties());
properties.put("mp.messaging.outgoing.kogito-processinstances-events.connector",
"quarkus-http");
properties.put("mp.messaging.outgoing.kogito-processinstances-events.url",
dataIndexUrl + "/processes");
+
properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.connector",
"quarkus-http");
+
properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.url",
dataIndexUrl + "/definitions");
properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.connector",
"quarkus-http");
properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.url",
dataIndexUrl + "/tasks");
properties.put("mp.messaging.outgoing.kogito-jobs-events.connector",
"quarkus-http");
diff --git
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java
index 3eadc67e2..4a6200e00 100644
---
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java
+++
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/quarkus/http/AbstractDataIndexHttpQuarkusTestResource.java
@@ -43,6 +43,8 @@ public abstract class
AbstractDataIndexHttpQuarkusTestResource<T extends TestRes
properties.put(KOGITO_DATA_INDEX_SERVICE_URL, dataIndexUrl);
properties.put("mp.messaging.outgoing.kogito-processinstances-events.connector",
"quarkus-http");
properties.put("mp.messaging.outgoing.kogito-processinstances-events.url",
dataIndexUrl + "/processes");
+
properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.connector",
"quarkus-http");
+
properties.put("mp.messaging.outgoing.kogito-processdefinitions-events.url",
dataIndexUrl + "/definitions");
properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.connector",
"quarkus-http");
properties.put("mp.messaging.outgoing.kogito-usertaskinstances-events.url",
dataIndexUrl + "/tasks");
properties.put("mp.messaging.outgoing.kogito-jobs-events.connector",
"quarkus-http");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
