Merge pull request #48 from ozangunalp/future_compatibility_quarkus_3.7

Ensure future compatibility with Quarkus 3.7
SolaceLabs · Feb 1, 2024 · 612442b · 612442b
2 parents 345151d + 619e716
commit 612442b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,6 +40,7 @@
     <assertj-core.version>3.24.2</assertj-core.version>
     <weld.version>5.1.2.Final</weld.version>
     <testcontainers-solace.version>1.18.3</testcontainers-solace.version>
+    <slf4j-log4j12.version>2.0.7</slf4j-log4j12.version>
   </properties>
 
   <dependencyManagement>
@@ -76,6 +77,12 @@
         <version>${assertj-core.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j-log4j12.version}</version>
+        <scope>test</scope>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>

diff --git a/quarkus-solace-client/runtime/pom.xml b/quarkus-solace-client/runtime/pom.xml
@@ -31,6 +31,12 @@
     </dependency>
   </dependencies>
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>

diff --git a/quarkus-solace-messaging-connector/runtime/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml
@@ -139,6 +139,12 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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
@@ -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<Message<String>> publishMessage() {
      * @param p
      */
     @Incoming("hello-in")
-    @Acknowledgment(Acknowledgment.Strategy.MANUAL)
-    CompletionStage<Void> 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<Void> 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);
     }