[broker-30] Implement delivering retained messages #54

crazyrokr · 2025-11-19T13:31:38Z

Initial implementation of retain message feature

3 MQTT Control Packets
└ 3.3 PUBLISH – Publish message
└ 3.3.1 PUBLISH Fixed Header
└ 3.3.1.3 RETAIN

If a client publishes a message with RETAIN flag, then the message is retained within the corresponding topic name
If a client subscribes to a topic filter, then all retained messages within topic names matching the topic filter are automatically released to the client
If during the releasing of retained messages a target subscription has retainAsPublished=0 then RETAIN flag is set to 0 in the forwarder publish message

model/src/main/java/javasabr/mqtt/model/topic/tree/ConcurrentTopicTree.java

model/src/main/java/javasabr/mqtt/model/topic/TopicFilter.java

model/src/main/java/javasabr/mqtt/model/topic/tree/TopicMessageNode.java

# 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

# 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

github-actions · 2025-12-01T19:42:34Z

Test Coverage Report

Overall Project	84.39% `-0.22%`	🍏
Files changed	95.74%	🍏

File	Coverage
SubscriptionResult.java	100%	🍏
ConcurrentRetainedMessageTree.java	100%	🍏
InMemorySubscriptionService.java	100%	🍏
SharedTopicFilter.java	100%	🍏
SubscriptionService.java	100%	🍏
SubscriberTreeBase.java	100%	🍏
SubscriberNode.java	100%	🍏
Qos0MqttPublishOutMessageHandler.java	100%	🍏
TrackableMqttPublishInMessageHandler.java	100%	🍏
SubscribeMqttInMessageHandler.java	99.77% `-0.23%`	🍏
Publish.java	98.95%	🍏
Subscription.java	98.25% `-1.75%`	🍏
RetainedMessageNode.java	97.66% `-2.34%`	🍏
AbstractTrieNode.java	96.55% `-3.45%`	🍏
AbstractTopic.java	94%	🍏
QoS.java	91.57% `-8.43%`	❌
MqttBrokerSpringConfig.java	90.63%	🍏
DefaultPublishDeliveringService.java	84.47%	🍏
Qos1MqttPublishInMessageHandler.java	80.6%	🍏
InMemoryRetainMessageService.java	78.57% `-21.43%`	🍏
Qos2MqttPublishInMessageHandler.java	66.46% `-3.66%`	🍏
AbstractMqttPublishInMessageHandler.java	63.14% `-1.57%`	🍏
AbstractMqttPublishOutMessageHandler.java	62.16%	🍏
Qos0MqttPublishInMessageHandler.java	52.5%	🍏

# 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

…broker-30

core-service/src/main/java/javasabr/mqtt/service/RetainMessageService.java

core-service/src/main/java/javasabr/mqtt/service/impl/InMemorySubscriptionService.java

.../src/main/java/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandler.java

...ain/java/javasabr/mqtt/service/publish/handler/impl/AbstractMqttPublishInMessageHandler.java

model/src/main/java/javasabr/mqtt/model/subscriber/tree/ConcurrentSubscriberTree.java

model/src/main/java/javasabr/mqtt/model/subscription/SubscriptionResult.java

model/src/main/java/javasabr/mqtt/model/topic/AbstractTopic.java

model/src/main/java/javasabr/mqtt/model/topic/SharedTopicFilter.java

…adyExisted

.../src/main/java/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandler.java

...t/groovy/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandlerTest.groovy

model/src/main/java/javasabr/mqtt/model/topic/tree/RetainedMessageNode.java

acl-groovy-dsl/src/main/resources/acl.gdsl

.../src/main/java/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandler.java

# Conflicts: # acl-groovy-dsl/src/main/resources/acl.gdsl

[broker-30] Implement delivering retained messages

26129f5

JavaSaBr reviewed Nov 19, 2025

View reviewed changes

JavaSaBr assigned crazyrokr Nov 19, 2025

crazyrokr added 3 commits November 19, 2025 19:05

[broker-30] Rewrite retained messages collecting

c6ada4d

[broker-30] Cleanup code after merge

01bac5b

crazyrokr force-pushed the feature-broker-30 branch from 24664c4 to 01bac5b Compare November 19, 2025 20:50

crazyrokr and others added 5 commits November 20, 2025 08:15

[broker-30] Fix corner cases in retained messages

c903510

[broker-30] Handle SubscribeRetainHandling

e1f5c2a

