Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KOGITO-9849 DataIndex is not processing well the http cloud events #3240

Merged
merged 1 commit into from
Oct 10, 2023
Merged

KOGITO-9849 DataIndex is not processing well the http cloud events #3240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions quarkus/addons/common/reactive-messaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,27 @@
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-api</artifactId>
</dependency>
<!-- These dependencies are needed in case Smallrye is configured with HTTP connector -->
<dependency>
<groupId>io.quarkiverse.reactivemessaging.http</groupId>
<artifactId>quarkus-reactive-messaging-http</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
2 changes: 1 addition & 1 deletion ...sage/CloudEventHttpOutgoingDecorator.java → ...http/CloudEventHttpOutgoingDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.kie.kogito.addon.quarkus.messaging.common.message;
package org.kie.kogito.addon.quarkus.common.reactive.messaging.http;

import javax.ws.rs.core.HttpHeaders;

Expand Down
24 changes: 2 additions & 22 deletions .../CloudEventHttpOutgoingDecoratorTest.java → .../CloudEventHttpOutgoingDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.kie.kogito.addon.quarkus.messaging.common.message;
package org.kie.kogito.addon.quarkus.messaging.common.message.http;

import java.util.Collections;
import java.util.Optional;
Expand All @@ -26,9 +26,8 @@

import org.eclipse.microprofile.reactive.messaging.Message;
import org.junit.jupiter.api.Test;
import org.kie.kogito.KogitoGAV;
import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
import org.kie.kogito.config.ConfigBean;
import org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHttpOutgoingDecorator;

import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata;
import io.quarkus.test.junit.QuarkusTest;
Expand All @@ -44,25 +43,6 @@ class CloudEventHttpOutgoingDecoratorTest {
@Produces
CloudEventHttpOutgoingDecorator decorator = new CloudEventHttpOutgoingDecorator();

@Produces
ConfigBean configBean = new ConfigBean() {

@Override
public boolean useCloudEvents() {
return true;
}

@Override
public String getServiceUrl() {
return null;
}

@Override
public Optional<KogitoGAV> getGav() {
return Optional.empty();
}
};

@Test
void verifyOutgoingHttpMetadataIsSet() {
Message<String> message = provider.decorate(Message.of("pepe"));
Expand Down
4 changes: 4 additions & 0 deletions quarkus/addons/events/process/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-quarkus-common-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-common-deployment</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
13 changes: 13 additions & 0 deletions .../main/java/org/kie/kogito/events/process/deployment/KogitoAddOnEventProcessProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@
*/
package org.kie.kogito.events.process.deployment;

import org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHttpOutgoingDecorator;
import org.kie.kogito.quarkus.addons.common.deployment.KogitoCapability;
import org.kie.kogito.quarkus.addons.common.deployment.OneOfCapabilityKogitoAddOnProcessor;
import org.kie.kogito.quarkus.common.deployment.KogitoBuildContextBuildItem;
import org.kie.kogito.quarkus.config.KogitoBuildTimeConfig;

import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.arc.processor.DotNames;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;

Expand All @@ -37,4 +43,11 @@ FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}

@BuildStep
void httpMessageDecorator(BuildProducer<AdditionalBeanBuildItem> beanBuildItem, KogitoBuildTimeConfig buildTimeConfig, KogitoBuildContextBuildItem kogitoContext) {
if (buildTimeConfig.useCloudEvents && kogitoContext.getKogitoBuildContext().hasClassAvailable("io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata")) {
beanBuildItem.produce(AdditionalBeanBuildItem.builder().addBeanClass(CloudEventHttpOutgoingDecorator.class).setDefaultScope(DotNames.APPLICATION_SCOPED).build());
}
}

}
4 changes: 4 additions & 0 deletions quarkus/addons/events/process/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-common</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.eclipse.microprofile.reactive.messaging.Channel;
import org.eclipse.microprofile.reactive.messaging.Emitter;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.kie.kogito.addon.quarkus.messaging.common.message.CloudEventHttpOutgoingDecorator;
import org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHttpOutgoingDecorator;
import org.kie.kogito.jobs.messaging.quarkus.AbstractReactiveMessagingJobsService;

import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.kie.kogito.addon.quarkus.messaging.common.message.CloudEventHttpOutgoingDecorator.CLOUD_EVENTS_CONTENT_TYPE;
import static org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHttpOutgoingDecorator.CLOUD_EVENTS_CONTENT_TYPE;

class KnativeEventingJobsServiceTest extends AbstractReactiveMessagingJobsServiceTest<KnativeEventingJobsService> {

Expand Down
2 changes: 1 addition & 1 deletion ...va/org/kie/kogito/addon/cloudevents/quarkus/deployment/KogitoAddOnMessagingProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.drools.codegen.common.GeneratedFileType;
import org.jboss.jandex.DotName;
import org.jbpm.compiler.canonical.ProcessMetaData;
import org.kie.kogito.addon.quarkus.messaging.common.message.CloudEventHttpOutgoingDecorator;
import org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHttpOutgoingDecorator;
import org.kie.kogito.codegen.api.context.KogitoBuildContext;
import org.kie.kogito.codegen.process.ProcessGenerator;
import org.kie.kogito.quarkus.addons.common.deployment.AnyEngineKogitoAddOnProcessor;
Expand Down
4 changes: 4 additions & 0 deletions ...on/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class DataIndexEventPublisher implements EventPublisher {

public static final String KOGITO_DATA_INDEX = "kogito.data-index.url";
private static final Logger LOGGER = LoggerFactory.getLogger(DataIndexEventPublisher.class);
private static final String CLOUD_EVENTS_CONTENT_TYPE = "application/cloudevents+json";
private static final String CONTENT_TYPE = "content-type";

@ConfigProperty(name = KOGITO_DATA_INDEX)
Optional<String> dataIndexUrl;
Expand All @@ -62,6 +64,7 @@ public void publish(DataEvent<?> event) {
switch (event.getType()) {
case "ProcessInstanceEvent":
webClient.postAbs(dataIndexUrl.get() + "/processes")
.putHeader(CONTENT_TYPE, CLOUD_EVENTS_CONTENT_TYPE)
.expect(ResponsePredicate.SC_ACCEPTED)
.sendJson(event, result -> {
if (result.failed()) {
Expand All @@ -73,6 +76,7 @@ public void publish(DataEvent<?> event) {
break;
case "UserTaskInstanceEvent":
webClient.postAbs(dataIndexUrl.get() + "/tasks")
.putHeader(CONTENT_TYPE, CLOUD_EVENTS_CONTENT_TYPE)
.expect(ResponsePredicate.SC_ACCEPTED)
.sendJson(event, result -> {
if (result.failed()) {
Expand Down
Loading