Merge pull request #81 from ctomc/updates

Bump versions

Author: ctomc

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>44</version>
+        <version>48</version>
         <relativePath />
     </parent>
     <groupId>org.iris-events</groupId>
@@ -29,8 +29,8 @@
         <maven.compiler.release>21</maven.compiler.release>
         <maven.compiler.parameters>true</maven.compiler.parameters>
         <version.awaitility>4.2.0</version.awaitility>
-        <quarkus.platform.version>3.9.2</quarkus.platform.version>
-        <version.iris>6.1.0</version.iris>
+        <quarkus.platform.version>3.17.7</quarkus.platform.version>
+        <version.iris>6.1.8</version.iris>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
     <dependencyManagement>

src/main/java/org/iris_events/subscription/Consumer.java

@@ -4,7 +4,6 @@
 import static org.iris_events.subscription.exception.ErrorCode.BAD_REQUEST;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Set;
 
 import org.iris_events.exception.BadPayloadException;
@@ -122,7 +121,6 @@ public void resourceUpdated(final ResourceMessage resourceMessage) throws IOExce
                     .exchangeType(ExchangeType.TOPIC)
                     .routingKey(routingKey)
                     .scope(Scope.SESSION)
-                    .sessionId(subscription.sessionId())
                     .subscriptionId(subscription.id())
                     .build();
             producer.sendResourceMessage(resourceType, resourceId, payloadAsBytes, routingDetails);
@@ -152,7 +150,6 @@ private void subscribe(final String resourceType, final String resourceId) throw
                     .exchangeType(ExchangeType.TOPIC)
                     .routingKey(routingKey)
                     .scope(Scope.SESSION)
-                    .sessionId(subscription.sessionId())
                     .subscriptionId(subscription.id())
                     .build();
             producer.sendResourceMessage(resourceType, resourceId, snapshot.message(), routingDetails);
@@ -171,7 +168,6 @@ private void sendSnapshotRequested(final Subscription subscription) throws IOExc
                 .exchangeType(ExchangeType.TOPIC)
                 .routingKey(resourceType)
                 .scope(Scope.INTERNAL)
-                .sessionId(subscription.sessionId())
                 .subscriptionId(subscription.id())
                 .build();
         final var snapshotRequestedMessage = new SnapshotRequested(resourceType, resourceId);

src/test/java/org/iris_events/subscription/ConsumerTest.java

@@ -97,7 +97,6 @@ void resourceUpdated() throws IOException {
                     .exchangeType(ExchangeType.TOPIC)
                     .routingKey(routingKey)
                     .scope(Scope.SESSION)
-                    .sessionId(sessionId)
                     .subscriptionId(subscriptionId)
                     .build();
             final var payload = "a";
@@ -182,7 +181,6 @@ void snapshotRequested() throws IOException {
                     .exchangeType(ExchangeType.TOPIC)
                     .routingKey(RESOURCE_TYPE)
                     .scope(Scope.INTERNAL)
-                    .sessionId(sessionId)
                     .subscriptionId(subscriptionId)
                     .build();
             final var snapshotRequested = new SnapshotRequested(RESOURCE_TYPE, RESOURCE_ID);

src/test/java/org/iris_events/subscription/SubscriptionIntegrationTest.java

@@ -3,7 +3,6 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
@@ -81,7 +80,6 @@ public void shouldSubscribeSuccessfully() throws Exception {
                 .exchangeType(ExchangeType.TOPIC)
                 .routingKey(resourceType)
                 .scope(Scope.INTERNAL)
-                .sessionId(subscription.sessionId())
                 .subscriptionId(subscription.id())
                 .build();
 
@@ -98,7 +96,6 @@ public void shouldSubscribeSuccessfully() throws Exception {
                 .exchangeType(ExchangeType.TOPIC)
                 .routingKey(routingKey)
                 .scope(Scope.SESSION)
-                .sessionId(subscription.sessionId())
                 .subscriptionId(subscription.id())
                 .build();
         inOrder.verify(eventProducer)
@@ -121,7 +118,6 @@ public void shouldReturnCachedSnapshotImmediately() throws Exception {
                 .exchangeType(ExchangeType.TOPIC)
                 .routingKey(routingKey)
                 .scope(Scope.SESSION)
-                .sessionId(subscription.sessionId())
                 .subscriptionId(subscription.id())
                 .build();