[broker-30] Fix build

a1b87dd

Merge branch 'develop' into feature-broker-30

fd848eb

crazyrokr added 3 commits December 2, 2025 23:56

[broker-30] SubscriberNode refactoring

be8070b

[broker-30] Revert wrong access level modifier

0c219dd

[broker-30] Avoid tree branch locking

62900ca

crazyrokr linked an issue Dec 5, 2025 that may be closed by this pull request

Implement Retained Messages #30

Closed

crazyrokr added 3 commits December 6, 2025 15:13

[broker-30] Introduce AbstractTrieNode

7314ed1

[broker-30] Remove redundant code from SubscriberNode

901e865

crazyrokr marked this pull request as ready for review December 7, 2025 14:18

crazyrokr added 2 commits December 7, 2025 16:10

[broker-30] Revert redundant changes

cc91db2

[broker-30] Improve AbstractTrieNode

42af014

crazyrokr requested a review from JavaSaBr December 7, 2025 16:04

crazyrokr added enhancement New feature or request core labels Dec 7, 2025

crazyrokr added 4 commits December 7, 2025 18:29

[broker-30] Implement retainAsPublished support

b1aa456

[broker-30] Update debug message

f2f2f67

[broker-30] Small refactoring

bf837eb

[broker-30] Avoid double message retaining

cc08339

crazyrokr requested a review from JavaSaBr December 13, 2025 09:18

crazyrokr added 11 commits December 14, 2025 19:46

Merge branch 'develop' into feature-broker-30

a568d4f

[broker-30] Move logic from subscription service to subscription handler

94b7b17

[broker-30] Separate addRetainedMessage and removeRetainedMessage API

e7c01a9

[broker-30] Use ArrayBuilder in getRetainedMessages API

d6f66eb

Merge remote-tracking branch 'origin/feature-broker-30' into feature-…

bc83b99

…broker-30

[broker-30] Reduce memory allocation in runtime

595508e

[broker-30] Apply formatting

c8b63fd

[broker-30] Remove redundant method

b08fedb

[broker-30] Refactoring

1d2f71f

[broker-30] Remove redundant method

5bbbb84

Merge branch 'develop' into feature-broker-30

9dad98a

JavaSaBr reviewed Dec 17, 2025

View reviewed changes

crazyrokr added 4 commits December 18, 2025 18:47

[broker-30] Exclude SingleSubscriber from publish delivering process

24abf4d

[broker-30] Rename registerRetainMessage to retain

a0b4c30

[broker-30] Return previousSubscription instead of isSubscriptionAlre…

561d970

…adyExisted

[broker-30] Rename lookupRetainedMessages to findRetainedMessages

b2f4470

crazyrokr requested a review from JavaSaBr December 20, 2025 00:57

JavaSaBr reviewed Dec 21, 2025

View reviewed changes

crazyrokr added 3 commits December 21, 2025 13:52

[broker-30] Update test

c37bc58

[broker-30] Extract isSingleLevelWildcard and isMultiLevelWildcard

bc4efa6

[broker-30] Avoid duplicates during retained messages sending

d0686c4

crazyrokr requested a review from JavaSaBr December 21, 2025 15:09

JavaSaBr reviewed Dec 23, 2025

View reviewed changes

acl-groovy-dsl/src/main/resources/acl.gdsl Outdated Show resolved Hide resolved

.../src/main/java/javasabr/mqtt/service/message/handler/impl/SubscribeMqttInMessageHandler.java Outdated Show resolved Hide resolved

crazyrokr added 2 commits December 24, 2025 20:54

Merge branch 'develop' into feature-broker-30

e4c7b64

# Conflicts: # acl-groovy-dsl/src/main/resources/acl.gdsl

[broker-30] Replace var with Array<Publish>

345ec63

crazyrokr requested a review from JavaSaBr December 24, 2025 19:58

JavaSaBr approved these changes Dec 25, 2025

View reviewed changes

crazyrokr merged commit ef8c634 into develop Dec 25, 2025
6 checks passed

crazyrokr deleted the feature-broker-30 branch December 25, 2025 11:23

[broker-30] Implement delivering retained messages #54

[broker-30] Implement delivering retained messages #54

Uh oh!

Conversation

crazyrokr commented Nov 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Initial implementation of retain message feature

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Coverage Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

crazyrokr commented Nov 19, 2025 •

edited

Loading

github-actions bot commented Dec 1, 2025 •

edited

Loading