diff --git a/pom.xml b/pom.xml index 8d6f8b0..39ca21a 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ 3.24.2 5.1.2.Final 1.18.3 + 2.0.7 @@ -76,6 +77,12 @@ ${assertj-core.version} test + + org.slf4j + slf4j-log4j12 + ${slf4j-log4j12.version} + test + diff --git a/quarkus-solace-client/runtime/pom.xml b/quarkus-solace-client/runtime/pom.xml index 04c47c8..f8f61ce 100644 --- a/quarkus-solace-client/runtime/pom.xml +++ b/quarkus-solace-client/runtime/pom.xml @@ -31,6 +31,12 @@ + + + src/main/resources + true + + io.quarkus diff --git a/quarkus-solace-messaging-connector/runtime/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml index 272e46e..6246485 100644 --- a/quarkus-solace-messaging-connector/runtime/pom.xml +++ b/quarkus-solace-messaging-connector/runtime/pom.xml @@ -139,6 +139,12 @@ + + + src/main/resources + true + + org.apache.maven.plugins diff --git a/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java index a6b7675..b835438 100644 --- a/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java +++ b/samples/hello-connector-solace/src/main/java/com/solace/quarkus/samples/HelloConsumer.java @@ -1,13 +1,11 @@ package com.solace.quarkus.samples; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.CompletionStage; - import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.*; -import com.solace.quarkus.messaging.incoming.SolaceInboundMessage; +import com.solace.messaging.receiver.InboundMessage; +import com.solace.quarkus.messaging.incoming.SolaceInboundMetadata; import com.solace.quarkus.messaging.outgoing.SolaceOutboundMetadata; import io.quarkus.logging.Log; @@ -19,7 +17,7 @@ public class HelloConsumer { /** * Publishes message to topic hello/foobar which is subscribed by queue.foobar * - * @see #consumeMessage(SolaceInboundMessage) + * @see #consumeMessage(InboundMessage) * @return */ @Outgoing("hello-out") @@ -35,11 +33,8 @@ Multi> publishMessage() { * @param p */ @Incoming("hello-in") - @Acknowledgment(Acknowledgment.Strategy.MANUAL) - CompletionStage consumeMessage(SolaceInboundMessage p) { - Log.infof("Received message: %s from topic: %s", new String(p.getMessage().getPayloadAsBytes(), StandardCharsets.UTF_8), - p.getMessage().getDestinationName()); - return p.ack(); + void consumeMessage(InboundMessage p) { + Log.infof("Received message: %s from topic: %s", p.getPayloadAsString(), p.getDestinationName()); } /** @@ -52,12 +47,12 @@ CompletionStage consumeMessage(SolaceInboundMessage p) { */ @Incoming("dynamic-destination-in") @Outgoing("dynamic-destination-out") - Message consumeAndPublishToDynamicTopic(SolaceInboundMessage p) { - Log.infof("Received message: %s from topic: %s", new String(p.getMessage().getPayloadAsBytes(), StandardCharsets.UTF_8), - p.getMessage().getDestinationName()); + Message consumeAndPublishToDynamicTopic(Message p) { + SolaceInboundMetadata metadata = p.getMetadata(SolaceInboundMetadata.class).get(); + Log.infof("Received message: %s from topic: %s", metadata.getPayloadAsString(), metadata.getDestinationName()); SolaceOutboundMetadata outboundMetadata = SolaceOutboundMetadata.builder() .setApplicationMessageId("test") - .setDynamicDestination("hello/foobar/" + p.getMessage().getApplicationMessageId()) + .setDynamicDestination("hello/foobar/" + metadata.getApplicationMessageId()) .createPubSubOutboundMetadata(); return p.addMetadata(outboundMetadata); }