Minor fixed comment (#281)

broker/src/test/java/io/moquette/Utils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/IntegrationUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/MQTTWebSocket.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerIntegrationEmbeddedPublishTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerIntegrationFuseTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerIntegrationPahoTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerIntegrationQoSValidationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerIntegrationSSLClientAuthTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerIntegrationSSLTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerIntegrationWebSocketTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/ServerRestartIntegrationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/server/config/ConfigurationParserTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java

@@ -1,174 +1,174 @@
-/*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
- * ------------------------------------------------------
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The Apache License v2.0 is available at
- * http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- */
-
-package io.moquette.spi.impl;
-
-import io.moquette.interception.InterceptHandler;
-import io.moquette.interception.messages.*;
-import io.moquette.server.netty.MessageBuilder;
-import io.moquette.spi.impl.subscriptions.Subscription;
-import io.moquette.spi.impl.subscriptions.Topic;
-import io.netty.handler.codec.mqtt.MqttQoS;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.refEq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Wagner Macedo
- */
-public class BrokerInterceptorTest {
-
-    // value to check for changes after every notification
-    private static final AtomicInteger n = new AtomicInteger(0);
-
-    // Interceptor loaded with a custom InterceptHandler special for the tests
-    private static final class MockObserver implements InterceptHandler {
-
-        @Override
-        public String getID() {
-            return "MockObserver";
-        }
-
-        @Override
-        public Class<?>[] getInterceptedMessageTypes() {
-            return InterceptHandler.ALL_MESSAGE_TYPES;
-        }
-
-        @Override
-        public void onConnect(InterceptConnectMessage msg) {
-            n.set(40);
-        }
-
-        @Override
-        public void onDisconnect(InterceptDisconnectMessage msg) {
-            n.set(50);
-        }
-
-        @Override
-        public void onConnectionLost(InterceptConnectionLostMessage msg) {
-            n.set(30);
-        }
-
-        @Override
-        public void onPublish(InterceptPublishMessage msg) {
-            n.set(60);
-        }
-
-        @Override
-        public void onSubscribe(InterceptSubscribeMessage msg) {
-            n.set(70);
-        }
-
-        @Override
-        public void onUnsubscribe(InterceptUnsubscribeMessage msg) {
-            n.set(80);
-        }
-
-        @Override
-        public void onMessageAcknowledged(InterceptAcknowledgedMessage msg) {
-            n.set(90);
-        }
-    }
-
-    private static final BrokerInterceptor interceptor = new BrokerInterceptor(
-            Arrays.<InterceptHandler>asList(new MockObserver()));
-
-    @BeforeClass
-    public static void beforeAllTests() {
-        // check if any of the handler methods was called before notifications
-        assertEquals(0, n.get());
-    }
-
-    @AfterClass
-    public static void afterAllTests() {
-        interceptor.stop();
-    }
-
-    /* Used to wait handler notification by the interceptor internal thread */
-    private static void interval() throws InterruptedException {
-        Thread.sleep(100);
-    }
-
-    @Test
-    public void testNotifyClientConnected() throws Exception {
-        interceptor.notifyClientConnected(MessageBuilder.connect().build());
-        interval();
-        assertEquals(40, n.get());
-    }
-
-    @Test
-    public void testNotifyClientDisconnected() throws Exception {
-        interceptor.notifyClientDisconnected("cli1234", "cli1234");
-        interval();
-        assertEquals(50, n.get());
-    }
-
-    @Test
-    public void testNotifyTopicPublished() throws Exception {
-        interceptor.notifyTopicPublished(
-                MessageBuilder.publish().qos(MqttQoS.AT_MOST_ONCE).payload("Hello".getBytes()).build(),
-                "cli1234",
-                "cli1234");
-        interval();
-        assertEquals(60, n.get());
-    }
-
-    @Test
-    public void testNotifyTopicSubscribed() throws Exception {
-        interceptor.notifyTopicSubscribed(new Subscription("cli1", new Topic("o2"), MqttQoS.AT_MOST_ONCE), "cli1234");
-        interval();
-        assertEquals(70, n.get());
-    }
-
-    @Test
-    public void testNotifyTopicUnsubscribed() throws Exception {
-        interceptor.notifyTopicUnsubscribed("o2", "cli1234", "cli1234");
-        interval();
-        assertEquals(80, n.get());
-    }
-
-    @Test
-    public void testAddAndRemoveInterceptHandler() throws Exception {
-        InterceptHandler interceptHandlerMock1 = mock(InterceptHandler.class);
-        InterceptHandler interceptHandlerMock2 = mock(InterceptHandler.class);
-        // add
-        interceptor.addInterceptHandler(interceptHandlerMock1);
-        interceptor.addInterceptHandler(interceptHandlerMock2);
-
-        Subscription subscription = new Subscription("cli1", new Topic("o2"), MqttQoS.AT_MOST_ONCE);
-        interceptor.notifyTopicSubscribed(subscription, "cli1234");
-        interval();
-
-        verify(interceptHandlerMock1).onSubscribe(refEq(new InterceptSubscribeMessage(subscription, "cli1234")));
-        verify(interceptHandlerMock2).onSubscribe(refEq(new InterceptSubscribeMessage(subscription, "cli1234")));
-
-        // remove
-        interceptor.removeInterceptHandler(interceptHandlerMock1);
-
-        interceptor.notifyTopicSubscribed(subscription, "cli1235");
-        interval();
-        // removeInterceptHandler() performs another interaction
-        // TODO: fix this
-        // verifyNoMoreInteractions(interceptHandlerMock1);
-        verify(interceptHandlerMock2).onSubscribe(refEq(new InterceptSubscribeMessage(subscription, "cli1235")));
-    }
-}
+/*
+ * Copyright (c) 2012-2017 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+
+package io.moquette.spi.impl;
+
+import io.moquette.interception.InterceptHandler;
+import io.moquette.interception.messages.*;
+import io.moquette.server.netty.MessageBuilder;
+import io.moquette.spi.impl.subscriptions.Subscription;
+import io.moquette.spi.impl.subscriptions.Topic;
+import io.netty.handler.codec.mqtt.MqttQoS;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.refEq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author Wagner Macedo
+ */
+public class BrokerInterceptorTest {
+
+    // value to check for changes after every notification
+    private static final AtomicInteger n = new AtomicInteger(0);
+
+    // Interceptor loaded with a custom InterceptHandler special for the tests
+    private static final class MockObserver implements InterceptHandler {
+
+        @Override
+        public String getID() {
+            return "MockObserver";
+        }
+
+        @Override
+        public Class<?>[] getInterceptedMessageTypes() {
+            return InterceptHandler.ALL_MESSAGE_TYPES;
+        }
+
+        @Override
+        public void onConnect(InterceptConnectMessage msg) {
+            n.set(40);
+        }
+
+        @Override
+        public void onDisconnect(InterceptDisconnectMessage msg) {
+            n.set(50);
+        }
+
+        @Override
+        public void onConnectionLost(InterceptConnectionLostMessage msg) {
+            n.set(30);
+        }
+
+        @Override
+        public void onPublish(InterceptPublishMessage msg) {
+            n.set(60);
+        }
+
+        @Override
+        public void onSubscribe(InterceptSubscribeMessage msg) {
+            n.set(70);
+        }
+
+        @Override
+        public void onUnsubscribe(InterceptUnsubscribeMessage msg) {
+            n.set(80);
+        }
+
+        @Override
+        public void onMessageAcknowledged(InterceptAcknowledgedMessage msg) {
+            n.set(90);
+        }
+    }
+
+    private static final BrokerInterceptor interceptor = new BrokerInterceptor(
+            Arrays.<InterceptHandler>asList(new MockObserver()));
+
+    @BeforeClass
+    public static void beforeAllTests() {
+        // check if any of the handler methods was called before notifications
+        assertEquals(0, n.get());
+    }
+
+    @AfterClass
+    public static void afterAllTests() {
+        interceptor.stop();
+    }
+
+    /* Used to wait handler notification by the interceptor internal thread */
+    private static void interval() throws InterruptedException {
+        Thread.sleep(100);
+    }
+
+    @Test
+    public void testNotifyClientConnected() throws Exception {
+        interceptor.notifyClientConnected(MessageBuilder.connect().build());
+        interval();
+        assertEquals(40, n.get());
+    }
+
+    @Test
+    public void testNotifyClientDisconnected() throws Exception {
+        interceptor.notifyClientDisconnected("cli1234", "cli1234");
+        interval();
+        assertEquals(50, n.get());
+    }
+
+    @Test
+    public void testNotifyTopicPublished() throws Exception {
+        interceptor.notifyTopicPublished(
+                MessageBuilder.publish().qos(MqttQoS.AT_MOST_ONCE).payload("Hello".getBytes()).build(),
+                "cli1234",
+                "cli1234");
+        interval();
+        assertEquals(60, n.get());
+    }
+
+    @Test
+    public void testNotifyTopicSubscribed() throws Exception {
+        interceptor.notifyTopicSubscribed(new Subscription("cli1", new Topic("o2"), MqttQoS.AT_MOST_ONCE), "cli1234");
+        interval();
+        assertEquals(70, n.get());
+    }
+
+    @Test
+    public void testNotifyTopicUnsubscribed() throws Exception {
+        interceptor.notifyTopicUnsubscribed("o2", "cli1234", "cli1234");
+        interval();
+        assertEquals(80, n.get());
+    }
+
+    @Test
+    public void testAddAndRemoveInterceptHandler() throws Exception {
+        InterceptHandler interceptHandlerMock1 = mock(InterceptHandler.class);
+        InterceptHandler interceptHandlerMock2 = mock(InterceptHandler.class);
+        // add
+        interceptor.addInterceptHandler(interceptHandlerMock1);
+        interceptor.addInterceptHandler(interceptHandlerMock2);
+
+        Subscription subscription = new Subscription("cli1", new Topic("o2"), MqttQoS.AT_MOST_ONCE);
+        interceptor.notifyTopicSubscribed(subscription, "cli1234");
+        interval();
+
+        verify(interceptHandlerMock1).onSubscribe(refEq(new InterceptSubscribeMessage(subscription, "cli1234")));
+        verify(interceptHandlerMock2).onSubscribe(refEq(new InterceptSubscribeMessage(subscription, "cli1234")));
+
+        // remove
+        interceptor.removeInterceptHandler(interceptHandlerMock1);
+
+        interceptor.notifyTopicSubscribed(subscription, "cli1235");
+        interval();
+        // removeInterceptHandler() performs another interaction
+        // TODO: fix this
+        // verifyNoMoreInteractions(interceptHandlerMock1);
+        verify(interceptHandlerMock2).onSubscribe(refEq(new InterceptSubscribeMessage(subscription, "cli1235")));
+    }
+}

broker/src/test/java/io/moquette/spi/impl/MemoryMessagesStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/MemoryStorageService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/NettyChannelAssertions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/security/ACLFileParserTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/security/AuthorizationsCollectorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/impl/subscriptions/TopicTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/spi/persistence/MemorySessionStore.java

@@ -1,273 +1,273 @@
-/*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
- * ------------------------------------------------------
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The Apache License v2.0 is available at
- * http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- */
-
-package io.moquette.spi.persistence;
-
-import io.moquette.server.Constants;
-import io.moquette.spi.ClientSession;
-import io.moquette.spi.IMessagesStore;
-import io.moquette.spi.IMessagesStore.StoredMessage;
-import io.moquette.spi.ISessionsStore;
-import io.moquette.spi.MessageGUID;
-import io.moquette.spi.impl.Utils;
-import io.moquette.spi.impl.subscriptions.Subscription;
-import io.moquette.spi.impl.subscriptions.Topic;
-import io.moquette.spi.persistence.MapDBPersistentStore.PersistentSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.util.*;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-
-/**
- *
- * @author andrea
- */
-public class MemorySessionStore implements ISessionsStore {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MemorySessionStore.class);
-
-    private Map<String, Map<Topic, Subscription>> m_persistentSubscriptions = new HashMap<>();
-
-    private Map<String, MapDBPersistentStore.PersistentSession> m_persistentSessions = new HashMap<>();
-
-    // maps clientID->[MessageId -> guid]
-    private Map<String, Map<Integer, MessageGUID>> m_inflightStore = new HashMap<>();
-    // private Map<String, Set<Integer>> m_inflightIDs = new HashMap<>();
-    // maps clientID->BlockingQueue
-    private Map<String, BlockingQueue<StoredMessage>> queues = new HashMap<>();
-    // maps clientID->[MessageId -> guid]
-    private Map<String, Map<Integer, MessageGUID>> m_secondPhaseStore = new HashMap<>();
-
-    private Map<String, Map<Integer, MessageGUID>> m_messageToGuids;
-    private final IMessagesStore m_messagesStore;
-
-    public MemorySessionStore(IMessagesStore messagesStore, Map<String, Map<Integer, MessageGUID>> messageToGuids) {
-        m_messageToGuids = messageToGuids;
-        this.m_messagesStore = messagesStore;
-    }
-
-    @Override
-    public void removeSubscription(Topic topic, String clientID) {
-        LOG.debug("removeSubscription topic filter: {} for clientID: {}", topic, clientID);
-        if (!m_persistentSubscriptions.containsKey(clientID)) {
-            return;
-        }
-        Map<Topic, Subscription> clientSubscriptions = m_persistentSubscriptions.get(clientID);
-        clientSubscriptions.remove(topic);
-    }
-
-    @Override
-    public void initStore() {
-
-    }
-
-    @Override
-    public void addNewSubscription(Subscription newSubscription) {
-        final String clientID = newSubscription.getClientId();
-        if (!m_persistentSubscriptions.containsKey(clientID)) {
-            m_persistentSubscriptions.put(clientID, new HashMap<Topic, Subscription>());
-        }
-
-        m_persistentSubscriptions.get(clientID).put(newSubscription.getTopicFilter(), newSubscription);
-    }
-
-    @Override
-    public void wipeSubscriptions(String clientID) {
-        m_persistentSubscriptions.remove(clientID);
-    }
-
-    @Override
-    public boolean contains(String clientID) {
-        return m_persistentSubscriptions.containsKey(clientID);
-    }
-
-    @Override
-    public ClientSession createNewSession(String clientID, boolean cleanSession) {
-        LOG.debug("createNewSession for client <{}>", clientID);
-        if (m_persistentSessions.containsKey(clientID)) {
-            LOG.error("already exists a session for client <{}>, bad condition", clientID);
-            throw new IllegalArgumentException("Can't create a session with the ID of an already existing" + clientID);
-        }
-        LOG.debug("clientID {} is a newcome, creating it's empty subscriptions set", clientID);
-        m_persistentSubscriptions.put(clientID, new HashMap<Topic, Subscription>());
-        m_persistentSessions.put(clientID, new MapDBPersistentStore.PersistentSession(cleanSession));
-        return new ClientSession(clientID, m_messagesStore, this, cleanSession);
-    }
-
-    @Override
-    public ClientSession sessionForClient(String clientID) {
-        if (!m_persistentSessions.containsKey(clientID)) {
-            return null;
-        }
-
-        MapDBPersistentStore.PersistentSession storedSession = m_persistentSessions.get(clientID);
-        return new ClientSession(clientID, m_messagesStore, this, storedSession.cleanSession);
-    }
-
-    @Override
-    public Collection<ClientSession> getAllSessions() {
-        Collection<ClientSession> result = new ArrayList<>();
-        for (Map.Entry<String, PersistentSession> entry : m_persistentSessions.entrySet()) {
-            result.add(new ClientSession(entry.getKey(), m_messagesStore, this, entry.getValue().cleanSession));
-        }
-        return result;
-    }
-
-    @Override
-    public void updateCleanStatus(String clientID, boolean cleanSession) {
-        m_persistentSessions.put(clientID, new MapDBPersistentStore.PersistentSession(cleanSession));
-    }
-
-    @Override
-    public List<ClientTopicCouple> listAllSubscriptions() {
-        List<ClientTopicCouple> allSubscriptions = new ArrayList<>();
-        for (Map.Entry<String, Map<Topic, Subscription>> entry : m_persistentSubscriptions.entrySet()) {
-            for (Subscription sub : entry.getValue().values()) {
-                allSubscriptions.add(sub.asClientTopicCouple());
-            }
-        }
-        return allSubscriptions;
-    }
-
-    @Override
-    public Subscription getSubscription(ClientTopicCouple couple) {
-        Map<Topic, Subscription> subscriptions = m_persistentSubscriptions.get(couple.clientID);
-        if (subscriptions == null || subscriptions.isEmpty()) {
-            return null;
-        }
-        return subscriptions.get(couple.topicFilter);
-    }
-
-    @Override
-    public List<Subscription> getSubscriptions() {
-        List<Subscription> subscriptions = new ArrayList<>();
-        for (Map.Entry<String, Map<Topic, Subscription>> entry : m_persistentSubscriptions.entrySet()) {
-            subscriptions.addAll(entry.getValue().values());
-        }
-        return subscriptions;
-    }
-
-    @Override
-    public void inFlightAck(String clientID, int messageID) {
-        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
-        if (m == null) {
-            LOG.error("Can't find the inFlight record for client <{}>", clientID);
-            return;
-        }
-        m.remove(messageID);
-    }
-
-    @Override
-    public void inFlight(String clientID, int messageID, MessageGUID guid) {
-        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
-        if (m == null) {
-            m = new HashMap<>();
-        }
-        m.put(messageID, guid);
-        this.m_inflightStore.put(clientID, m);
-    }
-
-    /**
-     * Return the next valid packetIdentifier for the given client session.
-     */
-    @Override
-    public int nextPacketID(String clientID) {
-        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
-        if (m == null) {
-            m = new HashMap<>();
-            int nextPacketId = 1;
-            m.put(nextPacketId, null);
-            return nextPacketId;
-        }
-        int maxId = Collections.max(m.keySet());
-        int nextPacketId = (maxId + 1) % 0xFFFF;
-        m.put(nextPacketId, null);
-        return nextPacketId;
-    }
-
-    @Override
-    public BlockingQueue<StoredMessage> queue(String clientID) {
-        return Utils.defaultGet(queues, clientID, new ArrayBlockingQueue<StoredMessage>(Constants.MAX_MESSAGE_QUEUE));
-    }
-
-    @Override
-    public void dropQueue(String clientID) {
-        queues.remove(clientID);
-    }
-
-    @Override
-    public void moveInFlightToSecondPhaseAckWaiting(String clientID, int messageID) {
-        LOG.info("acknowledging inflight clientID <{}> messageID {}", clientID, messageID);
-        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
-        if (m == null) {
-            LOG.error("Can't find the inFlight record for client <{}>", clientID);
-            return;
-        }
-        MessageGUID guid = m.remove(messageID);
-
-        LOG.info("Moving to second phase store");
-        Map<Integer, MessageGUID> messageIDs = Utils
-                .defaultGet(m_secondPhaseStore, clientID, new HashMap<Integer, MessageGUID>());
-        messageIDs.put(messageID, guid);
-        m_secondPhaseStore.put(clientID, messageIDs);
-    }
-
-    @Override
-    public MessageGUID secondPhaseAcknowledged(String clientID, int messageID) {
-        Map<Integer, MessageGUID> messageIDs = Utils
-                .defaultGet(m_secondPhaseStore, clientID, new HashMap<Integer, MessageGUID>());
-        MessageGUID guid = messageIDs.remove(messageID);
-        m_secondPhaseStore.put(clientID, messageIDs);
-        return guid;
-    }
-
-    @Override
-    public MessageGUID mapToGuid(String clientID, int messageID) {
-        HashMap<Integer, MessageGUID> guids = (HashMap<Integer, MessageGUID>) Utils
-                .defaultGet(m_messageToGuids, clientID, new HashMap<Integer, MessageGUID>());
-        return guids.get(messageID);
-    }
-
-    @Override
-    public StoredMessage getInflightMessage(String clientID, int messageID) {
-        return null;
-    }
-
-    @Override
-    public int getInflightMessagesNo(String clientID) {
-        Map<Integer, MessageGUID> inflightMessages = m_inflightStore.get(clientID);
-        if (inflightMessages == null)
-            return 0;
-        else
-            return inflightMessages.size();
-    }
-
-    @Override
-    public int getPendingPublishMessagesNo(String clientID) {
-        return m_messagesStore.getPendingPublishMessages(clientID);
-    }
-
-    @Override
-    public int getSecondPhaseAckPendingMessages(String clientID) {
-        Map<Integer, MessageGUID> pendingAcks = m_secondPhaseStore.get(clientID);
-        if (pendingAcks == null)
-            return 0;
-        else
-            return pendingAcks.size();
-    }
-
-}
+/*
+ * Copyright (c) 2012-2017 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+
+package io.moquette.spi.persistence;
+
+import io.moquette.server.Constants;
+import io.moquette.spi.ClientSession;
+import io.moquette.spi.IMessagesStore;
+import io.moquette.spi.IMessagesStore.StoredMessage;
+import io.moquette.spi.ISessionsStore;
+import io.moquette.spi.MessageGUID;
+import io.moquette.spi.impl.Utils;
+import io.moquette.spi.impl.subscriptions.Subscription;
+import io.moquette.spi.impl.subscriptions.Topic;
+import io.moquette.spi.persistence.MapDBPersistentStore.PersistentSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
+/**
+ *
+ * @author andrea
+ */
+public class MemorySessionStore implements ISessionsStore {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MemorySessionStore.class);
+
+    private Map<String, Map<Topic, Subscription>> m_persistentSubscriptions = new HashMap<>();
+
+    private Map<String, MapDBPersistentStore.PersistentSession> m_persistentSessions = new HashMap<>();
+
+    // maps clientID->[MessageId -> guid]
+    private Map<String, Map<Integer, MessageGUID>> m_inflightStore = new HashMap<>();
+    // private Map<String, Set<Integer>> m_inflightIDs = new HashMap<>();
+    // maps clientID->BlockingQueue
+    private Map<String, BlockingQueue<StoredMessage>> queues = new HashMap<>();
+    // maps clientID->[MessageId -> guid]
+    private Map<String, Map<Integer, MessageGUID>> m_secondPhaseStore = new HashMap<>();
+
+    private Map<String, Map<Integer, MessageGUID>> m_messageToGuids;
+    private final IMessagesStore m_messagesStore;
+
+    public MemorySessionStore(IMessagesStore messagesStore, Map<String, Map<Integer, MessageGUID>> messageToGuids) {
+        m_messageToGuids = messageToGuids;
+        this.m_messagesStore = messagesStore;
+    }
+
+    @Override
+    public void removeSubscription(Topic topic, String clientID) {
+        LOG.debug("removeSubscription topic filter: {} for clientID: {}", topic, clientID);
+        if (!m_persistentSubscriptions.containsKey(clientID)) {
+            return;
+        }
+        Map<Topic, Subscription> clientSubscriptions = m_persistentSubscriptions.get(clientID);
+        clientSubscriptions.remove(topic);
+    }
+
+    @Override
+    public void initStore() {
+
+    }
+
+    @Override
+    public void addNewSubscription(Subscription newSubscription) {
+        final String clientID = newSubscription.getClientId();
+        if (!m_persistentSubscriptions.containsKey(clientID)) {
+            m_persistentSubscriptions.put(clientID, new HashMap<Topic, Subscription>());
+        }
+
+        m_persistentSubscriptions.get(clientID).put(newSubscription.getTopicFilter(), newSubscription);
+    }
+
+    @Override
+    public void wipeSubscriptions(String clientID) {
+        m_persistentSubscriptions.remove(clientID);
+    }
+
+    @Override
+    public boolean contains(String clientID) {
+        return m_persistentSubscriptions.containsKey(clientID);
+    }
+
+    @Override
+    public ClientSession createNewSession(String clientID, boolean cleanSession) {
+        LOG.debug("createNewSession for client <{}>", clientID);
+        if (m_persistentSessions.containsKey(clientID)) {
+            LOG.error("already exists a session for client <{}>, bad condition", clientID);
+            throw new IllegalArgumentException("Can't create a session with the ID of an already existing" + clientID);
+        }
+        LOG.debug("clientID {} is a newcome, creating it's empty subscriptions set", clientID);
+        m_persistentSubscriptions.put(clientID, new HashMap<Topic, Subscription>());
+        m_persistentSessions.put(clientID, new MapDBPersistentStore.PersistentSession(cleanSession));
+        return new ClientSession(clientID, m_messagesStore, this, cleanSession);
+    }
+
+    @Override
+    public ClientSession sessionForClient(String clientID) {
+        if (!m_persistentSessions.containsKey(clientID)) {
+            return null;
+        }
+
+        MapDBPersistentStore.PersistentSession storedSession = m_persistentSessions.get(clientID);
+        return new ClientSession(clientID, m_messagesStore, this, storedSession.cleanSession);
+    }
+
+    @Override
+    public Collection<ClientSession> getAllSessions() {
+        Collection<ClientSession> result = new ArrayList<>();
+        for (Map.Entry<String, PersistentSession> entry : m_persistentSessions.entrySet()) {
+            result.add(new ClientSession(entry.getKey(), m_messagesStore, this, entry.getValue().cleanSession));
+        }
+        return result;
+    }
+
+    @Override
+    public void updateCleanStatus(String clientID, boolean cleanSession) {
+        m_persistentSessions.put(clientID, new MapDBPersistentStore.PersistentSession(cleanSession));
+    }
+
+    @Override
+    public List<ClientTopicCouple> listAllSubscriptions() {
+        List<ClientTopicCouple> allSubscriptions = new ArrayList<>();
+        for (Map.Entry<String, Map<Topic, Subscription>> entry : m_persistentSubscriptions.entrySet()) {
+            for (Subscription sub : entry.getValue().values()) {
+                allSubscriptions.add(sub.asClientTopicCouple());
+            }
+        }
+        return allSubscriptions;
+    }
+
+    @Override
+    public Subscription getSubscription(ClientTopicCouple couple) {
+        Map<Topic, Subscription> subscriptions = m_persistentSubscriptions.get(couple.clientID);
+        if (subscriptions == null || subscriptions.isEmpty()) {
+            return null;
+        }
+        return subscriptions.get(couple.topicFilter);
+    }
+
+    @Override
+    public List<Subscription> getSubscriptions() {
+        List<Subscription> subscriptions = new ArrayList<>();
+        for (Map.Entry<String, Map<Topic, Subscription>> entry : m_persistentSubscriptions.entrySet()) {
+            subscriptions.addAll(entry.getValue().values());
+        }
+        return subscriptions;
+    }
+
+    @Override
+    public void inFlightAck(String clientID, int messageID) {
+        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
+        if (m == null) {
+            LOG.error("Can't find the inFlight record for client <{}>", clientID);
+            return;
+        }
+        m.remove(messageID);
+    }
+
+    @Override
+    public void inFlight(String clientID, int messageID, MessageGUID guid) {
+        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
+        if (m == null) {
+            m = new HashMap<>();
+        }
+        m.put(messageID, guid);
+        this.m_inflightStore.put(clientID, m);
+    }
+
+    /**
+     * Return the next valid packetIdentifier for the given client session.
+     */
+    @Override
+    public int nextPacketID(String clientID) {
+        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
+        if (m == null) {
+            m = new HashMap<>();
+            int nextPacketId = 1;
+            m.put(nextPacketId, null);
+            return nextPacketId;
+        }
+        int maxId = Collections.max(m.keySet());
+        int nextPacketId = (maxId + 1) % 0xFFFF;
+        m.put(nextPacketId, null);
+        return nextPacketId;
+    }
+
+    @Override
+    public BlockingQueue<StoredMessage> queue(String clientID) {
+        return Utils.defaultGet(queues, clientID, new ArrayBlockingQueue<StoredMessage>(Constants.MAX_MESSAGE_QUEUE));
+    }
+
+    @Override
+    public void dropQueue(String clientID) {
+        queues.remove(clientID);
+    }
+
+    @Override
+    public void moveInFlightToSecondPhaseAckWaiting(String clientID, int messageID) {
+        LOG.info("acknowledging inflight clientID <{}> messageID {}", clientID, messageID);
+        Map<Integer, MessageGUID> m = this.m_inflightStore.get(clientID);
+        if (m == null) {
+            LOG.error("Can't find the inFlight record for client <{}>", clientID);
+            return;
+        }
+        MessageGUID guid = m.remove(messageID);
+
+        LOG.info("Moving to second phase store");
+        Map<Integer, MessageGUID> messageIDs = Utils
+                .defaultGet(m_secondPhaseStore, clientID, new HashMap<Integer, MessageGUID>());
+        messageIDs.put(messageID, guid);
+        m_secondPhaseStore.put(clientID, messageIDs);
+    }
+
+    @Override
+    public MessageGUID secondPhaseAcknowledged(String clientID, int messageID) {
+        Map<Integer, MessageGUID> messageIDs = Utils
+                .defaultGet(m_secondPhaseStore, clientID, new HashMap<Integer, MessageGUID>());
+        MessageGUID guid = messageIDs.remove(messageID);
+        m_secondPhaseStore.put(clientID, messageIDs);
+        return guid;
+    }
+
+    @Override
+    public MessageGUID mapToGuid(String clientID, int messageID) {
+        HashMap<Integer, MessageGUID> guids = (HashMap<Integer, MessageGUID>) Utils
+                .defaultGet(m_messageToGuids, clientID, new HashMap<Integer, MessageGUID>());
+        return guids.get(messageID);
+    }
+
+    @Override
+    public StoredMessage getInflightMessage(String clientID, int messageID) {
+        return null;
+    }
+
+    @Override
+    public int getInflightMessagesNo(String clientID) {
+        Map<Integer, MessageGUID> inflightMessages = m_inflightStore.get(clientID);
+        if (inflightMessages == null)
+            return 0;
+        else
+            return inflightMessages.size();
+    }
+
+    @Override
+    public int getPendingPublishMessagesNo(String clientID) {
+        return m_messagesStore.getPendingPublishMessages(clientID);
+    }
+
+    @Override
+    public int getSecondPhaseAckPendingMessages(String clientID) {
+        Map<Integer, MessageGUID> pendingAcks = m_secondPhaseStore.get(clientID);
+        if (pendingAcks == null)
+            return 0;
+        else
+            return pendingAcks.size();
+    }
+
+}

broker/src/test/java/io/moquette/testclient/Client.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The original author or authorsgetRockQuestions()
+ * Copyright (c) 2012-2017 The original author or authors
  * ------------------------------------------------------
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0