[broker-30] Implement delivering retained messages #54
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
JavaSaBr
reviewed
Nov 19, 2025
model/src/main/java/javasabr/mqtt/model/topic/tree/ConcurrentTopicTree.java
Outdated
Show resolved
Hide resolved
model/src/main/java/javasabr/mqtt/model/topic/tree/TopicMessageNode.java
Outdated
Show resolved
Hide resolved
|
# Conflicts: # model/src/main/java/javasabr/mqtt/model/subscriber/tree/ConcurrentRetainedMessageTree.java # model/src/main/java/javasabr/mqtt/model/subscriber/tree/ConcurrentSubscriberTree.java # model/src/main/java/javasabr/mqtt/model/subscriber/tree/RetainedMessageNode.java # model/src/main/java/javasabr/mqtt/model/subscriber/tree/SubscriberNode.java # model/src/main/java/javasabr/mqtt/model/subscriber/tree/SubscriberTreeBase.java # model/src/main/java/javasabr/mqtt/model/subscribtion/tree/ConcurrentSubscriptionTree.java # model/src/main/java/javasabr/mqtt/model/subscribtion/tree/TopicFilterNode.java # model/src/main/java/javasabr/mqtt/model/subscribtion/tree/TopicFilterTreeBase.java # model/src/main/java/javasabr/mqtt/model/topic/tree/ConcurrentTopicTree.java # model/src/main/java/javasabr/mqtt/model/topic/tree/TopicNode.java # model/src/main/java/javasabr/mqtt/model/topic/tree/TopicTreeBase.java # model/src/test/groovy/javasabr/mqtt/model/topic/tree/SubscriberTreeTest.groovy # service/src/main/java/javasabr/mqtt/service/impl/InMemorySubscriptionService.java
|
crazyrokr
force-pushed
the
feature-broker-30
branch
from
24664c4 to
01bac5b
Compare
|
|
|
# Conflicts: # application/src/main/java/javasabr/mqtt/broker/application/config/MqttBrokerSpringConfig.java # core-service/src/main/java/javasabr/mqtt/service/impl/InMemorySubscriptionService.java # core-service/src/test/groovy/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandlerTest.groovy
|
Test Coverage Report
|
# Conflicts: # core-service/src/main/java/javasabr/mqtt/service/SubscriptionService.java # core-service/src/main/java/javasabr/mqtt/service/impl/InMemorySubscriptionService.java # core-service/src/main/java/javasabr/mqtt/service/publish/handler/impl/AbstractMqttPublishOutMessageHandler.java # core-service/src/main/java/javasabr/mqtt/service/publish/handler/impl/PersistedMqttPublishOutMessageHandler.java # core-service/src/main/java/javasabr/mqtt/service/publish/handler/impl/Qos0MqttPublishOutMessageHandler.java # core-service/src/main/java/javasabr/mqtt/service/publish/handler/impl/Qos1MqttPublishOutMessageHandler.java # core-service/src/main/java/javasabr/mqtt/service/publish/handler/impl/Qos2MqttPublishOutMessageHandler.java
# Conflicts: # core-service/src/main/java/javasabr/mqtt/service/publish/handler/impl/TrackableMqttPublishOutMessageHandler.java
JavaSaBr
reviewed
Dec 8, 2025
| publishReceivingService, | ||
| messageOutFactoryService, | ||
| topicService); | ||
| return new PublishMqttInMessageHandler(publishReceivingService, messageOutFactoryService, topicService); |
| subscriptionService, | ||
| messageOutFactoryService, | ||
| topicService); | ||
| return new UnsubscribeMqttInMessageHandler(subscriptionService, messageOutFactoryService, topicService); |
| env.getProperty("mqtt.external.connection.max.string.length", int.class, MqttProperties.MAXIMUM_STRING_LENGTH), | ||
| env.getProperty("mqtt.external.connection.max.binary.size", int.class, MqttProperties.MAXIMUM_BINARY_SIZE), | ||
| env.getProperty("mqtt.external.connection.max.topic.levels", int.class, MqttProperties.MAXIMUM_TOPIC_LEVELS), | ||
| env.getProperty("mqtt.external.connection.min.keep.alive", int.class, MqttProperties.SERVER_KEEP_ALIVE_DEFAULT), |
|
|
||
| PublishHandlingResult startDelivering(Publish publish, SingleSubscriber subscriber); | ||
|
|
||
| Array<PublishHandlingResult> deliverRetainedMessages(SingleSubscriber subscriber); |
Owner
There was a problem hiding this comment.
PublishDeliveringService is responsible only for delivering a publish to a user. That is it.
I think you need to have a separated service like "RetainMessagesService" which will have a topic tree + with retain messages (instead of subscribers) and will use 'PublishDeliveringService' to deliver retain messages
| import javasabr.rlib.collections.dictionary.LockableRefToRefDictionary; | ||
| import org.jspecify.annotations.Nullable; | ||
|
|
||
| public abstract class AbstractTrieNode<T> { |
Owner
There was a problem hiding this comment.
looks like typo -> AbstractTreeNode
| return; | ||
| } | ||
| if (level == lastLevel) { | ||
| if (level == lastLevel || TopicFilter.MULTI_LEVEL_WILDCARD.equals(segment)) { |
| } else if (level < lastLevel) { | ||
| subscriberNode.matchesTo(level + 1, topicName, lastLevel, result); | ||
| } | ||
| collectMatchingSubscribers(topicName.segment(level), level, topicName, lastLevel, container); |
Owner
There was a problem hiding this comment.
so you returned the old way which I specially removed :D
|
|
||
| if (existeQos.ordinal() < candidateQos.ordinal()) { | ||
| QoS existedQos = result | ||
| .get(found) |
| return ArrayFactory.mutableArray(RetainedMessageNode.class); | ||
| } | ||
|
|
||
| final AtomicReference<@Nullable Publish> retainedMessage = new AtomicReference<>(); |
Owner
There was a problem hiding this comment.
we can have only 1 message per topic? I think here should be a list
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Initial implementation of retain message feature