Removed long Constants name refs

This commit is contained in:
andrea
2015-03-15 16:45:11 +01:00
parent 0aad3cbbf3
commit 331244ddd2
13 changed files with 139 additions and 150 deletions
@@ -15,19 +15,15 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import java.io.BufferedReader; import org.slf4j.Logger;
import java.io.File; import org.slf4j.LoggerFactory;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.*;
import java.io.IOException;
import java.io.Reader;
import java.text.ParseException; import java.text.ParseException;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Properties; import java.util.Properties;
import org.eclipse.moquette.commons.Constants; import static org.eclipse.moquette.commons.Constants.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Mosquitto configuration parser. * Mosquitto configuration parser.
@@ -58,11 +54,11 @@ class ConfigurationParser {
} }
private void createDefaults() { private void createDefaults() {
m_properties.put(Constants.PORT_PROPERTY_NAME, Integer.toString(Constants.PORT)); m_properties.put(PORT_PROPERTY_NAME, Integer.toString(PORT));
m_properties.put(Constants.HOST_PROPERTY_NAME, Constants.HOST); m_properties.put(HOST_PROPERTY_NAME, HOST);
m_properties.put(Constants.WEB_SOCKET_PORT_PROPERTY_NAME, Integer.toString(Constants.WEBSOCKET_PORT)); m_properties.put(WEB_SOCKET_PORT_PROPERTY_NAME, Integer.toString(WEBSOCKET_PORT));
m_properties.put(Constants.PASSWORD_FILE_PROPERTY_NAME, ""); m_properties.put(PASSWORD_FILE_PROPERTY_NAME, "");
m_properties.put(Constants.PERSISTENT_STORE_PROPERTY_NAME, Constants.DEFAULT_PERSISTENT_PATH); m_properties.put(PERSISTENT_STORE_PROPERTY_NAME, DEFAULT_PERSISTENT_PATH);
} }
/** /**
@@ -15,16 +15,17 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import org.eclipse.moquette.server.netty.NettyAcceptor;
import org.eclipse.moquette.spi.impl.SimpleMessaging;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.util.Properties; import java.util.Properties;
import org.eclipse.moquette.commons.Constants; import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import org.eclipse.moquette.spi.impl.SimpleMessaging;
import org.eclipse.moquette.server.netty.NettyAcceptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Launch a configured version of the server. * Launch a configured version of the server.
* @author andrea * @author andrea
@@ -87,7 +88,7 @@ public class Server {
public void startServer(Properties configProps) throws IOException { public void startServer(Properties configProps) throws IOException {
ConfigurationParser confParser = new ConfigurationParser(configProps); ConfigurationParser confParser = new ConfigurationParser(configProps);
m_properties = confParser.getProperties(); m_properties = confParser.getProperties();
LOG.info("Persistent store file: " + m_properties.get(Constants.PERSISTENT_STORE_PROPERTY_NAME)); LOG.info("Persistent store file: " + m_properties.get(PERSISTENT_STORE_PROPERTY_NAME));
messaging = SimpleMessaging.getInstance(); messaging = SimpleMessaging.getInstance();
messaging.init(m_properties); messaging.init(m_properties);
@@ -18,6 +18,21 @@ package org.eclipse.moquette.spi.impl;
import com.lmax.disruptor.EventHandler; import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.dsl.Disruptor; import com.lmax.disruptor.dsl.Disruptor;
import org.HdrHistogram.Histogram;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.server.IAuthenticator;
import org.eclipse.moquette.server.ServerChannel;
import org.eclipse.moquette.spi.IMessagesStore;
import org.eclipse.moquette.spi.IMessaging;
import org.eclipse.moquette.spi.ISessionsStore;
import org.eclipse.moquette.spi.impl.events.LostConnectionEvent;
import org.eclipse.moquette.spi.impl.events.MessagingEvent;
import org.eclipse.moquette.spi.impl.events.ProtocolEvent;
import org.eclipse.moquette.spi.impl.events.StopEvent;
import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore;
import org.eclipse.moquette.spi.persistence.MapDBPersistentStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@@ -25,18 +40,8 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.eclipse.moquette.spi.IMessaging; import static org.eclipse.moquette.commons.Constants.PASSWORD_FILE_PROPERTY_NAME;
import org.eclipse.moquette.spi.ISessionsStore; import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import org.eclipse.moquette.spi.IMessagesStore;
import org.eclipse.moquette.spi.impl.events.*;
import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore;
import org.eclipse.moquette.spi.persistence.MapDBPersistentStore;
import org.eclipse.moquette.proto.messages.*;
import org.eclipse.moquette.server.IAuthenticator;
import org.eclipse.moquette.server.ServerChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.HdrHistogram.Histogram;
/** /**
* *
@@ -173,7 +178,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
benchmarkEnabled = Boolean.parseBoolean(System.getProperty("moquette.processor.benchmark", "false")); benchmarkEnabled = Boolean.parseBoolean(System.getProperty("moquette.processor.benchmark", "false"));
//TODO use a property to select the storage path //TODO use a property to select the storage path
MapDBPersistentStore mapStorage = new MapDBPersistentStore(props.getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME, "")); MapDBPersistentStore mapStorage = new MapDBPersistentStore(props.getProperty(PERSISTENT_STORE_PROPERTY_NAME, ""));
m_storageService = mapStorage; m_storageService = mapStorage;
m_sessionsStore = mapStorage; m_sessionsStore = mapStorage;
@@ -183,7 +188,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
//subscriptions.init(storedSubscriptions); //subscriptions.init(storedSubscriptions);
subscriptions.init(m_sessionsStore); subscriptions.init(m_sessionsStore);
String passwdPath = props.getProperty(org.eclipse.moquette.commons.Constants.PASSWORD_FILE_PROPERTY_NAME, ""); String passwdPath = props.getProperty(PASSWORD_FILE_PROPERTY_NAME, "");
String configPath = System.getProperty("moquette.path", null); String configPath = System.getProperty("moquette.path", null);
IAuthenticator authenticator; IAuthenticator authenticator;
if (passwdPath.isEmpty()) { if (passwdPath.isEmpty()) {
@@ -73,7 +73,7 @@ public class MapDBPersistentStore implements IMessagesStore, ISessionsStore {
@Override @Override
public void initStore() { public void initStore() {
if (m_storePath == null || m_storePath.length() <= 0) { if (m_storePath == null || m_storePath.isEmpty()) {
m_db = DBMaker.newMemoryDB().make(); m_db = DBMaker.newMemoryDB().make();
} else { } else {
File tmpFile; File tmpFile;
@@ -15,14 +15,17 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import org.junit.Before;
import org.junit.Test;
import java.io.Reader; import java.io.Reader;
import java.io.StringReader; import java.io.StringReader;
import java.text.ParseException; import java.text.ParseException;
import java.util.Properties; import java.util.Properties;
import org.eclipse.moquette.commons.Constants;
import org.junit.Test; import static org.eclipse.moquette.commons.Constants.HOST;
import static org.junit.Assert.*; import static org.eclipse.moquette.commons.Constants.PORT;
import org.junit.Before; import static org.junit.Assert.assertEquals;
/** /**
* *
@@ -98,7 +101,7 @@ public class ConfigurationParserTest {
* Helper method to verify default options. * Helper method to verify default options.
*/ */
private void verifyDefaults(Properties props) { private void verifyDefaults(Properties props) {
assertEquals(Constants.PORT, Integer.parseInt(props.getProperty("port"))); assertEquals(PORT, Integer.parseInt(props.getProperty("port")));
assertEquals(Constants.HOST, props.getProperty("host")); assertEquals(HOST, props.getProperty("host"));
} }
} }
@@ -15,25 +15,21 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.fusesource.mqtt.client.BlockingConnection; import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import org.fusesource.mqtt.client.MQTT;
import org.fusesource.mqtt.client.Message;
import org.fusesource.mqtt.client.QoS;
import org.fusesource.mqtt.client.Topic;
import org.junit.After;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* *
* @author andrea * @author andrea
@@ -73,7 +69,7 @@ public class ServerIntegrationFuseTest {
} }
m_server.stopServer(); m_server.stopServer();
File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); File dbFile = new File(m_server.getProperties().getProperty(PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) { if (dbFile.exists()) {
dbFile.delete(); dbFile.delete();
} }
@@ -17,7 +17,10 @@ package org.eclipse.moquette.server;
import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence; import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
import org.junit.*; import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -25,6 +28,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import static org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME;
import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.junit.Assert.*; import static org.junit.Assert.*;
public class ServerIntegrationPahoTest { public class ServerIntegrationPahoTest {
@@ -52,8 +57,8 @@ public class ServerIntegrationPahoTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME); File dbFile = new File(DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME);
assertFalse(String.format("The DB storagefile %s already exists",org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME), dbFile.exists()); assertFalse(String.format("The DB storagefile %s already exists", DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME), dbFile.exists());
startServer(); startServer();
@@ -69,7 +74,7 @@ public class ServerIntegrationPahoTest {
} }
m_server.stopServer(); m_server.stopServer();
File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); File dbFile = new File(m_server.getProperties().getProperty(PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) { if (dbFile.exists()) {
dbFile.delete(); dbFile.delete();
} }
@@ -16,25 +16,25 @@
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.IMqttClient;
import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttClientPersistence; import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence; import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
import org.junit.After; import org.junit.After;
import static org.junit.Assert.assertEquals;
import org.junit.Before; import org.junit.Before;
import org.junit.Test;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.junit.Assert.assertEquals;
/** /**
* *
* @author andrea * @author andrea
@@ -89,7 +89,7 @@ public class ServerIntegrationQoSValidationTest {
} }
m_server.stopServer(); m_server.stopServer();
File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); File dbFile = new File(m_server.getProperties().getProperty(PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) { if (dbFile.exists()) {
dbFile.delete(); dbFile.delete();
} }
@@ -15,40 +15,29 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.security.KeyManagementException;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
import java.util.Properties;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import org.eclipse.moquette.commons.*;
import org.eclipse.moquette.commons.Constants;
import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.IMqttClient;
import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttClientPersistence; import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence; import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
import org.junit.After; import org.junit.After;
import static org.junit.Assert.assertFalse;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.net.ssl.*;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.security.*;
import java.security.cert.CertificateException;
import java.util.Properties;
import static org.eclipse.moquette.commons.Constants.*;
import static org.junit.Assert.assertFalse;
/** /**
* Check that Moquette could also handle SSL. * Check that Moquette could also handle SSL.
* *
@@ -75,17 +64,17 @@ public class ServerIntegrationSSLTest {
m_server = new Server(); m_server = new Server();
Properties sslProps = new Properties(); Properties sslProps = new Properties();
sslProps.put(org.eclipse.moquette.commons.Constants.SSL_PORT_PROPERTY_NAME, "8883"); sslProps.put(SSL_PORT_PROPERTY_NAME, "8883");
sslProps.put(org.eclipse.moquette.commons.Constants.JKS_PATH_PROPERTY_NAME, "serverkeystore.jks"); sslProps.put(JKS_PATH_PROPERTY_NAME, "serverkeystore.jks");
sslProps.put(org.eclipse.moquette.commons.Constants.KEY_STORE_PASSWORD_PROPERTY_NAME, "passw0rdsrv"); sslProps.put(KEY_STORE_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
sslProps.put(Constants.KEY_MANAGER_PASSWORD_PROPERTY_NAME, "passw0rdsrv"); sslProps.put(KEY_MANAGER_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
m_server.startServer(sslProps); m_server.startServer(sslProps);
} }
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME); File dbFile = new File(DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME);
assertFalse(String.format("The DB storage file %s already exists",org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME), dbFile.exists()); assertFalse(String.format("The DB storage file %s already exists", DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME), dbFile.exists());
startServer(); startServer();
@@ -15,29 +15,29 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.moquette.commons.Constants;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.websocket.client.WebSocketClient; import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.moquette.commons.Constants;
import org.junit.After;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Integration test to check the function of Moquette with a WebSocket channel. * Integration test to check the function of Moquette with a WebSocket channel.
* *
* @author andrea * @author andreaorg.eclipse.moquette.commons.Constants.
*/ */
public class ServerIntegrationWebSocketTest { public class ServerIntegrationWebSocketTest {
private static final Logger LOG = LoggerFactory.getLogger(ServerIntegrationPahoTest.class); private static final Logger LOG = LoggerFactory.getLogger(ServerIntegrationPahoTest.class);
@@ -61,7 +61,7 @@ public class ServerIntegrationWebSocketTest {
client.stop(); client.stop();
m_server.stopServer(); m_server.stopServer();
File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); File dbFile = new File(m_server.getProperties().getProperty(PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) { if (dbFile.exists()) {
dbFile.delete(); dbFile.delete();
} }
@@ -15,31 +15,27 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
import org.eclipse.moquette.proto.messages.ConnAckMessage;
import org.eclipse.moquette.proto.messages.ConnectMessage;
import org.eclipse.moquette.testclient.Client;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.eclipse.moquette.proto.messages.AbstractMessage; import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
import org.eclipse.moquette.proto.messages.ConnAckMessage;
import org.eclipse.moquette.proto.messages.ConnectMessage;
import org.eclipse.moquette.testclient.Client;
import org.fusesource.mqtt.client.BlockingConnection;
import org.fusesource.mqtt.client.MQTT;
import org.fusesource.mqtt.client.Message;
import org.fusesource.mqtt.client.QoS;
import org.fusesource.mqtt.client.Topic;
import org.junit.After;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* *
* @author andrea * @author andrea
@@ -72,7 +68,7 @@ public class ServerLowlevelMessagesIntegrationTests {
Thread.sleep(300); //to let the close event pass before server stop event Thread.sleep(300); //to let the close event pass before server stop event
m_server.stopServer(); m_server.stopServer();
LOG.debug("After asked server to stop"); LOG.debug("After asked server to stop");
File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); File dbFile = new File(m_server.getProperties().getProperty(PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) { if (dbFile.exists()) {
dbFile.delete(); dbFile.delete();
} }
@@ -15,21 +15,19 @@
*/ */
package org.eclipse.moquette.server; package org.eclipse.moquette.server;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.fusesource.mqtt.client.BlockingConnection; import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import org.fusesource.mqtt.client.MQTT; import static org.junit.Assert.assertEquals;
import org.fusesource.mqtt.client.Message; import static org.junit.Assert.assertNull;
import org.fusesource.mqtt.client.QoS;
import org.fusesource.mqtt.client.Topic;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
/** /**
* *
@@ -68,7 +66,7 @@ public class ServerRestartIntegrationTest {
} }
m_server.stopServer(); m_server.stopServer();
File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); File dbFile = new File(m_server.getProperties().getProperty(PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) { if (dbFile.exists()) {
dbFile.delete(); dbFile.delete();
} }
@@ -87,7 +85,7 @@ public class ServerRestartIntegrationTest {
//shutdown the server //shutdown the server
m_server.stopServer(); m_server.stopServer();
File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); File dbFile = new File(m_server.getProperties().getProperty(PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) { if (dbFile.exists()) {
dbFile.delete(); dbFile.delete();
} }
@@ -15,19 +15,19 @@
*/ */
package org.eclipse.moquette.spi.impl; package org.eclipse.moquette.spi.impl;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
import org.eclipse.moquette.spi.persistence.MapDBPersistentStore;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import org.eclipse.moquette.spi.impl.subscriptions.Subscription; import static org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH;
import org.eclipse.moquette.spi.persistence.MapDBPersistentStore;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.junit.After;
import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Before;
/** /**
* *
* @author andrea * @author andrea
@@ -39,10 +39,10 @@ public class MapDBPersistentStoreTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH); File dbFile = new File(DEFAULT_PERSISTENT_PATH);
assertFalse(String.format("The DB storagefile %s already exists", org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH), dbFile.exists()); assertFalse(String.format("The DB storagefile %s already exists", DEFAULT_PERSISTENT_PATH), dbFile.exists());
m_storageService = new MapDBPersistentStore(org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH); m_storageService = new MapDBPersistentStore(DEFAULT_PERSISTENT_PATH);
m_storageService.initStore(); m_storageService.initStore();
} }
@@ -52,9 +52,9 @@ public class MapDBPersistentStoreTest {
m_storageService.close(); m_storageService.close();
} }
File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH); File dbFile = new File(DEFAULT_PERSISTENT_PATH);
if (dbFile.exists()) { if (dbFile.exists()) {
assertTrue("Error deleting the moquette db file " + org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH, dbFile.delete()); assertTrue("Error deleting the moquette db file " + DEFAULT_PERSISTENT_PATH, dbFile.delete());
} }
assertFalse(dbFile.exists()); assertFalse(dbFile.exists());
} }