diff --git a/broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java b/broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java index 31121d53..90cb06ff 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java +++ b/broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java @@ -55,12 +55,12 @@ class ConfigurationParser { } } } - + private void createDefaults() { - m_properties.put("port", Integer.toString(Constants.PORT)); - m_properties.put("host", Constants.HOST); - m_properties.put("websocket_port", Integer.toString(Constants.WEBSOCKET_PORT)); - m_properties.put("password_file", ""); + m_properties.put(Constants.PORT_PROPERTY_NAME, Integer.toString(Constants.PORT)); + m_properties.put(Constants.HOST_PROPERTY_NAME, Constants.HOST); + m_properties.put(Constants.WEB_SOCKET_PORT_PROPERTY_NAME, Integer.toString(Constants.WEBSOCKET_PORT)); + m_properties.put(Constants.PASSWORD_FILE_PROPERTY_NAME, ""); m_properties.put(Constants.PERSISTENT_STORE_PROPERTY_NAME, Constants.DEFAULT_PERSISTENT_PATH); } diff --git a/broker/src/main/java/org/eclipse/moquette/server/Server.java b/broker/src/main/java/org/eclipse/moquette/server/Server.java index d7f58dae..606a5c29 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/Server.java +++ b/broker/src/main/java/org/eclipse/moquette/server/Server.java @@ -96,10 +96,10 @@ public class Server { } public void stopServer() { - System.out.println("Server stopping..."); + LOG.info("Server stopping..."); messaging.stop(); m_acceptor.close(); - System.out.println("Server stopped"); + LOG.info("Server stopped"); } public Properties getProperties() { diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java index 988edf44..504a2aad 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java @@ -17,7 +17,6 @@ package org.eclipse.moquette.server.netty; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInitializer; @@ -135,8 +134,8 @@ public class NettyAcceptor implements ServerAcceptor { private void initializePlainTCPTransport(IMessaging messaging, Properties props) throws IOException { final NettyMQTTHandler handler = new NettyMQTTHandler(); handler.setMessaging(messaging); - String host = props.getProperty("host"); - int port = Integer.parseInt(props.getProperty("port")); + String host = props.getProperty(Constants.HOST_PROPERTY_NAME); + int port = Integer.parseInt(props.getProperty(Constants.PORT_PROPERTY_NAME)); initFactory(host, port, new PipelineInitializer() { @Override void init(ChannelPipeline pipeline) { @@ -152,7 +151,7 @@ public class NettyAcceptor implements ServerAcceptor { } private void initializeWebSocketTransport(IMessaging messaging, Properties props) throws IOException { - String webSocketPortProp = props.getProperty("websocket_port"); + String webSocketPortProp = props.getProperty(Constants.WEB_SOCKET_PORT_PROPERTY_NAME); if (webSocketPortProp == null) { //Do nothing no WebSocket configured LOG.info("WebSocket is disabled"); @@ -163,7 +162,7 @@ public class NettyAcceptor implements ServerAcceptor { final NettyMQTTHandler handler = new NettyMQTTHandler(); handler.setMessaging(messaging); - String host = props.getProperty("host"); + String host = props.getProperty(Constants.HOST_PROPERTY_NAME); initFactory(host, port, new PipelineInitializer() { @Override void init(ChannelPipeline pipeline) { @@ -186,13 +185,13 @@ public class NettyAcceptor implements ServerAcceptor { private void initializeSSLTCPTransport(IMessaging messaging, Properties props) throws IOException { - String sslPortProp = props.getProperty("ssl_port"); + String sslPortProp = props.getProperty(Constants.SSL_PORT_PROPERTY_NAME); if (sslPortProp == null) { //Do nothing no SSL configured LOG.info("SSL is disabled"); return; } - final String jksPath = props.getProperty("jks_path"); + final String jksPath = props.getProperty(Constants.JKS_PATH_PROPERTY_NAME); if (jksPath == null || jksPath.isEmpty()) { //key_store_password or key_manager_password are empty LOG.warn("You have configured the SSL port but not the jks_path, SSL not started"); @@ -201,8 +200,8 @@ public class NettyAcceptor implements ServerAcceptor { //if we have the port also the jks then keyStorePassword and keyManagerPassword //has to be defined - final String keyStorePassword = props.getProperty("key_store_password"); - final String keyManagerPassword = props.getProperty("key_manager_password"); + final String keyStorePassword = props.getProperty(Constants.KEY_STORE_PASSWORD_PROPERTY_NAME); + final String keyManagerPassword = props.getProperty(Constants.KEY_MANAGER_PASSWORD_PROPERTY_NAME); if (keyStorePassword == null || keyStorePassword.isEmpty()) { //key_store_password or key_manager_password are empty LOG.warn("You have configured the SSL port but not the key_store_password, SSL not started"); @@ -215,7 +214,7 @@ public class NettyAcceptor implements ServerAcceptor { } int sslPort = Integer.parseInt(sslPortProp); - String host = props.getProperty("host"); + String host = props.getProperty(Constants.HOST_PROPERTY_NAME); final NettyMQTTHandler handler = new NettyMQTTHandler(); handler.setMessaging(messaging); diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java index 4bdd97b2..43f8d7f9 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java +++ b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java @@ -19,8 +19,6 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.Attribute; import io.netty.util.AttributeKey; -import java.util.HashMap; -import java.util.Map; import org.eclipse.moquette.server.Constants; import org.eclipse.moquette.server.ServerChannel; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java index f9e2d71c..f19e2fe0 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java +++ b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java @@ -25,7 +25,6 @@ import org.eclipse.moquette.proto.Utils; import org.eclipse.moquette.proto.messages.AbstractMessage; import static org.eclipse.moquette.proto.messages.AbstractMessage.*; import org.eclipse.moquette.proto.messages.PingRespMessage; -import org.eclipse.moquette.server.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java index 40ed8795..13053de2 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java @@ -41,15 +41,10 @@ public class ServerRestartIntegrationTest { MQTT m_mqtt; BlockingConnection m_subscriber; BlockingConnection m_publisher; - Properties properties; - private final static String PERSISTENT_STORE_PROPERTY_NAME = "persistent_store"; - private final static String PERSISTENT_STORE_FILE_NAME = System.getProperty("user.home") + File.separator + "moquette_store.mapdb"; protected void startServer() throws IOException { - properties = new Properties(); - properties.put(PERSISTENT_STORE_PROPERTY_NAME, PERSISTENT_STORE_FILE_NAME); m_server = new Server(); - m_server.startServer(properties); + m_server.startServer(new Properties()); } @Before diff --git a/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java b/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java index d4fb67a5..32babe21 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java +++ b/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java @@ -28,4 +28,12 @@ public class Constants { public static final String DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME = "moquette_store.mapdb"; public static final String DEFAULT_PERSISTENT_PATH = System.getProperty("user.home") + File.separator + DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME; public static final String PERSISTENT_STORE_PROPERTY_NAME = "persistence_store"; + public static final String PASSWORD_FILE_PROPERTY_NAME = "password_file"; + public static final String PORT_PROPERTY_NAME = "port"; + public static final String HOST_PROPERTY_NAME = "host"; + public static final String WEB_SOCKET_PORT_PROPERTY_NAME = "websocket_port"; + public static final String SSL_PORT_PROPERTY_NAME = "ssl_port"; + public static final String JKS_PATH_PROPERTY_NAME = "jks_path"; + public static final String KEY_STORE_PASSWORD_PROPERTY_NAME = "key_store_password"; + public static final String KEY_MANAGER_PASSWORD_PROPERTY_NAME = "key_manager_password"; }