Skip to content

Commit 01bac5b

Browse files
committed
[broker-30] Cleanup code after merge
1 parent 94b32db commit 01bac5b

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.jspecify.annotations.Nullable;
1414

1515
@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
16-
1716
public class ConcurrentSubscriberTree implements ThreadSafe {
1817

1918
SubscriberNode rootNode;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import javasabr.mqtt.base.util.DebugUtils;
55
import javasabr.mqtt.model.subscriber.SingleSubscriber;
66
import javasabr.mqtt.model.subscriber.Subscriber;
7-
import javasabr.mqtt.model.subscriber.tree.SubscriberTreeBase;
87
import javasabr.mqtt.model.subscribtion.Subscription;
98
import javasabr.mqtt.model.subscribtion.SubscriptionOwner;
109
import javasabr.mqtt.model.topic.TopicFilter;
@@ -44,7 +43,6 @@ public SingleSubscriber subscribe(int level, SubscriptionOwner owner, Subscripti
4443
if (level == topicFilter.levelsCount()) {
4544
return addSubscriber(getOrCreateSubscribers(), owner, subscription, topicFilter);
4645
}
47-
4846
SubscriberNode childNode = getOrCreateChildNode(topicFilter.segment(level));
4947
return childNode.subscribe(level + 1, owner, subscription, topicFilter);
5048
}
@@ -53,7 +51,6 @@ public boolean unsubscribe(int level, SubscriptionOwner owner, TopicFilter topic
5351
if (level == topicFilter.levelsCount()) {
5452
return removeSubscriber(subscribers(), owner, topicFilter);
5553
}
56-
5754
SubscriberNode childNode = getOrCreateChildNode(topicFilter.segment(level));
5855
return childNode.unsubscribe(level + 1, owner, topicFilter);
5956
}
@@ -86,7 +83,6 @@ private void singleWildcardTopicMatch(
8683
TopicName topicName,
8784
int lastLevel,
8885
MutableArray<SingleSubscriber> result) {
89-
9086
SubscriberNode subscriberNode = childNode(TopicFilter.SINGLE_LEVEL_WILDCARD);
9187
if (subscriberNode == null) {
9288
return;
@@ -99,7 +95,6 @@ private void singleWildcardTopicMatch(
9995
}
10096

10197
private void multiWildcardTopicMatch(MutableArray<SingleSubscriber> result) {
102-
10398
SubscriberNode subscriberNode = childNode(TopicFilter.MULTI_LEVEL_WILDCARD);
10499
if (subscriberNode != null) {
105100
appendSubscribersTo(result, subscriberNode);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
public class TopicFilter extends AbstractTopic {
1212

1313
public static final String MULTI_LEVEL_WILDCARD = "#";
14-
public static final char MULTI_LEVEL_WILDCARD_CHAR = MULTI_LEVEL_WILDCARD.charAt(0);
14+
public static final char MULTI_LEVEL_WILDCARD_CHAR = '#';
1515
public static final String SINGLE_LEVEL_WILDCARD = "+";
16-
public static final char SINGLE_LEVEL_WILDCARD_CHAR = SINGLE_LEVEL_WILDCARD.charAt(0);
16+
public static final char SINGLE_LEVEL_WILDCARD_CHAR = '+';
1717
public static final String SPECIAL = "$";
1818

1919
public static final TopicFilter INVALID_TOPIC_FILTER = new TopicFilter("$invalid$") {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@NullMarked
22
package javasabr.mqtt.model.topic.tree;
33

4-
import org.jspecify.annotations.NullMarked;
4+
import org.jspecify.annotations.NullMarked;

0 commit comments

Comments
 (0)