anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved project package from org.eclipse.moquette to io.moquette

Browse Source
This commit is contained in:
andsel
2015-11-20 21:30:59 +01:00
parent f438ef7f49
commit 371c740321
175 changed files with 629 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java → broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java
+9 -12
View File
@@ -13,10 +13,13 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import io.moquette.commons.Constants;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import io.moquette.spi.impl.security.IAuthenticator;
import io.moquette.spi.impl.security.IAuthorizator;
import org.junit.After;
import org.junit.Test;
import org.slf4j.Logger;
@@ -26,12 +29,6 @@ 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.eclipse.moquette.commons.Constants.AUTHENTICATOR_CLASS_NAME;
import static org.eclipse.moquette.commons.Constants.AUTHORIZATOR_CLASS_NAME;
import org.eclipse.moquette.spi.impl.security.IAuthenticator;
import org.eclipse.moquette.spi.impl.security.IAuthorizator;
import static org.junit.Assert.*;
/**
@@ -54,7 +51,7 @@ public class ConfigurationClassLoaderTest implements IAuthenticator, IAuthorizat
@After
public void tearDown() throws Exception {
m_server.stopServer();
File dbFile = new File(m_config.getProperty(PERSISTENT_STORE_PROPERTY_NAME));
File dbFile = new File(m_config.getProperty(io.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME));
if (dbFile.exists()) {
dbFile.delete();
}
@@ -63,7 +60,7 @@ public class ConfigurationClassLoaderTest implements IAuthenticator, IAuthorizat
@Test
public void loadAuthenticator() throws Exception {
Properties props = new Properties(IntegrationUtils.prepareTestPropeties());
props.setProperty(AUTHENTICATOR_CLASS_NAME, "org.eclipse.moquette.server.ConfigurationClassLoaderTest");
props.setProperty(Constants.AUTHENTICATOR_CLASS_NAME, "io.moquette.server.ConfigurationClassLoaderTest");
startServer(props);
assertTrue(true);
m_server.stopServer();
@@ -72,7 +69,7 @@ public class ConfigurationClassLoaderTest implements IAuthenticator, IAuthorizat
@Test
public void loadAuthorizator() throws Exception {
Properties props = new Properties(IntegrationUtils.prepareTestPropeties());
props.setProperty(AUTHORIZATOR_CLASS_NAME, "org.eclipse.moquette.server.ConfigurationClassLoaderTest");
props.setProperty(Constants.AUTHORIZATOR_CLASS_NAME, "io.moquette.server.ConfigurationClassLoaderTest");
startServer(props);
assertTrue(true);
m_server.stopServer();
broker/src/test/java/org/eclipse/moquette/server/IntegrationUtils.java → broker/src/test/java/io/moquette/server/IntegrationUtils.java
+4 -4
View File
@@ -13,15 +13,15 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import io.moquette.server.config.IConfig;
import java.io.File;
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 io.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME;
import static io.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.junit.Assert.assertFalse;
/**
broker/src/test/java/org/eclipse/moquette/server/MQTTWebSocket.java → broker/src/test/java/io/moquette/server/MQTTWebSocket.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import java.io.IOException;
import java.nio.ByteBuffer;
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java → broker/src/test/java/io/moquette/server/ServerIntegrationFuseTest.java
+3 -3
View File
@@ -13,10 +13,10 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java → broker/src/test/java/io/moquette/server/ServerIntegrationPahoTest.java
+3 -3
View File
@@ -13,10 +13,10 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
import org.junit.After;
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java → broker/src/test/java/io/moquette/server/ServerIntegrationQoSValidationTest.java
+3 -3
View File
@@ -13,11 +13,11 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import org.eclipse.paho.client.mqttv3.IMqttClient;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java → broker/src/test/java/io/moquette/server/ServerIntegrationSSLTest.java
+7 -11
View File
@@ -13,13 +13,8 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import static org.eclipse.moquette.commons.Constants.JKS_PATH_PROPERTY_NAME;
import static org.eclipse.moquette.commons.Constants.KEY_MANAGER_PASSWORD_PROPERTY_NAME;
import static org.eclipse.moquette.commons.Constants.KEY_STORE_PASSWORD_PROPERTY_NAME;
import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.eclipse.moquette.commons.Constants.SSL_PORT_PROPERTY_NAME;
import static org.junit.Assert.assertFalse;
import java.io.File;
@@ -39,6 +34,7 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import io.moquette.commons.Constants;
import org.eclipse.paho.client.mqttv3.IMqttClient;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
@@ -79,11 +75,11 @@ public class ServerIntegrationSSLTest {
m_server = new Server();
Properties sslProps = new Properties();
sslProps.put(SSL_PORT_PROPERTY_NAME, "8883");
sslProps.put(JKS_PATH_PROPERTY_NAME, "serverkeystore.jks");
sslProps.put(KEY_STORE_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
sslProps.put(KEY_MANAGER_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
sslProps.put(PERSISTENT_STORE_PROPERTY_NAME, IntegrationUtils.localMapDBPath());
sslProps.put(io.moquette.commons.Constants.SSL_PORT_PROPERTY_NAME, "8883");
sslProps.put(Constants.JKS_PATH_PROPERTY_NAME, "serverkeystore.jks");
sslProps.put(Constants.KEY_STORE_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
sslProps.put(Constants.KEY_MANAGER_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
sslProps.put(Constants.PERSISTENT_STORE_PROPERTY_NAME, IntegrationUtils.localMapDBPath());
m_server.startServer(sslProps);
}
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java → broker/src/test/java/io/moquette/server/ServerIntegrationWebSocketTest.java
+5 -8
View File
@@ -13,33 +13,30 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import io.moquette.server.config.MemoryConfig;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.moquette.commons.Constants;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import io.moquette.server.config.IConfig;
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.IOException;
import java.net.URI;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.junit.Assert.assertTrue;
/**
* Integration test to check the function of Moquette with a WebSocket channel.
*
* @author andreaorg.eclipse.moquette.commons.Constants.
* @author andrea
*/
public class ServerIntegrationWebSocketTest {
private static final Logger LOG = LoggerFactory.getLogger(ServerIntegrationWebSocketTest.class);
@@ -72,7 +69,7 @@ public class ServerIntegrationWebSocketTest {
@Test
public void checkPlainConnect() throws Exception {
LOG.info("*** checkPlainConnect ***");
String destUri = "ws://localhost:" + Constants.WEBSOCKET_PORT;
String destUri = "ws://localhost:" + io.moquette.commons.Constants.WEBSOCKET_PORT;
MQTTWebSocket socket = new MQTTWebSocket();
client.start();
broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java → broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java
+8 -10
View File
@@ -13,15 +13,15 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.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.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.eclipse.moquette.testclient.Client;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import io.moquette.testclient.Client;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
@@ -29,13 +29,11 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.junit.Assert.*;
/**
broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java → broker/src/test/java/io/moquette/server/ServerRestartIntegrationTest.java
+3 -3
View File
@@ -13,10 +13,10 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
broker/src/test/java/org/eclipse/moquette/server/TestCallback.java → broker/src/test/java/io/moquette/server/TestCallback.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package io.moquette.server;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java → broker/src/test/java/io/moquette/server/config/ConfigurationParserTest.java
+5 -6
View File
@@ -13,9 +13,10 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server.config;
package io.moquette.server.config;
import org.eclipse.moquette.server.config.ConfigurationParser;
import io.moquette.commons.Constants;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -24,8 +25,6 @@ import java.io.StringReader;
import java.text.ParseException;
import java.util.Properties;
import static org.eclipse.moquette.commons.Constants.HOST;
import static org.eclipse.moquette.commons.Constants.PORT;
import static org.junit.Assert.assertEquals;
/**
@@ -102,7 +101,7 @@ public class ConfigurationParserTest {
* Helper method to verify default options.
*/
private void verifyDefaults(Properties props) {
assertEquals(PORT, Integer.parseInt(props.getProperty("port")));
assertEquals(HOST, props.getProperty("host"));
Assert.assertEquals(Constants.PORT, Integer.parseInt(props.getProperty("port")));
Assert.assertEquals(Constants.HOST, props.getProperty("host"));
}
}
broker/src/test/java/org/eclipse/moquette/spec/v3_1_1/connection/ConnectionIT.java → broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java
+6 -8
View File
@@ -13,21 +13,19 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spec.v3_1_1.connection;
package io.moquette.spec.v3_1_1.connection;
import static org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH;
import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import org.eclipse.moquette.server.Server;
import org.eclipse.moquette.testclient.RawClient;
import io.moquette.commons.Constants;
import io.moquette.server.Server;
import io.moquette.testclient.RawClient;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Ignore;
import org.junit.Test;
@@ -54,9 +52,9 @@ public class ConnectionIT {
public void tearDown() throws Exception {
m_server.stopServer();
File dbFile = new File(DEFAULT_PERSISTENT_PATH);
File dbFile = new File(Constants.DEFAULT_PERSISTENT_PATH);
if (dbFile.exists()) {
assertTrue("Error deleting the moquette db file " + DEFAULT_PERSISTENT_PATH, dbFile.delete());
assertTrue("Error deleting the moquette db file " + Constants.DEFAULT_PERSISTENT_PATH, dbFile.delete());
}
assertFalse(dbFile.exists());
}
broker/src/test/java/org/eclipse/moquette/spi/impl/BrokerInterceptorTest.java → broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java
+7 -7
View File
@@ -13,14 +13,14 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
import org.eclipse.moquette.interception.messages.*;
import org.eclipse.moquette.interception.InterceptHandler;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.proto.messages.ConnectMessage;
import org.eclipse.moquette.proto.messages.PublishMessage;
import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.interception.messages.*;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.interception.InterceptHandler;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannel.java → broker/src/test/java/io/moquette/spi/impl/DummyChannel.java
+4 -4
View File
@@ -13,12 +13,12 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
import io.moquette.server.ServerChannel;
import io.netty.util.AttributeKey;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.proto.messages.ConnAckMessage;
import org.eclipse.moquette.server.ServerChannel;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.ConnAckMessage;
import java.util.HashMap;
import java.util.Map;
broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannelHandlerContext.java → broker/src/test/java/io/moquette/spi/impl/DummyChannelHandlerContext.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
/**
* Created by andrea on 6/7/15.
broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryMessagesStore.java → broker/src/test/java/io/moquette/spi/impl/MemoryMessagesStore.java
+4 -4
View File
@@ -13,16 +13,16 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
import org.eclipse.moquette.spi.IMatchingCondition;
import org.eclipse.moquette.spi.IMessagesStore;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.IMatchingCondition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
import static org.eclipse.moquette.spi.impl.Utils.defaultGet;
import static io.moquette.spi.impl.Utils.defaultGet;
/**
* @author andrea
broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java → broker/src/test/java/io/moquette/spi/impl/MemoryStorageService.java
+5 -4
View File
@@ -13,11 +13,12 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.persistence.MemorySessionStore;
import org.eclipse.moquette.spi.IMessagesStore;
import org.eclipse.moquette.spi.ISessionsStore;
import org.eclipse.moquette.spi.persistence.MemorySessionStore;
import java.util.HashMap;
import java.util.Map;
broker/src/test/java/org/eclipse/moquette/spi/impl/MockAuthenticator.java → broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java
+3 -2
View File
@@ -13,10 +13,11 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
import java.util.Map;
import org.eclipse.moquette.spi.impl.security.IAuthenticator;
import io.moquette.spi.impl.security.IAuthenticator;
/**
* Test utility to implements authenticator instance.
broker/src/test/java/org/eclipse/moquette/spi/impl/MockReceiverChannel.java → broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java
+3 -3
View File
@@ -12,11 +12,11 @@
* http://www.opensource.org/licenses/apache2.0.php
*
* You may elect to redistribute this code under either of these licenses.
*/package org.eclipse.moquette.spi.impl;
*/package io.moquette.spi.impl;
import io.netty.util.AttributeKey;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.server.ServerChannel;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.server.ServerChannel;
import java.util.HashMap;
import java.util.Map;
broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java → broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
+13 -13
View File
@@ -13,20 +13,20 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
import org.eclipse.moquette.interception.InterceptHandler;
import org.eclipse.moquette.proto.messages.*;
import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
import org.eclipse.moquette.server.netty.NettyChannel;
import org.eclipse.moquette.spi.ClientSession;
import org.eclipse.moquette.spi.IMatchingCondition;
import org.eclipse.moquette.spi.IMessagesStore;
import org.eclipse.moquette.spi.IMessagesStore.StoredMessage;
import org.eclipse.moquette.spi.ISessionsStore;
import org.eclipse.moquette.spi.impl.security.PermitAllAuthorizator;
import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore;
import io.moquette.proto.messages.*;
import io.moquette.interception.InterceptHandler;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.server.netty.NettyChannel;
import io.moquette.spi.ClientSession;
import io.moquette.spi.IMatchingCondition;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.IMessagesStore.StoredMessage;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.security.PermitAllAuthorizator;
import io.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
import org.junit.Before;
import org.junit.Test;
broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java → broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java
+28 -26
View File
@@ -13,23 +13,25 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl;
package io.moquette.spi.impl;
import org.eclipse.moquette.proto.messages.*;
import org.eclipse.moquette.server.netty.NettyChannel;
import org.eclipse.moquette.spi.IMessagesStore;
import org.eclipse.moquette.spi.ISessionsStore;
import org.eclipse.moquette.spi.impl.security.PermitAllAuthorizator;
import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.proto.messages.SubscribeMessage;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
import io.moquette.server.netty.NettyChannel;
import io.moquette.spi.impl.security.PermitAllAuthorizator;
import io.moquette.spi.impl.subscriptions.Subscription;
import org.junit.Before;
import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
import static org.eclipse.moquette.spi.impl.ProtocolProcessorTest.*;
import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1;
import static io.moquette.parser.netty.Utils.VERSION_3_1_1;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -65,7 +67,7 @@ public class ProtocolProcessor_CONNECT_Test {
//m_messagesStore.initStore();
Map<String, byte[]> users = new HashMap<>();
users.put(TEST_USER, TEST_PWD);
users.put(ProtocolProcessorTest.TEST_USER, ProtocolProcessorTest.TEST_PWD);
m_mockAuthenticator = new MockAuthenticator(users);
subscriptions = new SubscriptionsStore();
@@ -121,8 +123,8 @@ public class ProtocolProcessor_CONNECT_Test {
connMsg.setClientID("123");
connMsg.setUserFlag(true);
connMsg.setPasswordFlag(true);
connMsg.setUsername(TEST_USER);
connMsg.setPassword(TEST_PWD);
connMsg.setUsername(ProtocolProcessorTest.TEST_USER);
connMsg.setPassword(ProtocolProcessorTest.TEST_PWD);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -136,7 +138,7 @@ public class ProtocolProcessor_CONNECT_Test {
connMsg.setClientID("123");
connMsg.setUserFlag(true);
connMsg.setPasswordFlag(false);
connMsg.setUsername(TEST_USER);
connMsg.setUsername(ProtocolProcessorTest.TEST_USER);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -150,8 +152,8 @@ public class ProtocolProcessor_CONNECT_Test {
connMsg.setClientID("123");
connMsg.setUserFlag(true);
connMsg.setPasswordFlag(true);
connMsg.setUsername(TEST_USER + "_fake");
connMsg.setPassword(TEST_PWD);
connMsg.setUsername(ProtocolProcessorTest.TEST_USER + "_fake");
connMsg.setPassword(ProtocolProcessorTest.TEST_PWD);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -163,7 +165,7 @@ public class ProtocolProcessor_CONNECT_Test {
@Test
public void prohibitAnonymousClient() {
connMsg.setClientID("123");
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false, new PermitAllAuthorizator(), NO_OBSERVERS_INTERCEPTOR);
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false, new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -176,8 +178,8 @@ public class ProtocolProcessor_CONNECT_Test {
public void prohibitAnonymousClient_providingUsername() {
connMsg.setClientID("123");
connMsg.setUserFlag(true);
connMsg.setUsername(TEST_USER + "_fake");
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false, new PermitAllAuthorizator(), NO_OBSERVERS_INTERCEPTOR);
connMsg.setUsername(ProtocolProcessorTest.TEST_USER + "_fake");
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false, new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -189,7 +191,7 @@ public class ProtocolProcessor_CONNECT_Test {
@Test
public void acceptAnonymousClient() {
connMsg.setClientID("123");
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, true, new PermitAllAuthorizator(), NO_OBSERVERS_INTERCEPTOR);
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, true, new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -204,8 +206,8 @@ public class ProtocolProcessor_CONNECT_Test {
connMsg.setClientID("Client1");
connMsg.setUserFlag(true);
connMsg.setPasswordFlag(true);
connMsg.setUsername(TEST_USER);
connMsg.setPassword(TEST_PWD);
connMsg.setUsername(ProtocolProcessorTest.TEST_USER);
connMsg.setPassword(ProtocolProcessorTest.TEST_PWD);
m_processor.processConnect(m_session, connMsg);
assertEquals(ConnAckMessage.CONNECTION_ACCEPTED, m_session.getReturnCode());
@@ -215,8 +217,8 @@ public class ProtocolProcessor_CONNECT_Test {
evilClientConnMsg.setClientID("Client1");
evilClientConnMsg.setUserFlag(true);
evilClientConnMsg.setPasswordFlag(true);
evilClientConnMsg.setUsername(EVIL_TEST_USER);
evilClientConnMsg.setPassword(EVIL_TEST_PWD);
evilClientConnMsg.setUsername(ProtocolProcessorTest.EVIL_TEST_USER);
evilClientConnMsg.setPassword(ProtocolProcessorTest.EVIL_TEST_PWD);
DummyChannel evilSession = new DummyChannel();
//Exercise
@@ -270,11 +272,11 @@ public class ProtocolProcessor_CONNECT_Test {
//subscribe
SubscribeMessage subscribeMsg = new SubscribeMessage();
subscribeMsg.addSubscription(new SubscribeMessage.Couple((byte) AbstractMessage.QOSType.MOST_ONE.ordinal(), FAKE_TOPIC));
subscribeMsg.addSubscription(new SubscribeMessage.Couple((byte) AbstractMessage.QOSType.MOST_ONE.ordinal(), ProtocolProcessorTest.FAKE_TOPIC));
m_session.setAttribute(NettyChannel.ATTR_KEY_CLIENTID, "CliID");
m_session.setAttribute(NettyChannel.ATTR_KEY_CLEANSESSION, false);
m_processor.processSubscribe(m_session, subscribeMsg);
Subscription expectedSubscription = new Subscription("CliID", FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, false);
Subscription expectedSubscription = new Subscription("CliID", ProtocolProcessorTest.FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, false);
assertTrue(subscriptions.contains(expectedSubscription));
//disconnect
broker/src/test/java/org/eclipse/moquette/spi/impl/security/ACLFileParserTest.java → broker/src/test/java/io/moquette/spi/impl/security/ACLFileParserTest.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl.security;
package io.moquette.spi.impl.security;
import org.junit.Test;
broker/src/test/java/org/eclipse/moquette/spi/impl/security/AuthorizationsCollectorTest.java → broker/src/test/java/io/moquette/spi/impl/security/AuthorizationsCollectorTest.java
+1 -3
View File
@@ -13,13 +13,11 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl.security;
package io.moquette.spi.impl.security;
import org.junit.Before;
import org.junit.Test;
import java.io.Reader;
import java.io.StringReader;
import java.text.ParseException;
import static org.junit.Assert.*;
broker/src/test/java/org/eclipse/moquette/spi/impl/security/FileAuthenticatorTest.java → broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl.security;
package io.moquette.spi.impl.security;
import org.junit.Test;
broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java → broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java
+4 -4
View File
@@ -13,16 +13,16 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.impl.subscriptions;
package io.moquette.spi.impl.subscriptions;
import java.io.IOException;
import java.text.ParseException;
import java.util.Arrays;
import java.util.List;
import org.eclipse.moquette.spi.ISessionsStore;
import org.eclipse.moquette.spi.impl.MemoryStorageService;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.MemoryStorageService;
import io.moquette.proto.messages.AbstractMessage;
import static org.junit.Assert.*;
import org.junit.Before;
broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNodeTest.java → broker/src/test/java/io/moquette/spi/impl/subscriptions/TreeNodeTest.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.eclipse.moquette.spi.impl.subscriptions;
package io.moquette.spi.impl.subscriptions;
import static io.moquette.proto.messages.AbstractMessage.QOSType.*;
import static junit.framework.Assert.assertEquals;
import static org.eclipse.moquette.proto.messages.AbstractMessage.QOSType.*;
import org.junit.Test;
import java.util.Set;
broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java → broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java
+10 -10
View File
@@ -13,13 +13,14 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.persistence;
package io.moquette.spi.persistence;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.server.IntegrationUtils;
import org.eclipse.moquette.spi.IMessagesStore;
import org.eclipse.moquette.spi.ISessionsStore;
import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.commons.Constants;
import io.moquette.server.IntegrationUtils;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.ISessionsStore;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -27,7 +28,6 @@ import org.junit.Test;
import java.util.List;
import java.util.concurrent.TimeUnit;
import static org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH;
import static org.junit.Assert.*;
/**
@@ -42,8 +42,8 @@ public class MapDBPersistentStoreTest {
@Before
public void setUp() throws Exception {
IntegrationUtils.cleanPersistenceFile(DEFAULT_PERSISTENT_PATH);
m_storageService = new MapDBPersistentStore(DEFAULT_PERSISTENT_PATH);
IntegrationUtils.cleanPersistenceFile(Constants.DEFAULT_PERSISTENT_PATH);
m_storageService = new MapDBPersistentStore(Constants.DEFAULT_PERSISTENT_PATH);
m_storageService.initStore();
m_messagesStore = m_storageService.messagesStore();
m_sessionsStore = m_storageService.sessionsStore(m_messagesStore);
@@ -55,7 +55,7 @@ public class MapDBPersistentStoreTest {
m_storageService.close();
}
IntegrationUtils.cleanPersistenceFile(DEFAULT_PERSISTENT_PATH);
IntegrationUtils.cleanPersistenceFile(Constants.DEFAULT_PERSISTENT_PATH);
}
@Test
broker/src/test/java/org/eclipse/moquette/spi/persistence/MemorySessionStore.java → broker/src/test/java/io/moquette/spi/persistence/MemorySessionStore.java
+17 -19
View File
@@ -13,16 +13,14 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.spi.persistence;
package io.moquette.spi.persistence;
import org.eclipse.moquette.spi.ClientSession;
import org.eclipse.moquette.spi.IMessagesStore;
import org.eclipse.moquette.spi.ISessionsStore;
import org.eclipse.moquette.spi.impl.MemoryStorageService;
import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.spi.ClientSession;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.Utils;
import io.moquette.spi.impl.subscriptions.Subscription;
import static org.eclipse.moquette.spi.impl.Utils.defaultGet;
import static org.eclipse.moquette.spi.persistence.MapDBPersistentStore.PersistentSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +35,7 @@ public class MemorySessionStore implements ISessionsStore {
private Map<String, Set<Subscription>> m_persistentSubscriptions = new HashMap<>();
private Map<String, PersistentSession> m_persistentSessions = new HashMap<>();
private Map<String, MapDBPersistentStore.PersistentSession> m_persistentSessions = new HashMap<>();
//maps clientID->[MessageId -> guid]
private Map<String, Map<Integer, String>> m_inflightStore = new HashMap<>();
@@ -118,7 +116,7 @@ public class MemorySessionStore implements ISessionsStore {
}
LOG.debug("clientID {} is a newcome, creating it's empty subscriptions set", clientID);
m_persistentSubscriptions.put(clientID, new HashSet<Subscription>());
m_persistentSessions.put(clientID, new PersistentSession(cleanSession, false));
m_persistentSessions.put(clientID, new MapDBPersistentStore.PersistentSession(cleanSession, false));
return new ClientSession(clientID, m_messagesStore, this, cleanSession);
}
@@ -128,7 +126,7 @@ public class MemorySessionStore implements ISessionsStore {
return null;
}
PersistentSession storedSession = m_persistentSessions.get(clientID);
MapDBPersistentStore.PersistentSession storedSession = m_persistentSessions.get(clientID);
ClientSession clientSession = new ClientSession(clientID, m_messagesStore, this, storedSession.cleanSession);
if (storedSession.active) {
clientSession.activate();
@@ -156,11 +154,11 @@ public class MemorySessionStore implements ISessionsStore {
}
private void activationHelper(String clientID, boolean activation) {
PersistentSession storedSession = m_persistentSessions.get(clientID);
MapDBPersistentStore.PersistentSession storedSession = m_persistentSessions.get(clientID);
if (storedSession == null) {
throw new IllegalStateException((activation ? "activating" : "deactivating") + " a session never stored/created, clientID <"+ clientID + ">", null);
}
PersistentSession newStoredSession = new PersistentSession(storedSession.cleanSession, activation);
MapDBPersistentStore.PersistentSession newStoredSession = new MapDBPersistentStore.PersistentSession(storedSession.cleanSession, activation);
m_persistentSessions.put(clientID, newStoredSession);
}
@@ -186,40 +184,40 @@ public class MemorySessionStore implements ISessionsStore {
@Override
public void bindToDeliver(String guid, String clientID) {
Set<String> guids = defaultGet(m_enqueuedStore, clientID, new HashSet<String>());
Set<String> guids = Utils.defaultGet(m_enqueuedStore, clientID, new HashSet<String>());
guids.add(guid);
m_enqueuedStore.put(clientID, guids);
}
@Override
public Collection<String> enqueued(String clientID) {
return defaultGet(m_enqueuedStore, clientID, new HashSet<String>());
return Utils.defaultGet(m_enqueuedStore, clientID, new HashSet<String>());
}
@Override
public void removeEnqueued(String clientID, String guid) {
Set<String> guids = defaultGet(m_enqueuedStore, clientID, new HashSet<String>());
Set<String> guids = Utils.defaultGet(m_enqueuedStore, clientID, new HashSet<String>());
guids.remove(guid);
m_enqueuedStore.put(clientID, guids);
}
@Override
public void secondPhaseAcknowledged(String clientID, int messageID) {
Set<Integer> messageIDs = defaultGet(m_secondPhaseStore, clientID, new HashSet<Integer>());
Set<Integer> messageIDs = Utils.defaultGet(m_secondPhaseStore, clientID, new HashSet<Integer>());
messageIDs.remove(messageID);
m_secondPhaseStore.put(clientID, messageIDs);
}
@Override
public void secondPhaseAckWaiting(String clientID, int messageID) {
Set<Integer> messageIDs = defaultGet(m_secondPhaseStore, clientID, new HashSet<Integer>());
Set<Integer> messageIDs = Utils.defaultGet(m_secondPhaseStore, clientID, new HashSet<Integer>());
messageIDs.add(messageID);
m_secondPhaseStore.put(clientID, messageIDs);
}
@Override
public String mapToGuid(String clientID, int messageID) {
HashMap<Integer, String> guids = (HashMap<Integer, String>) defaultGet(m_messageToGuids,
HashMap<Integer, String> guids = (HashMap<Integer, String>) Utils.defaultGet(m_messageToGuids,
clientID, new HashMap<Integer, String>());
return guids.get(messageID);
}
broker/src/test/java/org/eclipse/moquette/testclient/Client.java → broker/src/test/java/io/moquette/testclient/Client.java
+5 -5
View File
@@ -13,8 +13,11 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.testclient;
package io.moquette.testclient;
import io.moquette.commons.Constants;
import io.moquette.parser.netty.MQTTDecoder;
import io.moquette.parser.netty.MQTTEncoder;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
@@ -24,10 +27,7 @@ import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import org.eclipse.moquette.commons.Constants;
import org.eclipse.moquette.parser.netty.MQTTDecoder;
import org.eclipse.moquette.parser.netty.MQTTEncoder;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.AbstractMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
broker/src/test/java/org/eclipse/moquette/testclient/ClientNettyMQTTHandler.java → broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java
+4 -4
View File
@@ -13,14 +13,14 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.testclient;
package io.moquette.testclient;
import io.moquette.proto.Utils;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.eclipse.moquette.proto.Utils;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.server.netty.NettyMQTTHandler;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.server.netty.NettyMQTTHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
broker/src/test/java/org/eclipse/moquette/testclient/RawClient.java → broker/src/test/java/io/moquette/testclient/RawClient.java
+2 -2
View File
@@ -1,4 +1,4 @@
package org.eclipse.moquette.testclient;
package io.moquette.testclient;
import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.ByteBuf;
@@ -8,7 +8,7 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.ReferenceCountUtil;
import org.eclipse.moquette.parser.netty.Utils;
import io.moquette.parser.netty.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;