Skip to content

Update iris version and add sessionId to routing details #85

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

Merged
gasper-vrhovsek merged 1 commit into from
Mar 27, 2025
Merged

Update iris version and add sessionId to routing details #85

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<maven.compiler.parameters>true</maven.compiler.parameters>
<version.awaitility>4.2.0</version.awaitility>
<quarkus.platform.version>3.17.7</quarkus.platform.version>
<version.iris>6.2.3</version.iris>
<version.iris>6.2.4</version.iris>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencyManagement>
Expand Down
55 changes: 27 additions & 28 deletions src/main/java/org/iris_events/subscription/Consumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,14 @@
import java.io.IOException;
import java.util.Set;

import org.iris_events.exception.BadPayloadException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.fasterxml.jackson.databind.ObjectMapper;

import org.iris_events.annotations.ExchangeType;
import org.iris_events.annotations.MessageHandler;
import org.iris_events.annotations.Scope;
import org.iris_events.common.Exchanges;
import org.iris_events.common.MessagingHeaders;
import org.iris_events.common.message.ResourceMessage;
import org.iris_events.context.EventContext;
import org.iris_events.exception.BadPayloadException;
import org.iris_events.producer.RoutingDetails;
import org.iris_events.subscription.collection.RedisSnapshotCollection;
import org.iris_events.subscription.collection.Snapshot;
Expand All @@ -31,7 +26,10 @@
import org.iris_events.subscription.events.Unsubscribed;
import org.iris_events.subscription.model.Resource;
import org.iris_events.subscription.model.Subscription;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.quarkus.runtime.StartupEvent;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
Expand Down Expand Up @@ -101,7 +99,7 @@ public void resourceUpdated(final ResourceMessage resourceMessage) throws IOExce
final var resourceId = resourceMessage.resourceId();
final var payloadAsBytes = objectMapper.writeValueAsBytes(resourceMessage.payload());
final var eventName = eventContext.getHeaderValue(MessagingHeaders.Message.EVENT_TYPE)
.orElseThrow(() -> new RuntimeException("Missing required event type header!"));
.orElseThrow(() -> new RuntimeException("Missing required event type header!"));
final var routingKey = String.format("%s.%s", eventName, Exchanges.SESSION.getValue());
final var snapshot = new Snapshot(eventName, routingKey, payloadAsBytes);

Expand All @@ -116,13 +114,14 @@ public void resourceUpdated(final ResourceMessage resourceMessage) throws IOExce

subscriptions.forEach(subscription -> {
final var routingDetails = new RoutingDetails.Builder()
.eventName(eventName)
.exchange(Exchanges.SESSION.getValue())
.exchangeType(ExchangeType.TOPIC)
.routingKey(routingKey)
.scope(Scope.SESSION)
.subscriptionId(subscription.id())
.build();
.eventName(eventName)
.exchange(Exchanges.SESSION.getValue())
.exchangeType(ExchangeType.TOPIC)
.routingKey(routingKey)
.scope(Scope.SESSION)
.subscriptionId(subscription.id())
.sessionId(subscription.sessionId())
.build();
producer.sendResourceMessage(resourceType, resourceId, payloadAsBytes, routingDetails);
});
}
Expand All @@ -145,13 +144,13 @@ private void subscribe(final String resourceType, final String resourceId) throw
final var routingKey = snapshot.routingKey();

final var routingDetails = new RoutingDetails.Builder()
.eventName(eventName)
.exchange(Exchanges.SESSION.getValue())
.exchangeType(ExchangeType.TOPIC)
.routingKey(routingKey)
.scope(Scope.SESSION)
.subscriptionId(subscription.id())
.build();
.eventName(eventName)
.exchange(Exchanges.SESSION.getValue())
.exchangeType(ExchangeType.TOPIC)
.routingKey(routingKey)
.scope(Scope.SESSION)
.subscriptionId(subscription.id())
.build();
producer.sendResourceMessage(resourceType, resourceId, snapshot.message(), routingDetails);
}

Expand All @@ -163,13 +162,13 @@ private void sendSnapshotRequested(final Subscription subscription) throws IOExc
final var resourceId = subscription.resourceId();
final var exchangeName = Exchanges.SNAPSHOT_REQUESTED.getValue();
final var routingDetails = new RoutingDetails.Builder()
.eventName(exchangeName)
.exchange(exchangeName)
.exchangeType(ExchangeType.TOPIC)
.routingKey(resourceType)
.scope(Scope.INTERNAL)
.subscriptionId(subscription.id())
.build();
.eventName(exchangeName)
.exchange(exchangeName)
.exchangeType(ExchangeType.TOPIC)
.routingKey(resourceType)
.scope(Scope.INTERNAL)
.subscriptionId(subscription.id())
.build();
final var snapshotRequestedMessage = new SnapshotRequested(resourceType, resourceId);
final var payloadAsBytes = objectMapper.writeValueAsBytes(snapshotRequestedMessage);
producer.sendResourceMessage(resourceType, resourceId, payloadAsBytes, routingDetails);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ quarkus.otel.enabled=false
%prod.quarkus.otel.enabled=true

quarkus.log.console.json=false
%prod.quarkus.log.console.json=true
%prod.quarkus.log.console.json=true
Loading