From 32b6b9b1da3cdea32d9bdee75c5764c7ba3e7a04 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Fri, 22 Jul 2016 13:32:25 +0200
Subject: [PATCH] Minor, renamed SimpleMessaging to
 ProtocolProcessorBootstrapper

---
 .../main/java/io/moquette/server/Server.java  | 10 ++++-----
 .../moquette/spi/impl/ProtocolProcessor.java  |  2 +-
 ...ava => ProtocolProcessorBootstrapper.java} | 21 ++++---------------
 .../src/main/resources/log4j.properties       |  2 +-
 4 files changed, 11 insertions(+), 24 deletions(-)
 rename broker/src/main/java/io/moquette/spi/impl/{SimpleMessaging.java => ProtocolProcessorBootstrapper.java} (93%)

diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java
index 0f328dcf..a619bbd4 100644
--- a/broker/src/main/java/io/moquette/server/Server.java
+++ b/broker/src/main/java/io/moquette/server/Server.java
@@ -28,7 +28,7 @@ import io.moquette.interception.HazelcastMsg;
 import io.moquette.interception.InterceptHandler;
 import io.moquette.parser.proto.messages.PublishMessage;
 import io.moquette.server.config.MemoryConfig;
-import io.moquette.spi.impl.SimpleMessaging;
+import io.moquette.spi.impl.ProtocolProcessorBootstrapper;
 import io.moquette.server.config.FilesystemConfig;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.netty.NettyAcceptor;
@@ -64,7 +64,7 @@ public class Server {
 
     private HazelcastInstance hazelcastInstance;
 
-    private SimpleMessaging m_messaging;
+    private ProtocolProcessorBootstrapper m_processorBootstrapper;
 
     public static void main(String[] args) throws IOException {
         final Server server = new Server();
@@ -139,8 +139,8 @@ public class Server {
         }
         configureCluster(config);
         LOG.info("Persistent store file: {}", config.getProperty(BrokerConstants.PERSISTENT_STORE_PROPERTY_NAME));
-        m_messaging = SimpleMessaging.getInstance();
-        final ProtocolProcessor processor = m_messaging.init(config, handlers, authenticator, authorizator, this);
+        m_processorBootstrapper = new ProtocolProcessorBootstrapper();
+        final ProtocolProcessor processor = m_processorBootstrapper.init(config, handlers, authenticator, authorizator, this);
 
         if (sslCtxCreator == null) {
             sslCtxCreator = new DefaultMoquetteSslContextCreator(config);
@@ -199,7 +199,7 @@ public class Server {
     public void stopServer() {
     	LOG.info("Server stopping...");
         m_acceptor.close();
-        m_messaging.shutdown();
+        m_processorBootstrapper.shutdown();
         m_initialized = false;
         if (hazelcastInstance != null) {
             try {
diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
index dc85dc58..676b3f01 100644
--- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
  * Class responsible to handle the logic of MQTT protocol it's the director of
  * the protocol execution.
  *
- * Used by the front facing class SimpleMessaging.
+ * Used by the front facing class ProtocolProcessorBootstrapper.
  *
  * @author andrea
  */
diff --git a/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java
similarity index 93%
rename from broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java
rename to broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java
index 380dc4e4..0ee8c6d1 100644
--- a/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java
@@ -38,16 +38,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
- * Singleton class that orchestrate the execution of the protocol.
- *
- * It's main responsibility is instantiate the ProtocolProcessor.
+ * It's main responsibility is bootstrap the ProtocolProcessor.
  *
  * @author andrea
  */
-public class SimpleMessaging {
+public class ProtocolProcessorBootstrapper {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SimpleMessaging.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProtocolProcessorBootstrapper.class);
 
     private SubscriptionsStore subscriptions;
 
@@ -55,19 +52,9 @@ public class SimpleMessaging {
 
     private BrokerInterceptor m_interceptor;
 
-//    private static SimpleMessaging INSTANCE;
-    
     private final ProtocolProcessor m_processor = new ProtocolProcessor();
 
-    private SimpleMessaging() {
-    }
-
-    public static SimpleMessaging getInstance() {
-//        if (INSTANCE == null) {
-//            INSTANCE = new SimpleMessaging();
-//        }
-//        return INSTANCE;
-        return new SimpleMessaging();
+    public ProtocolProcessorBootstrapper() {
     }
 
     /**
diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties
index 0e0ac1d8..1e8e9410 100644
--- a/distribution/src/main/resources/log4j.properties
+++ b/distribution/src/main/resources/log4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger=ERROR, stdout, file
 
 log4j.logger.io.moquette=INFO
 log4j.logger.io.moquette.spi.impl.ProtocolProcessor=INFO
-log4j.logger.io.moquette.spi.impl.SimpleMessaging=WARN
+log4j.logger.io.moquette.spi.impl.ProtocolProcessorBootstrapper=WARN
 
 #Protocol parsing
 log4j.logger.io.moquette.server.netty.NettyMQTTHandler=WARN