Removed useless Session constructors

moquette-io · Dec 6, 2022 · ce4e355 · ce4e355
1 parent a6f97d9
commit ce4e355
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/broker/src/main/java/io/moquette/broker/Session.java b/broker/src/main/java/io/moquette/broker/Session.java
@@ -28,7 +28,15 @@
 import org.slf4j.LoggerFactory;
 
 import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.DelayQueue;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
@@ -102,19 +110,11 @@ static final class Will {
     private final AtomicInteger inflightSlots = new AtomicInteger(INFLIGHT_WINDOW_SIZE); // this should be configurable
     private final boolean resendInflightOnTimeout;
 
-    Session(String clientId, boolean clean, Will will, Queue<SessionRegistry.EnqueuedMessage> sessionQueue) {
-        this(clientId, clean, MqttVersion.MQTT_3_1, will, sessionQueue);
-    }
-
     Session(String clientId, boolean clean, MqttVersion protocolVersion, Will will, Queue<SessionRegistry.EnqueuedMessage> sessionQueue) {
         this(clientId, clean, protocolVersion, sessionQueue);
         this.will = will;
     }
 
-    Session(String clientId, boolean clean, Queue<SessionRegistry.EnqueuedMessage> sessionQueue) {
-        this(clientId, clean, MqttVersion.MQTT_3_1, sessionQueue);
-    }
-
     Session(String clientId, boolean clean, MqttVersion protocolVersion, Queue<SessionRegistry.EnqueuedMessage> sessionQueue) {
         if (sessionQueue == null) {
             throw new IllegalArgumentException("sessionQueue parameter can't be null");

diff --git a/broker/src/main/java/io/moquette/broker/SessionRegistry.java b/broker/src/main/java/io/moquette/broker/SessionRegistry.java
@@ -136,7 +136,7 @@ private void recreateSessionPool() {
             if (queueRepository.containsQueue(clientId)) {
                 final Queue<EnqueuedMessage> persistentQueue = queueRepository.getOrCreateQueue(clientId);
                 queues.remove(clientId);
-                Session rehydrated = new Session(clientId, false, persistentQueue);
+                Session rehydrated = new Session(clientId, false, MqttVersion.MQTT_3_1, persistentQueue);
                 pool.put(clientId, rehydrated);
             }
         }

diff --git a/broker/src/test/java/io/moquette/broker/SessionTest.java b/broker/src/test/java/io/moquette/broker/SessionTest.java
@@ -6,6 +6,7 @@
 import io.netty.buffer.UnpooledByteBufAllocator;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.mqtt.MqttQoS;
+import io.netty.handler.codec.mqtt.MqttVersion;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -30,7 +31,7 @@ public class SessionTest {
     public void setUp() {
         testChannel = new EmbeddedChannel();
         queuedMessages = new ConcurrentLinkedQueue<>();
-        client = new Session(CLIENT_ID, true, (Session.Will) null, queuedMessages);
+        client = new Session(CLIENT_ID, true, MqttVersion.MQTT_3_1, null, queuedMessages);
         createConnection(client);
     }