Re-order resubscribeIfSessionPresent

Author: Donnerbart

src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java

@@ -68,9 +68,9 @@ public class MqttClientConfig implements Mqtt5ClientConfig {
     private volatile @Nullable MqttClientConnectionConfig connectionConfig;
     private @NotNull MqttClientTransportConfigImpl currentTransportConfig;
     private @Nullable SslContext currentSslContext;
+    private boolean resubscribeIfSessionPresent;
     private boolean resubscribeIfSessionExpired;
     private boolean republishIfSessionExpired;
-    private boolean resubscribeIfSessionPresent;
 
     public MqttClientConfig(
             final @NotNull MqttVersion mqttVersion,
@@ -256,14 +256,6 @@ public void setCurrentSslContext(final @Nullable SslContext currentSslContext) {
         this.currentSslContext = currentSslContext;
     }
 
-    public boolean isResubscribeIfSessionExpired() {
-        return resubscribeIfSessionExpired;
-    }
-
-    public void setResubscribeIfSessionExpired(final boolean resubscribeIfSessionExpired) {
-        this.resubscribeIfSessionExpired = resubscribeIfSessionExpired;
-    }
-
     public boolean isResubscribeIfSessionPresent() {
         return resubscribeIfSessionPresent;
     }
@@ -272,6 +264,14 @@ public void setResubscribeIfSessionPresent(final boolean resubscribeIfSessionPre
         this.resubscribeIfSessionPresent = resubscribeIfSessionPresent;
     }
 
+    public boolean isResubscribeIfSessionExpired() {
+        return resubscribeIfSessionExpired;
+    }
+
+    public void setResubscribeIfSessionExpired(final boolean resubscribeIfSessionExpired) {
+        this.resubscribeIfSessionExpired = resubscribeIfSessionExpired;
+    }
+
     public boolean isRepublishIfSessionExpired() {
         return republishIfSessionExpired;
     }

src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java

@@ -173,9 +173,9 @@ private static void reconnect(
                     }
                 });
             }, reconnector.getDelay(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS);
+            clientConfig.setResubscribeIfSessionPresent(reconnector.isResubscribeIfSessionPresent());
             clientConfig.setResubscribeIfSessionExpired(reconnector.isResubscribeIfSessionExpired());
             clientConfig.setRepublishIfSessionExpired(reconnector.isRepublishIfSessionExpired());
