Renamed MqttSubscriptionFlows -> MqttSubscribedPublishFlows as this is more consistent: MqttIncomingPublishFlow(s) and MqttSubscribedPublishFlow(s))

Author: SgtSilvio

src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java

@@ -45,12 +45,12 @@
 @NotThreadSafe
 public class MqttIncomingPublishFlows {
 
-    private final @NotNull MqttSubscriptionFlows subscriptionFlows;
+    private final @NotNull MqttSubscribedPublishFlows subscribedFlows;
     private final @Nullable HandleList<MqttGlobalIncomingPublishFlow> @NotNull [] globalFlows;
 
     @Inject
-    MqttIncomingPublishFlows(final @NotNull MqttSubscriptionFlows subscriptionFlows) {
-        this.subscriptionFlows = subscriptionFlows;
+    MqttIncomingPublishFlows(final @NotNull MqttSubscribedPublishFlows subscribedFlows) {
+        this.subscribedFlows = subscribedFlows;
         //noinspection unchecked
         globalFlows = new HandleList[MqttGlobalPublishFilter.values().length];
     }
@@ -62,7 +62,7 @@ public void subscribe(
         final ImmutableList<MqttSubscription> subscriptions = subscribe.getSubscriptions();
         //noinspection ForLoopReplaceableByForEach
         for (int i = 0; i < subscriptions.size(); i++) {
-            subscriptionFlows.subscribe(subscriptions.get(i), subscriptionIdentifier, flow);
+            subscribedFlows.subscribe(subscriptions.get(i), subscriptionIdentifier, flow);
         }
     }
 
@@ -73,7 +73,7 @@ public void subAck(
         final ImmutableList<MqttSubscription> subscriptions = subscribe.getSubscriptions();
         final boolean countNotMatching = subscriptions.size() > reasonCodes.size();
         for (int i = 0; i < subscriptions.size(); i++) {
-            subscriptionFlows.suback(subscriptions.get(i).getTopicFilter(), subscriptionIdentifier,
+            subscribedFlows.suback(subscriptions.get(i).getTopicFilter(), subscriptionIdentifier,
                     countNotMatching || reasonCodes.get(i).isError());
         }
     }
@@ -86,13 +86,13 @@ public void unsubscribe(
         final boolean allSuccess = reasonCodes == Mqtt3UnsubAckView.REASON_CODES_ALL_SUCCESS;
         for (int i = 0; i < topicFilters.size(); i++) {
             if (allSuccess || !reasonCodes.get(i).isError()) {
-                subscriptionFlows.unsubscribe(topicFilters.get(i));
+                subscribedFlows.unsubscribe(topicFilters.get(i));
             }
         }
     }
 
     void cancel(final @NotNull MqttSubscribedPublishFlow flow) {
-        subscriptionFlows.cancel(flow);
+        subscribedFlows.cancel(flow);
     }
 
     public void subscribeGlobal(final @NotNull MqttGlobalIncomingPublishFlow flow) {
@@ -126,7 +126,7 @@ void cancelGlobal(final @NotNull MqttGlobalIncomingPublishFlow flow) {
     void findMatching(
             final @NotNull MqttStatefulPublish publish, final @NotNull MqttMatchingPublishFlows matchingFlows) {
 
-        subscriptionFlows.findMatching(publish.stateless().getTopic(), matchingFlows);
+        subscribedFlows.findMatching(publish.stateless().getTopic(), matchingFlows);
         if (matchingFlows.subscriptionFound) {
             add(matchingFlows, globalFlows[MqttGlobalPublishFilter.SUBSCRIBED.ordinal()]);
         } else {
@@ -150,7 +150,7 @@ private static void add(
     }
 
     public void clear(final @NotNull Throwable cause) {
-        subscriptionFlows.clear(cause);
+        subscribedFlows.clear(cause);
         for (int i = 0; i < globalFlows.length; i++) {
             final HandleList<MqttGlobalIncomingPublishFlow> globalFlow = globalFlows[i];
             if (globalFlow != null) {
@@ -163,6 +163,6 @@ public void clear(final @NotNull Throwable cause) {
     }
 
     public @NotNull Map<@NotNull Integer, @NotNull List<@NotNull MqttSubscription>> getSubscriptions() {
-        return subscriptionFlows.getSubscriptions();
+        return subscribedFlows.getSubscriptions();
     }
 }

src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscriptionFlowTree.java src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java

@@ -35,12 +35,12 @@
  * @author Silvio Giebl
  */
 @NotThreadSafe
-public class MqttSubscriptionFlowTree implements MqttSubscriptionFlows {
+public class MqttSubscribedPublishFlowTree implements MqttSubscribedPublishFlows {
 
     private @Nullable TopicTreeNode rootNode;
 
     @Inject
-    MqttSubscriptionFlowTree() {}
+    MqttSubscribedPublishFlowTree() {}
 
     @Override
     public void subscribe(

src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscriptionFlows.java src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java

@@ -31,7 +31,7 @@
  * @author Silvio Giebl
  */
 @NotThreadSafe
-public interface MqttSubscriptionFlows {
+public interface MqttSubscribedPublishFlows {
 
     void subscribe(
             @NotNull MqttSubscription subscription, int subscriptionIdentifier,

src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientModule.java

@@ -17,8 +17,8 @@
 
 package com.hivemq.client.internal.mqtt.ioc;
 
-import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscriptionFlowTree;
-import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscriptionFlows;
+import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlowTree;
+import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlows;
 import dagger.Binds;
 import dagger.Module;
 import org.jetbrains.annotations.NotNull;
@@ -30,5 +30,6 @@
 abstract class ClientModule {
 
     @Binds
-    abstract @NotNull MqttSubscriptionFlows provideSubscriptionFlows(final @NotNull MqttSubscriptionFlowTree tree);
+    abstract @NotNull MqttSubscribedPublishFlows provideSubscribedPublishFlows(
+            final @NotNull MqttSubscribedPublishFlowTree tree);
 }

src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscriptionFlowTreeTest.java src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java

@@ -32,10 +32,10 @@
 /**
  * @author Silvio Giebl
  */
-class MqttSubscriptionFlowTreeTest extends MqttSubscriptionFlowsTest {
+class MqttSubscribedPublishFlowTreeTest extends MqttSubscribedPublishFlowsTest {
 
-    MqttSubscriptionFlowTreeTest() {
-        super(MqttSubscriptionFlowTree::new);
+    MqttSubscribedPublishFlowTreeTest() {
+        super(MqttSubscribedPublishFlowTree::new);
     }
 
     @ParameterizedTest

src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscriptionFlowsTest.java src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java

@@ -40,7 +40,7 @@
 /**
  * @author Silvio Giebl
  */
-abstract class MqttSubscriptionFlowsTest {
+abstract class MqttSubscribedPublishFlowsTest {
 
     public static class CsvToArray extends SimpleArgumentConverter {
 
@@ -52,10 +52,10 @@ public static class CsvToArray extends SimpleArgumentConverter {
         }
     }
 
-    private final @NotNull Supplier<MqttSubscriptionFlows> flowsSupplier;
-    @NotNull MqttSubscriptionFlows flows;
+    private final @NotNull Supplier<MqttSubscribedPublishFlows> flowsSupplier;
+    @NotNull MqttSubscribedPublishFlows flows;
 
-    MqttSubscriptionFlowsTest(final @NotNull Supplier<MqttSubscriptionFlows> flowsSupplier) {
+    MqttSubscribedPublishFlowsTest(final @NotNull Supplier<MqttSubscribedPublishFlows> flowsSupplier) {
         this.flowsSupplier = flowsSupplier;
     }