Merge pull request #55 from JavaSaBr/feature-broker-30-move-class

[broker-30] Rename TopicNode to SubscriberNode etc.

Author: crazyrokr

…odel/topic/tree/ConcurrentTopicTree.java …riber/tree/ConcurrentSubscriberTree.javamodel/src/main/java/javasabr/mqtt/model/topic/tree/ConcurrentTopicTree.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/ConcurrentSubscriberTree.java model/src/main/java/javasabr/mqtt/model/topic/tree/ConcurrentTopicTree.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/ConcurrentSubscriberTree.java

@@ -1,4 +1,4 @@
-package javasabr.mqtt.model.topic.tree;
+package javasabr.mqtt.model.subscriber.tree;
 
 import javasabr.mqtt.model.subscriber.SingleSubscriber;
 import javasabr.mqtt.model.subscribtion.Subscription;
@@ -13,12 +13,12 @@
 import org.jspecify.annotations.Nullable;
 
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-public class ConcurrentTopicTree implements ThreadSafe {
+public class ConcurrentSubscriberTree implements ThreadSafe {
 
-  TopicNode rootNode;
+  SubscriberNode rootNode;
 
-  public ConcurrentTopicTree() {
-    this.rootNode = new TopicNode();
+  public ConcurrentSubscriberTree() {
+    this.rootNode = new SubscriberNode();
   }
 
   @Nullable

…abr/mqtt/model/topic/tree/TopicNode.java …odel/subscriber/tree/SubscriberNode.javamodel/src/main/java/javasabr/mqtt/model/topic/tree/TopicNode.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/SubscriberNode.java model/src/main/java/javasabr/mqtt/model/topic/tree/TopicNode.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/SubscriberNode.java

@@ -1,4 +1,4 @@
-package javasabr.mqtt.model.topic.tree;
+package javasabr.mqtt.model.subscriber.tree;
 
 import java.util.function.Supplier;
 import javasabr.mqtt.base.util.DebugUtils;
@@ -22,16 +22,16 @@
 @Getter(AccessLevel.PACKAGE)
 @Accessors(fluent = true, chain = false)
 @FieldDefaults(level = AccessLevel.PRIVATE)
-class TopicNode extends TopicTreeBase {
+class SubscriberNode extends SubscriberTreeBase {
 
-  private final static Supplier<TopicNode> TOPIC_NODE_FACTORY = TopicNode::new;
+  private final static Supplier<SubscriberNode> SUBSCRIBER_NODE_FACTORY = SubscriberNode::new;
 
   static {
     DebugUtils.registerIncludedFields("childNodes", "subscribers");
   }
 
   @Nullable
-  volatile LockableRefToRefDictionary<String, TopicNode> childNodes;
+  volatile LockableRefToRefDictionary<String, SubscriberNode> childNodes;
   @Nullable
   volatile LockableArray<Subscriber> subscribers;
 
@@ -43,15 +43,15 @@ public SingleSubscriber subscribe(int level, SubscriptionOwner owner, Subscripti
     if (level == topicFilter.levelsCount()) {
       return addSubscriber(getOrCreateSubscribers(), owner, subscription, topicFilter);
     }
-    TopicNode childNode = getOrCreateChildNode(topicFilter.segment(level));
+    SubscriberNode childNode = getOrCreateChildNode(topicFilter.segment(level));
     return childNode.subscribe(level + 1, owner, subscription, topicFilter);
   }
 
   public boolean unsubscribe(int level, SubscriptionOwner owner, TopicFilter topicFilter) {
     if (level == topicFilter.levelsCount()) {
       return removeSubscriber(subscribers(), owner, topicFilter);
     }
-    TopicNode childNode = getOrCreateChildNode(topicFilter.segment(level));
+    SubscriberNode childNode = getOrCreateChildNode(topicFilter.segment(level));
     return childNode.unsubscribe(level + 1, owner, topicFilter);
   }
 
@@ -67,14 +67,14 @@ private void exactlyTopicMatch(
       int lastLevel,
       MutableArray<SingleSubscriber> result) {
     String segment = topicName.segment(level);
-    TopicNode topicNode = childNode(segment);
-    if (topicNode == null) {
+    SubscriberNode subscriberNode = childNode(segment);
+    if (subscriberNode == null) {
       return;
     }
     if (level == lastLevel) {
-      appendSubscribersTo(result, topicNode);
+      appendSubscribersTo(result, subscriberNode);
     } else if (level < lastLevel) {
-      topicNode.matchesTo(level + 1, topicName, lastLevel, result);
+      subscriberNode.matchesTo(level + 1, topicName, lastLevel, result);
     }
   }
 
@@ -83,47 +83,47 @@ private void singleWildcardTopicMatch(
       TopicName topicName,
       int lastLevel,
       MutableArray<SingleSubscriber> result) {
-    TopicNode topicNode = childNode(TopicFilter.SINGLE_LEVEL_WILDCARD);
-    if (topicNode == null) {
+    SubscriberNode subscriberNode = childNode(TopicFilter.SINGLE_LEVEL_WILDCARD);
+    if (subscriberNode == null) {
       return;
     }
     if (level == lastLevel) {
-      appendSubscribersTo(result, topicNode);
+      appendSubscribersTo(result, subscriberNode);
     } else if (level < lastLevel) {
-      topicNode.matchesTo(level + 1, topicName, lastLevel, result);
+      subscriberNode.matchesTo(level + 1, topicName, lastLevel, result);
     }
   }
 
   private void multiWildcardTopicMatch(MutableArray<SingleSubscriber> result) {
-    TopicNode topicNode = childNode(TopicFilter.MULTI_LEVEL_WILDCARD);
-    if (topicNode != null) {
-      appendSubscribersTo(result, topicNode);
+    SubscriberNode subscriberNode = childNode(TopicFilter.MULTI_LEVEL_WILDCARD);
+    if (subscriberNode != null) {
+      appendSubscribersTo(result, subscriberNode);
     }
   }
 
-  private TopicNode getOrCreateChildNode(String segment) {
-    LockableRefToRefDictionary<String, TopicNode> childNodes = getOrCreateChildNodes();
+  private SubscriberNode getOrCreateChildNode(String segment) {
+    LockableRefToRefDictionary<String, SubscriberNode> childNodes = getOrCreateChildNodes();
     long stamp = childNodes.readLock();
     try {
-      TopicNode topicNode = childNodes.get(segment);
-      if (topicNode != null) {
-        return topicNode;
+      SubscriberNode subscriberNode = childNodes.get(segment);
+      if (subscriberNode != null) {
+        return subscriberNode;
       }
     } finally {
       childNodes.readUnlock(stamp);
     }
     stamp = childNodes.writeLock();
     try {
       //noinspection DataFlowIssue
-      return childNodes.getOrCompute(segment, TOPIC_NODE_FACTORY);
+      return childNodes.getOrCompute(segment, SUBSCRIBER_NODE_FACTORY);
     } finally {
       childNodes.writeUnlock(stamp);
     }
   }
 
   @Nullable
-  private TopicNode childNode(String segment) {
-    LockableRefToRefDictionary<String, TopicNode> childNodes = childNodes();
+  private SubscriberNode childNode(String segment) {
+    LockableRefToRefDictionary<String, SubscriberNode> childNodes = childNodes();
     if (childNodes == null) {
       return null;
     }
@@ -135,7 +135,7 @@ private TopicNode childNode(String segment) {
     }
   }
 
-  private LockableRefToRefDictionary<String, TopicNode> getOrCreateChildNodes() {
+  private LockableRefToRefDictionary<String, SubscriberNode> getOrCreateChildNodes() {
     if (childNodes == null) {
       synchronized (this) {
         if (childNodes == null) {

…mqtt/model/topic/tree/TopicTreeBase.java …/subscriber/tree/SubscriberTreeBase.javamodel/src/main/java/javasabr/mqtt/model/topic/tree/TopicTreeBase.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/SubscriberTreeBase.java model/src/main/java/javasabr/mqtt/model/topic/tree/TopicTreeBase.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/SubscriberTreeBase.java

@@ -1,4 +1,4 @@
-package javasabr.mqtt.model.topic.tree;
+package javasabr.mqtt.model.subscriber.tree;
 
 import java.util.Objects;
 import javasabr.mqtt.model.QoS;
@@ -18,7 +18,7 @@
 
 @RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PROTECTED, makeFinal = true)
-abstract class TopicTreeBase {
+abstract class SubscriberTreeBase {
 
   /**
    * @return previous subscriber with the same owner
@@ -66,7 +66,7 @@ private static void addSharedSubscriber(
     String group = sharedTopicFilter.shareName();
     SharedSubscriber sharedSubscriber = (SharedSubscriber) subscribers
         .iterations()
-        .findAny(group, TopicTreeBase::isSharedSubscriberWithGroup);
+        .findAny(group, SubscriberTreeBase::isSharedSubscriberWithGroup);
 
     if (sharedSubscriber == null) {
       sharedSubscriber = new SharedSubscriber(sharedTopicFilter);
@@ -76,8 +76,8 @@ private static void addSharedSubscriber(
     sharedSubscriber.addSubscriber(new SingleSubscriber(owner, subscription));
   }
 
-  protected static void appendSubscribersTo(MutableArray<SingleSubscriber> result, TopicNode topicNode) {
-    LockableArray<Subscriber> subscribers = topicNode.subscribers();
+  protected static void appendSubscribersTo(MutableArray<SingleSubscriber> result, SubscriberNode subscriberNode) {
+    LockableArray<Subscriber> subscribers = subscriberNode.subscribers();
     if (subscribers == null) {
       return;
     }
@@ -125,7 +125,7 @@ private static boolean removeSharedSubscriber(
     String group = sharedTopicFilter.shareName();
     SharedSubscriber sharedSubscriber = (SharedSubscriber) subscribers
         .iterations()
-        .findAny(group, TopicTreeBase::isSharedSubscriberWithGroup);
+        .findAny(group, SubscriberTreeBase::isSharedSubscriberWithGroup);
     if (sharedSubscriber != null) {
       boolean removed = sharedSubscriber.removeSubscriberWithOwner(owner);
       if (sharedSubscriber.isEmpty()) {

…/mqtt/model/topic/tree/package-info.java …/model/subscriber/tree/package-info.javamodel/src/main/java/javasabr/mqtt/model/topic/tree/package-info.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/package-info.java model/src/main/java/javasabr/mqtt/model/topic/tree/package-info.java renamed to model/src/main/java/javasabr/mqtt/model/subscriber/tree/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package javasabr.mqtt.model.topic.tree;
+package javasabr.mqtt.model.subscriber.tree;
 
 import org.jspecify.annotations.NullMarked;