-            clientConfig.setResubscribeIfSessionPresent(reconnector.isResubscribeIfSessionPresent());
             reconnector.afterOnDisconnected();
         } else {
             clientConfig.getRawState().set(DISCONNECTED);

src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java

@@ -42,9 +42,9 @@ public class MqttClientReconnector implements Mqtt5ClientReconnector {
     private final int attempts;
     private boolean reconnect = DEFAULT_RECONNECT;
     private @Nullable CompletableFuture<?> future;
+    private boolean resubscribeIfSessionPresent = DEFAULT_RESUBSCRIBE_IF_SESSION_PRESENT;
     private boolean resubscribeIfSessionExpired = DEFAULT_RESUBSCRIBE_IF_SESSION_EXPIRED;
     private boolean republishIfSessionExpired = DEFAULT_REPUBLISH_IF_SESSION_EXPIRED;
-    private boolean resubscribeIfSessionPresent = DEFAULT_RESUBSCRIBE_IF_SESSION_PRESENT;
     private long delayNanos = TimeUnit.MILLISECONDS.toNanos(DEFAULT_DELAY_MS);
     private @NotNull MqttClientTransportConfigImpl transportConfig;
     private @NotNull MqttConnect connect;
@@ -115,31 +115,31 @@ public boolean isResubscribeIfSessionExpired() {
     }
 
     @Override
-    public @NotNull MqttClientReconnector republishIfSessionExpired(final boolean republish) {
-        checkInOnDisconnected("republishIfSessionExpired");
-        republishIfSessionExpired = republish;
+    public @NotNull MqttClientReconnector resubscribeIfSessionPresent(final boolean resubscribeIfSessionPresent) {
+        checkInOnDisconnected("resubscribeIfSessionPresent");
+        this.resubscribeIfSessionPresent = resubscribeIfSessionPresent;
         return this;
     }
 
-    @Override
-    public boolean isRepublishIfSessionExpired() {
-        checkInEventLoop();
-        return republishIfSessionExpired;
-    }
-
     @Override
     public boolean isResubscribeIfSessionPresent() {
         checkInEventLoop();
         return resubscribeIfSessionPresent;
     }
 
     @Override
-    public @NotNull MqttClientReconnector resubscribeIfSessionPresent(final boolean resubscribeIfSessionPresent) {
-        checkInOnDisconnected("resubscribeIfSessionPresent");
-        this.resubscribeIfSessionPresent = resubscribeIfSessionPresent;
+    public @NotNull MqttClientReconnector republishIfSessionExpired(final boolean republish) {
+        checkInOnDisconnected("republishIfSessionExpired");
+        republishIfSessionExpired = republish;
         return this;
     }
 
+    @Override
+    public boolean isRepublishIfSessionExpired() {
+        checkInEventLoop();
+        return republishIfSessionExpired;
+    }
+
     @Override
     public @NotNull MqttClientReconnector delay(final long delay, final @Nullable TimeUnit timeUnit) {
         checkInOnDisconnected("delay");

src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java

@@ -63,6 +63,17 @@ public boolean isReconnect() {
         return delegate.isReconnect();
     }
 
+    @Override
+    public @NotNull Mqtt3ClientReconnectorView resubscribeIfSessionPresent(final boolean resubscribeIfSessionPresent) {
+        delegate.resubscribeIfSessionPresent(resubscribeIfSessionPresent);
+        return this;
+    }
+
+    @Override
+    public boolean isResubscribeIfSessionPresent() {
+        return delegate.isResubscribeIfSessionPresent();
+    }
+
     @Override
     public @NotNull Mqtt3ClientReconnectorView resubscribeIfSessionExpired(final boolean resubscribe) {
         delegate.resubscribeIfSessionExpired(resubscribe);
@@ -85,17 +96,6 @@ public boolean isRepublishIfSessionExpired() {
         return delegate.isRepublishIfSessionExpired();
     }
 
-    @Override
-    public @NotNull Mqtt3ClientReconnectorView resubscribeIfSessionPresent(final boolean resubscribeIfSessionPresent) {
-        delegate.resubscribeIfSessionPresent(resubscribeIfSessionPresent);
-        return this;
-    }
-
-    @Override
-    public boolean isResubscribeIfSessionPresent() {
-        return delegate.isResubscribeIfSessionPresent();
-    }
-
     @Override
     public int getAttempts() {
         return delegate.getAttempts();

src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java

@@ -48,6 +48,12 @@ public interface MqttClientReconnector {
      * @since 1.2
      */
     boolean DEFAULT_RECONNECT = false;
+    /**
+     * If resubscribe when the session is present when the client reconnected successfully is enabled by default.
+     *
+     * @since 1.3.7
+     */
+    boolean DEFAULT_RESUBSCRIBE_IF_SESSION_PRESENT = false;
     /**
      * If resubscribe when the session expired before the client reconnected successfully is enabled by default.
      *
@@ -60,12 +66,6 @@ public interface MqttClientReconnector {
      * @since 1.2
      */
     boolean DEFAULT_REPUBLISH_IF_SESSION_EXPIRED = false;
-    /**
-     * If resubscribe when the session is present when the client reconnected successfully is enabled by default.
-     *
-     * @since 1.3.7
-     */
-    boolean DEFAULT_RESUBSCRIBE_IF_SESSION_PRESENT = false;
     /**
      * Default delay in milliseconds the client will wait for before trying to reconnect.
      *
@@ -110,6 +110,32 @@ public interface MqttClientReconnector {
      */
     boolean isReconnect();
 
+    /**
+     * Instructs the client to automatically restore its subscriptions when reconnected successfully and the
+     * session is still present.
+     * <p>
+     * When the client reconnected successfully and its session is still present, the server still knows its
+     * subscriptions, so resubscribing is optional.
+     * <p>
+     * This setting only has effect if the client will reconnect (at least one of the methods {@link
+     * #reconnect(boolean)} or {@link #reconnectWhen(CompletableFuture, BiConsumer)} is called).
+     * <p>
+     * This method must only be called in {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}
+     * and not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}.
+     *
+     * @param resubscribeIfSessionPresent whether to resubscribe if the session is present when the client reconnected successfully.
+     * @return this reconnector.
+     * @throws UnsupportedOperationException if called outside of {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}.
+     * @since 1.3.7
+     */
+    @NotNull MqttClientReconnector resubscribeIfSessionPresent(boolean resubscribeIfSessionPresent);
+
+    /**
+     * @return whether the client will resubscribe if the session is present when it reconnects successfully.
+     * @since 1.3.7
+     */
+    boolean isResubscribeIfSessionPresent();
+
     /**
      * Instructs the client to automatically restore its subscriptions when the session expired before it reconnected
      * successfully.
@@ -162,32 +188,6 @@ public interface MqttClientReconnector {
      */
     boolean isRepublishIfSessionExpired();
 
-    /**
-     * Instructs the client to automatically restore its subscriptions when reconnected successfully and the
-     * session is still present.
-     * <p>
-     * When the client reconnected successfully and its session is still present, the server still knows its
-     * subscriptions, so resubscribing is optional.
-     * <p>
-     * This setting only has effect if the client will reconnect (at least one of the methods {@link
-     * #reconnect(boolean)} or {@link #reconnectWhen(CompletableFuture, BiConsumer)} is called).
-     * <p>
-     * This method must only be called in {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}
-     * and not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}.
-     *
-     * @param resubscribeIfSessionPresent whether to resubscribe if the session is present when the client reconnected successfully.
-     * @return this reconnector.
-     * @throws UnsupportedOperationException if called outside of {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}.
-     * @since 1.3.7
-     */
-    @NotNull MqttClientReconnector resubscribeIfSessionPresent(boolean resubscribeIfSessionPresent);
-
-    /**
-     * @return whether the client will resubscribe if the session is present when it reconnects successfully.
-     * @since 1.3.7
-     */
-    boolean isResubscribeIfSessionPresent();
-
     /**
      * Sets a delay the client will wait for before trying to reconnect.
      * <p>

src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java

@@ -48,13 +48,13 @@ public interface Mqtt3ClientReconnector extends MqttClientReconnector {
             @NotNull CompletableFuture<T> future, @Nullable BiConsumer<? super T, ? super Throwable> callback);
 
     @Override
-    @NotNull Mqtt3ClientReconnector resubscribeIfSessionExpired(boolean resubscribe);
+    @NotNull Mqtt3ClientReconnector resubscribeIfSessionPresent(boolean resubscribeIfSessionPresent);
 
     @Override
-    @NotNull Mqtt3ClientReconnector republishIfSessionExpired(boolean republish);
+    @NotNull Mqtt3ClientReconnector resubscribeIfSessionExpired(boolean resubscribe);
 
     @Override
-    @NotNull Mqtt3ClientReconnector resubscribeIfSessionPresent(boolean resubscribeIfSessionPresent);
+    @NotNull Mqtt3ClientReconnector republishIfSessionExpired(boolean republish);
 
     @Override
     @NotNull Mqtt3ClientReconnector delay(long delay, @NotNull TimeUnit timeUnit);

src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java

@@ -48,13 +48,13 @@ public interface Mqtt5ClientReconnector extends MqttClientReconnector {
             @NotNull CompletableFuture<T> future, @Nullable BiConsumer<? super T, ? super Throwable> callback);
 
     @Override
-    @NotNull Mqtt5ClientReconnector resubscribeIfSessionExpired(boolean resubscribe);
+    @NotNull Mqtt5ClientReconnector resubscribeIfSessionPresent(boolean resubscribeIfSessionPresent);
 
     @Override
-    @NotNull Mqtt5ClientReconnector republishIfSessionExpired(boolean republish);
+    @NotNull Mqtt5ClientReconnector resubscribeIfSessionExpired(boolean resubscribe);
 
     @Override
-    @NotNull Mqtt5ClientReconnector resubscribeIfSessionPresent(boolean resubscribeIfSessionPresent);
+    @NotNull Mqtt5ClientReconnector republishIfSessionExpired(boolean republish);
 
     @Override
     @NotNull Mqtt5ClientReconnector delay(long delay, @NotNull TimeUnit timeUnit);