diff --git a/README.md b/README.md index 1cf394c8..3712b588 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Include dependency in your project: ``` - org.eclipse.moquette + io.moquette moquette-broker 0.7 diff --git a/broker/pom.xml b/broker/pom.xml index 75a3129e..b62f5d74 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -5,7 +5,7 @@ ../ moquette-parent - org.eclipse.moquette + io.moquette 0.8-SNAPSHOT diff --git a/broker/src/main/java/org/eclipse/moquette/interception/InterceptHandler.java b/broker/src/main/java/io/moquette/interception/InterceptHandler.java similarity index 71% rename from broker/src/main/java/org/eclipse/moquette/interception/InterceptHandler.java rename to broker/src/main/java/io/moquette/interception/InterceptHandler.java index a66aef8d..146471c0 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/InterceptHandler.java +++ b/broker/src/main/java/io/moquette/interception/InterceptHandler.java @@ -13,15 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.interception; +package io.moquette.interception; -import org.eclipse.moquette.interception.messages.InterceptConnectMessage; -import org.eclipse.moquette.interception.messages.InterceptDisconnectMessage; -import org.eclipse.moquette.interception.messages.InterceptPublishMessage; -import org.eclipse.moquette.interception.messages.InterceptSubscribeMessage; -import org.eclipse.moquette.interception.messages.InterceptUnsubscribeMessage; -import org.eclipse.moquette.proto.messages.*; -import org.eclipse.moquette.spi.impl.subscriptions.Subscription; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.spi.impl.subscriptions.Subscription; +import io.moquette.interception.messages.InterceptConnectMessage; +import io.moquette.interception.messages.InterceptDisconnectMessage; +import io.moquette.interception.messages.InterceptPublishMessage; +import io.moquette.interception.messages.InterceptSubscribeMessage; +import io.moquette.interception.messages.InterceptUnsubscribeMessage; /** * This interface is used to inject code for intercepting broker events. diff --git a/broker/src/main/java/org/eclipse/moquette/interception/Interceptor.java b/broker/src/main/java/io/moquette/interception/Interceptor.java similarity index 85% rename from broker/src/main/java/org/eclipse/moquette/interception/Interceptor.java rename to broker/src/main/java/io/moquette/interception/Interceptor.java index 957f5046..13f54799 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/Interceptor.java +++ b/broker/src/main/java/io/moquette/interception/Interceptor.java @@ -13,11 +13,11 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.interception; +package io.moquette.interception; -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.proto.messages.ConnectMessage; +import io.moquette.proto.messages.PublishMessage; +import io.moquette.spi.impl.subscriptions.Subscription; /** * This interface is to be used internally by the broker components. diff --git a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptAbstractMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java similarity index 79% rename from broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptAbstractMessage.java rename to broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java index f8720eaf..a3a7a159 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptAbstractMessage.java +++ b/broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java @@ -1,6 +1,6 @@ -package org.eclipse.moquette.interception.messages; +package io.moquette.interception.messages; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; /** * @author Wagner Macedo diff --git a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptConnectMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java similarity index 92% rename from broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptConnectMessage.java rename to broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java index 35a7bc17..17333ac5 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptConnectMessage.java +++ b/broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java @@ -1,6 +1,6 @@ -package org.eclipse.moquette.interception.messages; +package io.moquette.interception.messages; -import org.eclipse.moquette.proto.messages.ConnectMessage; +import io.moquette.proto.messages.ConnectMessage; /** * @author Wagner Macedo diff --git a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptDisconnectMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptDisconnectMessage.java similarity index 84% rename from broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptDisconnectMessage.java rename to broker/src/main/java/io/moquette/interception/messages/InterceptDisconnectMessage.java index 844c4059..e1a7e75c 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptDisconnectMessage.java +++ b/broker/src/main/java/io/moquette/interception/messages/InterceptDisconnectMessage.java @@ -1,4 +1,4 @@ -package org.eclipse.moquette.interception.messages; +package io.moquette.interception.messages; /** * @author Wagner Macedo diff --git a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptPublishMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java similarity index 84% rename from broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptPublishMessage.java rename to broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java index 21d3f26b..8dae3783 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptPublishMessage.java +++ b/broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java @@ -1,6 +1,6 @@ -package org.eclipse.moquette.interception.messages; +package io.moquette.interception.messages; -import org.eclipse.moquette.proto.messages.PublishMessage; +import io.moquette.proto.messages.PublishMessage; import java.nio.ByteBuffer; diff --git a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptSubscribeMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java similarity index 74% rename from broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptSubscribeMessage.java rename to broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java index 2e82fd8f..8f0dab09 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptSubscribeMessage.java +++ b/broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java @@ -1,7 +1,7 @@ -package org.eclipse.moquette.interception.messages; +package io.moquette.interception.messages; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.spi.impl.subscriptions.Subscription; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.spi.impl.subscriptions.Subscription; /** * @author Wagner Macedo diff --git a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptUnsubscribeMessage.java b/broker/src/main/java/io/moquette/interception/messages/InterceptUnsubscribeMessage.java similarity index 89% rename from broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptUnsubscribeMessage.java rename to broker/src/main/java/io/moquette/interception/messages/InterceptUnsubscribeMessage.java index 8fcbf003..c8eebc01 100644 --- a/broker/src/main/java/org/eclipse/moquette/interception/messages/InterceptUnsubscribeMessage.java +++ b/broker/src/main/java/io/moquette/interception/messages/InterceptUnsubscribeMessage.java @@ -1,4 +1,4 @@ -package org.eclipse.moquette.interception.messages; +package io.moquette.interception.messages; /** * @author Wagner Macedo diff --git a/broker/src/main/java/org/eclipse/moquette/server/ConnectionDescriptor.java b/broker/src/main/java/io/moquette/server/ConnectionDescriptor.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/ConnectionDescriptor.java rename to broker/src/main/java/io/moquette/server/ConnectionDescriptor.java index 56a6a7e7..4be8955b 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/ConnectionDescriptor.java +++ b/broker/src/main/java/io/moquette/server/ConnectionDescriptor.java @@ -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; /** * Value object to maintain the information of single connection, like ClientID, IoSession, diff --git a/broker/src/main/java/org/eclipse/moquette/server/Constants.java b/broker/src/main/java/io/moquette/server/Constants.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/server/Constants.java rename to broker/src/main/java/io/moquette/server/Constants.java index 690e3e2d..b22a7aac 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/Constants.java +++ b/broker/src/main/java/io/moquette/server/Constants.java @@ -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; /** * Server constants keeper diff --git a/broker/src/main/java/org/eclipse/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java similarity index 86% rename from broker/src/main/java/org/eclipse/moquette/server/Server.java rename to broker/src/main/java/io/moquette/server/Server.java index 6a2211bb..bfd33389 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/Server.java +++ b/broker/src/main/java/io/moquette/server/Server.java @@ -13,14 +13,14 @@ * * 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.FilesystemConfig; -import org.eclipse.moquette.server.config.IConfig; -import org.eclipse.moquette.server.config.MemoryConfig; -import org.eclipse.moquette.server.netty.NettyAcceptor; -import org.eclipse.moquette.spi.impl.ProtocolProcessor; -import org.eclipse.moquette.spi.impl.SimpleMessaging; +import io.moquette.server.config.MemoryConfig; +import io.moquette.spi.impl.SimpleMessaging; +import io.moquette.server.config.FilesystemConfig; +import io.moquette.server.config.IConfig; +import io.moquette.server.netty.NettyAcceptor; +import io.moquette.spi.impl.ProtocolProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,6 @@ import java.io.File; import java.io.IOException; import java.util.Properties; -import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME; /** * Launch a configured version of the server. * @author andrea @@ -92,7 +91,7 @@ public class Server { if (handlerProp != null) { config.setProperty("intercept.handler", handlerProp); } - LOG.info("Persistent store file: " + config.getProperty(PERSISTENT_STORE_PROPERTY_NAME)); + LOG.info("Persistent store file: " + config.getProperty(io.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME)); final ProtocolProcessor processor = SimpleMessaging.getInstance().init(config); m_acceptor = new NettyAcceptor(); diff --git a/broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java b/broker/src/main/java/io/moquette/server/ServerAcceptor.java similarity index 76% rename from broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java rename to broker/src/main/java/io/moquette/server/ServerAcceptor.java index 1549c6d6..9532415e 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java +++ b/broker/src/main/java/io/moquette/server/ServerAcceptor.java @@ -13,14 +13,12 @@ * * 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 org.eclipse.moquette.server.config.IConfig; -import org.eclipse.moquette.spi.IMessaging; -import org.eclipse.moquette.spi.impl.ProtocolProcessor; -import org.eclipse.moquette.spi.impl.SimpleMessaging; +import io.moquette.server.config.IConfig; +import io.moquette.spi.impl.ProtocolProcessor; /** * diff --git a/broker/src/main/java/org/eclipse/moquette/server/ServerChannel.java b/broker/src/main/java/io/moquette/server/ServerChannel.java similarity index 96% rename from broker/src/main/java/org/eclipse/moquette/server/ServerChannel.java rename to broker/src/main/java/io/moquette/server/ServerChannel.java index c9f1dd31..6d16ee21 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/ServerChannel.java +++ b/broker/src/main/java/io/moquette/server/ServerChannel.java @@ -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 io.netty.util.AttributeKey; diff --git a/broker/src/main/java/org/eclipse/moquette/server/config/ClasspathConfig.java b/broker/src/main/java/io/moquette/server/config/ClasspathConfig.java similarity index 98% rename from broker/src/main/java/org/eclipse/moquette/server/config/ClasspathConfig.java rename to broker/src/main/java/io/moquette/server/config/ClasspathConfig.java index d037885f..7180fa9d 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/config/ClasspathConfig.java +++ b/broker/src/main/java/io/moquette/server/config/ClasspathConfig.java @@ -13,7 +13,7 @@ * * 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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/server/config/ConfigurationParser.java b/broker/src/main/java/io/moquette/server/config/ConfigurationParser.java similarity index 83% rename from broker/src/main/java/org/eclipse/moquette/server/config/ConfigurationParser.java rename to broker/src/main/java/io/moquette/server/config/ConfigurationParser.java index ca1e28da..9a560efa 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/config/ConfigurationParser.java +++ b/broker/src/main/java/io/moquette/server/config/ConfigurationParser.java @@ -13,8 +13,9 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.config; +package io.moquette.server.config; +import io.moquette.commons.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,8 +23,6 @@ import java.io.*; import java.text.ParseException; import java.util.Properties; -import static org.eclipse.moquette.commons.Constants.*; - /** * Mosquitto configuration parser. * @@ -43,14 +42,14 @@ class ConfigurationParser { } private void createDefaults() { - m_properties.put(PORT_PROPERTY_NAME, Integer.toString(PORT)); - m_properties.put(HOST_PROPERTY_NAME, HOST); - m_properties.put(WEB_SOCKET_PORT_PROPERTY_NAME, Integer.toString(WEBSOCKET_PORT)); - m_properties.put(PASSWORD_FILE_PROPERTY_NAME, ""); - m_properties.put(PERSISTENT_STORE_PROPERTY_NAME, DEFAULT_PERSISTENT_PATH); - m_properties.put(ALLOW_ANONYMOUS_PROPERTY_NAME, true); - m_properties.put(AUTHENTICATOR_CLASS_NAME, ""); - m_properties.put(AUTHORIZATOR_CLASS_NAME, ""); + 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); + m_properties.put(Constants.ALLOW_ANONYMOUS_PROPERTY_NAME, true); + m_properties.put(Constants.AUTHENTICATOR_CLASS_NAME, ""); + m_properties.put(Constants.AUTHORIZATOR_CLASS_NAME, ""); } /** diff --git a/broker/src/main/java/org/eclipse/moquette/server/config/FilesystemConfig.java b/broker/src/main/java/io/moquette/server/config/FilesystemConfig.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/config/FilesystemConfig.java rename to broker/src/main/java/io/moquette/server/config/FilesystemConfig.java index f5162f96..dfead22b 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/config/FilesystemConfig.java +++ b/broker/src/main/java/io/moquette/server/config/FilesystemConfig.java @@ -13,7 +13,7 @@ * * 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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/server/config/IConfig.java b/broker/src/main/java/io/moquette/server/config/IConfig.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/server/config/IConfig.java rename to broker/src/main/java/io/moquette/server/config/IConfig.java index 1b4bc36c..8bb76574 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/config/IConfig.java +++ b/broker/src/main/java/io/moquette/server/config/IConfig.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.config; +package io.moquette.server.config; /** * Base interface for all configuration implementations (filesystem, memory or classpath) diff --git a/broker/src/main/java/org/eclipse/moquette/server/config/MemoryConfig.java b/broker/src/main/java/io/moquette/server/config/MemoryConfig.java similarity index 65% rename from broker/src/main/java/org/eclipse/moquette/server/config/MemoryConfig.java rename to broker/src/main/java/io/moquette/server/config/MemoryConfig.java index f706b6ff..9ed22cfc 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/config/MemoryConfig.java +++ b/broker/src/main/java/io/moquette/server/config/MemoryConfig.java @@ -13,15 +13,13 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.config; +package io.moquette.server.config; + +import io.moquette.commons.Constants; import java.util.Map; import java.util.Properties; -import static org.eclipse.moquette.commons.Constants.*; -import static org.eclipse.moquette.commons.Constants.AUTHENTICATOR_CLASS_NAME; -import static org.eclipse.moquette.commons.Constants.AUTHORIZATOR_CLASS_NAME; - /** * Configuration backed by memory. * @@ -39,14 +37,14 @@ public class MemoryConfig implements IConfig { } private void createDefaults() { - m_properties.put(PORT_PROPERTY_NAME, Integer.toString(PORT)); - m_properties.put(HOST_PROPERTY_NAME, HOST); - m_properties.put(WEB_SOCKET_PORT_PROPERTY_NAME, Integer.toString(WEBSOCKET_PORT)); - m_properties.put(PASSWORD_FILE_PROPERTY_NAME, ""); - m_properties.put(PERSISTENT_STORE_PROPERTY_NAME, DEFAULT_PERSISTENT_PATH); - m_properties.put(ALLOW_ANONYMOUS_PROPERTY_NAME, true); - m_properties.put(AUTHENTICATOR_CLASS_NAME, ""); - m_properties.put(AUTHORIZATOR_CLASS_NAME, ""); + 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); + m_properties.put(Constants.ALLOW_ANONYMOUS_PROPERTY_NAME, true); + m_properties.put(Constants.AUTHENTICATOR_CLASS_NAME, ""); + m_properties.put(Constants.AUTHORIZATOR_CLASS_NAME, ""); } @Override diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/MoquetteIdleTimoutHandler.java b/broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimoutHandler.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/netty/MoquetteIdleTimoutHandler.java rename to broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimoutHandler.java index 01b75357..1e80a141 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/MoquetteIdleTimoutHandler.java +++ b/broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimoutHandler.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty; +package io.moquette.server.netty; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandler.Sharable; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java rename to broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java index 3adf6959..056b96df 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java @@ -13,8 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty; +package io.moquette.server.netty; +import io.moquette.commons.Constants; +import io.moquette.parser.netty.MQTTDecoder; +import io.moquette.server.config.IConfig; +import io.moquette.server.netty.metrics.*; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; import io.netty.channel.*; @@ -31,13 +35,9 @@ import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.ssl.SslHandler; import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.concurrent.Future; -import org.eclipse.moquette.commons.Constants; -import org.eclipse.moquette.parser.netty.MQTTDecoder; -import org.eclipse.moquette.parser.netty.MQTTEncoder; -import org.eclipse.moquette.server.ServerAcceptor; -import org.eclipse.moquette.server.config.IConfig; -import org.eclipse.moquette.server.netty.metrics.*; -import org.eclipse.moquette.spi.impl.ProtocolProcessor; +import io.moquette.parser.netty.MQTTEncoder; +import io.moquette.server.ServerAcceptor; +import io.moquette.spi.impl.ProtocolProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java b/broker/src/main/java/io/moquette/server/netty/NettyChannel.java similarity index 94% rename from broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java rename to broker/src/main/java/io/moquette/server/netty/NettyChannel.java index 3fb0342f..fefa924a 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyChannel.java @@ -13,14 +13,14 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty; +package io.moquette.server.netty; +import io.moquette.server.Constants; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.timeout.IdleStateHandler; import io.netty.util.Attribute; import io.netty.util.AttributeKey; -import org.eclipse.moquette.server.Constants; -import org.eclipse.moquette.server.ServerChannel; +import io.moquette.server.ServerChannel; /** * diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java b/broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java similarity index 94% rename from broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java rename to broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java index e41f7f46..f76a924e 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java @@ -13,19 +13,18 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty; +package io.moquette.server.netty; +import io.moquette.proto.Utils; +import io.moquette.proto.messages.*; +import io.moquette.spi.impl.ProtocolProcessor; +import static io.moquette.proto.messages.AbstractMessage.*; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.CorruptedFrameException; -import org.eclipse.moquette.proto.messages.*; -import org.eclipse.moquette.proto.Utils; -import static org.eclipse.moquette.proto.messages.AbstractMessage.*; - -import org.eclipse.moquette.spi.impl.ProtocolProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyUtils.java b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/netty/NettyUtils.java rename to broker/src/main/java/io/moquette/server/netty/NettyUtils.java index 4b68ebe8..58ae4f71 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyUtils.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty; +package io.moquette.server.netty; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.timeout.IdleStateHandler; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetrics.java b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetrics.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetrics.java rename to broker/src/main/java/io/moquette/server/netty/metrics/BytesMetrics.java index ecb54011..1d337ad6 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetrics.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetrics.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty.metrics; +package io.moquette.server.netty.metrics; public class BytesMetrics { private long m_readBytes = 0; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsCollector.java b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsCollector.java similarity index 96% rename from broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsCollector.java rename to broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsCollector.java index 3d7baa1b..35d213b3 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsCollector.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsCollector.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty.metrics; +package io.moquette.server.netty.metrics; import java.util.concurrent.atomic.AtomicLong; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsHandler.java b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsHandler.java rename to broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java index 3b5ae866..417bd579 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsHandler.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty.metrics; +package io.moquette.server.netty.metrics; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelDuplexHandler; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetrics.java b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetrics.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetrics.java rename to broker/src/main/java/io/moquette/server/netty/metrics/MessageMetrics.java index 09ca55bf..bbbce559 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetrics.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetrics.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty.metrics; +package io.moquette.server.netty.metrics; public class MessageMetrics { private long m_messagesRead = 0; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsCollector.java similarity index 96% rename from broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java rename to broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsCollector.java index d5eb08d2..29d02198 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsCollector.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty.metrics; +package io.moquette.server.netty.metrics; import java.util.concurrent.atomic.AtomicLong; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsHandler.java b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsHandler.java rename to broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java index 0c16a9a7..811b625f 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsHandler.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server.netty.metrics; +package io.moquette.server.netty.metrics; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/ClientSession.java b/broker/src/main/java/io/moquette/spi/ClientSession.java similarity index 96% rename from broker/src/main/java/org/eclipse/moquette/spi/ClientSession.java rename to broker/src/main/java/io/moquette/spi/ClientSession.java index 4f2a0b8c..4cba7048 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/ClientSession.java +++ b/broker/src/main/java/io/moquette/spi/ClientSession.java @@ -13,11 +13,11 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.spi; +package io.moquette.spi; -import org.eclipse.moquette.proto.messages.AbstractMessage; -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.spi.impl.subscriptions.Subscription; +import io.moquette.spi.impl.subscriptions.SubscriptionsStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/IMatchingCondition.java b/broker/src/main/java/io/moquette/spi/IMatchingCondition.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/spi/IMatchingCondition.java rename to broker/src/main/java/io/moquette/spi/IMatchingCondition.java index f1cc32bb..6ced9b93 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/IMatchingCondition.java +++ b/broker/src/main/java/io/moquette/spi/IMatchingCondition.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.spi; +package io.moquette.spi; /** */ diff --git a/broker/src/main/java/org/eclipse/moquette/spi/IMessagesStore.java b/broker/src/main/java/io/moquette/spi/IMessagesStore.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/spi/IMessagesStore.java rename to broker/src/main/java/io/moquette/spi/IMessagesStore.java index 30db1473..8d76f238 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/IMessagesStore.java +++ b/broker/src/main/java/io/moquette/spi/IMessagesStore.java @@ -13,11 +13,11 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.spi; +package io.moquette.spi; import java.io.Serializable; import java.nio.ByteBuffer; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; import java.util.Collection; import java.util.List; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/IMessaging.java b/broker/src/main/java/io/moquette/spi/IMessaging.java similarity index 96% rename from broker/src/main/java/org/eclipse/moquette/spi/IMessaging.java rename to broker/src/main/java/io/moquette/spi/IMessaging.java index 3099f45e..6bf128c8 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/IMessaging.java +++ b/broker/src/main/java/io/moquette/spi/IMessaging.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.spi; +package io.moquette.spi; /** * Callback interface used to be notified of some events from the input event queue. diff --git a/broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java b/broker/src/main/java/io/moquette/spi/ISessionsStore.java similarity index 96% rename from broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java rename to broker/src/main/java/io/moquette/spi/ISessionsStore.java index b7cc6bdb..ec2068a6 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java +++ b/broker/src/main/java/io/moquette/spi/ISessionsStore.java @@ -13,13 +13,13 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.spi; +package io.moquette.spi; import java.util.Collection; import java.util.List; import java.util.Set; -import org.eclipse.moquette.spi.impl.subscriptions.Subscription; +import io.moquette.spi.impl.subscriptions.Subscription; /** * Store used to handle the persistence of the subscriptions tree. diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/BrokerInterceptor.java b/broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java similarity index 89% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/BrokerInterceptor.java rename to broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java index af39c2a1..4274f806 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/BrokerInterceptor.java +++ b/broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java @@ -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.InterceptHandler; -import org.eclipse.moquette.interception.Interceptor; -import org.eclipse.moquette.interception.messages.*; -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.InterceptHandler; +import io.moquette.interception.Interceptor; +import io.moquette.interception.messages.*; +import io.moquette.proto.messages.ConnectMessage; +import io.moquette.spi.impl.subscriptions.Subscription; +import io.moquette.proto.messages.PublishMessage; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/DebugUtils.java b/broker/src/main/java/io/moquette/spi/impl/DebugUtils.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/DebugUtils.java rename to broker/src/main/java/io/moquette/spi/impl/DebugUtils.java index a30cb228..9a2dffaf 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/DebugUtils.java +++ b/broker/src/main/java/io/moquette/spi/impl/DebugUtils.java @@ -13,7 +13,7 @@ * * 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.nio.ByteBuffer; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java similarity index 92% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java rename to broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java index 703e399a..c1fce3fe 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java +++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java @@ -13,39 +13,39 @@ * * 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.nio.ByteBuffer; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -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.*; -import org.eclipse.moquette.spi.ISessionsStore; -import org.eclipse.moquette.spi.impl.security.IAuthorizator; -import org.eclipse.moquette.spi.impl.subscriptions.Subscription; -import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore; -import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1; -import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1; -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.proto.messages.PubAckMessage; -import org.eclipse.moquette.proto.messages.PubCompMessage; -import org.eclipse.moquette.proto.messages.PubRecMessage; -import org.eclipse.moquette.proto.messages.PubRelMessage; -import org.eclipse.moquette.proto.messages.PublishMessage; -import org.eclipse.moquette.proto.messages.SubAckMessage; -import org.eclipse.moquette.proto.messages.SubscribeMessage; -import org.eclipse.moquette.proto.messages.UnsubAckMessage; -import org.eclipse.moquette.proto.messages.UnsubscribeMessage; -import org.eclipse.moquette.server.ConnectionDescriptor; -import org.eclipse.moquette.spi.impl.security.IAuthenticator; -import org.eclipse.moquette.server.ServerChannel; +import io.moquette.server.ConnectionDescriptor; +import io.moquette.server.ServerChannel; +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.ISessionsStore; +import io.moquette.spi.impl.security.IAuthenticator; +import io.moquette.spi.impl.security.IAuthorizator; +import io.moquette.spi.impl.subscriptions.SubscriptionsStore; +import io.moquette.spi.impl.subscriptions.Subscription; + +import static io.moquette.parser.netty.Utils.VERSION_3_1; +import static io.moquette.parser.netty.Utils.VERSION_3_1_1; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage.QOSType; +import io.moquette.proto.messages.ConnAckMessage; +import io.moquette.proto.messages.ConnectMessage; +import io.moquette.proto.messages.PubAckMessage; +import io.moquette.proto.messages.PubCompMessage; +import io.moquette.proto.messages.PubRecMessage; +import io.moquette.proto.messages.PubRelMessage; +import io.moquette.proto.messages.PublishMessage; +import io.moquette.proto.messages.SubAckMessage; +import io.moquette.proto.messages.SubscribeMessage; +import io.moquette.proto.messages.UnsubAckMessage; +import io.moquette.proto.messages.UnsubscribeMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -244,14 +244,14 @@ public class ProtocolProcessor { * */ private void republishStoredInSession(ClientSession clientSession) { LOG.trace("republishStoredInSession for client <{}>", clientSession); - List publishedEvents = clientSession.storedMessages(); + List publishedEvents = clientSession.storedMessages(); if (publishedEvents.isEmpty()) { LOG.info("No stored messages for client <{}>", clientSession.clientID); return; } LOG.info("republishing stored messages to client <{}>", clientSession.clientID); - for (StoredMessage pubEvt : publishedEvents) { + for (IMessagesStore.StoredMessage pubEvt : publishedEvents) { //TODO put in flight zone directSend(clientSession, pubEvt.getTopic(), pubEvt.getQos(), pubEvt.getMessage(), false, pubEvt.getMessageID()); @@ -267,15 +267,15 @@ public class ProtocolProcessor { targetSession.inFlightAcknowledged(messageID); } - private static StoredMessage asStoredMessage(PublishMessage msg) { - StoredMessage stored = new StoredMessage(msg.getPayload().array(), msg.getQos(), msg.getTopicName()); + private static IMessagesStore.StoredMessage asStoredMessage(PublishMessage msg) { + IMessagesStore.StoredMessage stored = new IMessagesStore.StoredMessage(msg.getPayload().array(), msg.getQos(), msg.getTopicName()); stored.setRetained(msg.isRetainFlag()); stored.setMessageID(msg.getMessageID()); return stored; } - private static StoredMessage asStoredMessage(WillMessage will) { - StoredMessage pub = new StoredMessage(will.getPayload().array(), will.getQos(), will.getTopic()); + private static IMessagesStore.StoredMessage asStoredMessage(WillMessage will) { + IMessagesStore.StoredMessage pub = new IMessagesStore.StoredMessage(will.getPayload().array(), will.getQos(), will.getTopic()); pub.setRetained(will.isRetained()); return pub; } @@ -296,7 +296,7 @@ public class ProtocolProcessor { LOG.info("PUBLISH from clientID <{}> on topic <{}> with QoS {}", clientID, topic, qos); String guid = null; - StoredMessage toStoreMsg = asStoredMessage(msg); + IMessagesStore.StoredMessage toStoreMsg = asStoredMessage(msg); toStoreMsg.setClientID(clientID); if (qos == AbstractMessage.QOSType.MOST_ONE) { //QoS0 forward2Subscribers(toStoreMsg); @@ -341,7 +341,7 @@ public class ProtocolProcessor { messageId = m_messagesStore.nextPacketID(clientID); } - StoredMessage tobeStored = asStoredMessage(will); + IMessagesStore.StoredMessage tobeStored = asStoredMessage(will); tobeStored.setClientID(clientID); tobeStored.setMessageID(messageId); forward2Subscribers(tobeStored); @@ -352,7 +352,7 @@ public class ProtocolProcessor { * Flood the subscribers with the message to notify. MessageID is optional and should only used for QoS 1 and 2 * */ //TODO rename to route2Subscribers - void forward2Subscribers(StoredMessage pubEvt) { + void forward2Subscribers(IMessagesStore.StoredMessage pubEvt) { final String topic = pubEvt.getTopic(); final AbstractMessage.QOSType publishingQos = pubEvt.getQos(); final ByteBuffer origMessage = pubEvt.getMessage(); @@ -475,7 +475,7 @@ public class ProtocolProcessor { int messageID = msg.getMessageID(); LOG.debug("PUB --PUBREL--> SRV processPubRel invoked for clientID {} ad messageID {}", clientID, messageID); ClientSession targetSession = m_sessionsStore.sessionForClient(clientID); - StoredMessage evt = targetSession.storedMessage(messageID); + IMessagesStore.StoredMessage evt = targetSession.storedMessage(messageID); forward2Subscribers(evt); if (evt.isRetained()) { diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java b/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java similarity index 92% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java rename to broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java index ced6859b..0bc534e2 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java +++ b/broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java @@ -13,16 +13,17 @@ * * 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.commons.Constants; -import org.eclipse.moquette.interception.InterceptHandler; -import org.eclipse.moquette.server.config.IConfig; -import org.eclipse.moquette.spi.IMessagesStore; -import org.eclipse.moquette.spi.ISessionsStore; -import org.eclipse.moquette.spi.impl.security.*; -import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore; -import org.eclipse.moquette.spi.persistence.MapDBPersistentStore; +import io.moquette.spi.IMessagesStore; +import io.moquette.commons.Constants; +import io.moquette.interception.InterceptHandler; +import io.moquette.server.config.IConfig; +import io.moquette.spi.ISessionsStore; +import io.moquette.spi.impl.security.*; +import io.moquette.spi.impl.subscriptions.SubscriptionsStore; +import io.moquette.spi.persistence.MapDBPersistentStore; +import static io.moquette.commons.Constants.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,6 @@ import java.lang.reflect.Method; import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import static org.eclipse.moquette.commons.Constants.*; /** * diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/Utils.java b/broker/src/main/java/io/moquette/spi/impl/Utils.java similarity index 89% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/Utils.java rename to broker/src/main/java/io/moquette/spi/impl/Utils.java index 4ebdc3d7..688b608d 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/Utils.java +++ b/broker/src/main/java/io/moquette/spi/impl/Utils.java @@ -1,4 +1,4 @@ -package org.eclipse.moquette.spi.impl; +package io.moquette.spi.impl; import java.util.Map; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/ACLFileParser.java b/broker/src/main/java/io/moquette/spi/impl/security/ACLFileParser.java similarity index 94% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/ACLFileParser.java rename to broker/src/main/java/io/moquette/spi/impl/security/ACLFileParser.java index e0099b8b..e9d18b2e 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/ACLFileParser.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/ACLFileParser.java @@ -13,18 +13,13 @@ * * 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.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.*; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static org.eclipse.moquette.spi.impl.security.Authorization.Permission; /** * Parses the acl configuration file. diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/AcceptAllAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java similarity index 80% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/AcceptAllAuthenticator.java rename to broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java index a6f1b0c8..ff216fce 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/AcceptAllAuthenticator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java @@ -1,4 +1,4 @@ -package org.eclipse.moquette.spi.impl.security; +package io.moquette.spi.impl.security; /** * Created by andrea on 8/23/14. diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/Authorization.java b/broker/src/main/java/io/moquette/spi/impl/security/Authorization.java similarity index 92% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/Authorization.java rename to broker/src/main/java/io/moquette/spi/impl/security/Authorization.java index 082a11a8..86158633 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/Authorization.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/Authorization.java @@ -13,9 +13,9 @@ * * 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 static org.eclipse.moquette.spi.impl.security.Authorization.Permission.READWRITE; +import static io.moquette.spi.impl.security.Authorization.Permission.READWRITE; /** * Carries the read/write authorization to topics for the users. diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/AuthorizationsCollector.java b/broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java similarity index 92% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/AuthorizationsCollector.java rename to broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java index f9876450..50ff998d 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/AuthorizationsCollector.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java @@ -13,19 +13,15 @@ * * 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.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore; +import io.moquette.spi.impl.subscriptions.SubscriptionsStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.text.ParseException; import java.util.*; -import static org.eclipse.moquette.spi.impl.security.Authorization.Permission.READ; -import static org.eclipse.moquette.spi.impl.security.Authorization.Permission.READWRITE; -import static org.eclipse.moquette.spi.impl.security.Authorization.Permission.WRITE; - /** * Used by the ACLFileParser to push all authorizations it finds. * ACLAuthorizator uses it in read mode to check it topics matches the ACLs. @@ -113,12 +109,12 @@ class AuthorizationsCollector implements IAuthorizator { @Override public boolean canWrite(String topic, String user, String client) { - return canDoOperation(topic, WRITE, user, client); + return canDoOperation(topic, Authorization.Permission.WRITE, user, client); } @Override public boolean canRead(String topic, String user, String client) { - return canDoOperation(topic, READ, user, client); + return canDoOperation(topic, Authorization.Permission.READ, user, client); } private boolean canDoOperation(String topic, Authorization.Permission permission, String username, String client) { diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/DenyAllAuthorizator.java b/broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/DenyAllAuthorizator.java rename to broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java index 2d4d04af..031199a1 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/DenyAllAuthorizator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java @@ -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; /** * @author andrea diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/FileAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java similarity index 98% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/FileAuthenticator.java rename to broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java index bd013b1b..c3b719a9 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/FileAuthenticator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java @@ -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.apache.commons.codec.binary.Hex; import org.slf4j.Logger; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/IAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/IAuthenticator.java similarity index 94% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/IAuthenticator.java rename to broker/src/main/java/io/moquette/spi/impl/security/IAuthenticator.java index 4a13a939..e1121086 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/IAuthenticator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/IAuthenticator.java @@ -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; /** * username and password checker diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/IAuthorizator.java b/broker/src/main/java/io/moquette/spi/impl/security/IAuthorizator.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/IAuthorizator.java rename to broker/src/main/java/io/moquette/spi/impl/security/IAuthorizator.java index 1de91c17..5245516b 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/IAuthorizator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/IAuthorizator.java @@ -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; /** * ACL checker. diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/PermitAllAuthorizator.java b/broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/security/PermitAllAuthorizator.java rename to broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java index d2697dcc..07e856dd 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/PermitAllAuthorizator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java @@ -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; /** * @author andrea diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Subscription.java b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java similarity index 96% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Subscription.java rename to broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java index ffd745fd..fb10d173 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Subscription.java +++ b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java @@ -13,10 +13,10 @@ * * 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.Serializable; -import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType; +import io.moquette.proto.messages.AbstractMessage.QOSType; /** * Maintain the information about which Topic a certain ClientID is subscribed diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/io/moquette/spi/impl/subscriptions/SubscriptionsStore.java similarity index 98% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java rename to broker/src/main/java/io/moquette/spi/impl/subscriptions/SubscriptionsStore.java index 1d799804..c6f8e21e 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java +++ b/broker/src/main/java/io/moquette/spi/impl/subscriptions/SubscriptionsStore.java @@ -13,15 +13,14 @@ * * 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.text.ParseException; import java.util.*; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.moquette.spi.ClientSession; -import org.eclipse.moquette.spi.ISessionsStore; +import io.moquette.spi.ISessionsStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Token.java b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Token.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Token.java rename to broker/src/main/java/io/moquette/spi/impl/subscriptions/Token.java index 9885f3ca..16548dc0 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Token.java +++ b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Token.java @@ -13,7 +13,7 @@ * * 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; /** * Internal use only class. diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java b/broker/src/main/java/io/moquette/spi/impl/subscriptions/TreeNode.java similarity index 99% rename from broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java rename to broker/src/main/java/io/moquette/spi/impl/subscriptions/TreeNode.java index 9c686733..50a20e40 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java +++ b/broker/src/main/java/io/moquette/spi/impl/subscriptions/TreeNode.java @@ -13,7 +13,7 @@ * * 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.util.*; import java.util.concurrent.LinkedBlockingQueue; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBMessagesStore.java b/broker/src/main/java/io/moquette/spi/persistence/MapDBMessagesStore.java similarity index 92% rename from broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBMessagesStore.java rename to broker/src/main/java/io/moquette/spi/persistence/MapDBMessagesStore.java index e8bfd796..b4785dc4 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBMessagesStore.java +++ b/broker/src/main/java/io/moquette/spi/persistence/MapDBMessagesStore.java @@ -13,10 +13,10 @@ * * 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.IMatchingCondition; -import org.eclipse.moquette.spi.IMessagesStore; +import io.moquette.spi.IMatchingCondition; +import io.moquette.spi.IMessagesStore; import org.mapdb.DB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,8 +24,6 @@ import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.ConcurrentMap; -import static org.eclipse.moquette.spi.persistence.MapDBSessionsStore.messageId2GuidsMapName; - /** * IMessagesStore implementation backed by MapDB. * @@ -87,7 +85,7 @@ class MapDBMessagesStore implements IMessagesStore { String guid = UUID.randomUUID().toString(); evt.setGuid(guid); m_persistentMessageStore.put(guid, evt); - ConcurrentMap messageIdToGuid = m_db.getHashMap(messageId2GuidsMapName(evt.getClientID())); + ConcurrentMap messageIdToGuid = m_db.getHashMap(MapDBSessionsStore.messageId2GuidsMapName(evt.getClientID())); messageIdToGuid.put(evt.getMessageID(), guid); return guid; } @@ -103,7 +101,7 @@ class MapDBMessagesStore implements IMessagesStore { @Override public void dropMessagesInSession(String clientID) { - m_db.getHashMap(messageId2GuidsMapName(clientID)).clear(); + m_db.getHashMap(MapDBSessionsStore.messageId2GuidsMapName(clientID)).clear(); m_persistentMessageStore.remove(clientID); } diff --git a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java similarity index 94% rename from broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java rename to broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java index 36e7c036..a09a6e5b 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java +++ b/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java @@ -14,11 +14,11 @@ * 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.MQTTException; -import org.eclipse.moquette.spi.IMessagesStore; -import org.eclipse.moquette.spi.ISessionsStore; +import io.moquette.spi.IMessagesStore; +import io.moquette.spi.ISessionsStore; +import io.moquette.proto.MQTTException; import org.mapdb.DB; import org.mapdb.DBMaker; import org.slf4j.Logger; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBSessionsStore.java b/broker/src/main/java/io/moquette/spi/persistence/MapDBSessionsStore.java similarity index 91% rename from broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBSessionsStore.java rename to broker/src/main/java/io/moquette/spi/persistence/MapDBSessionsStore.java index d10b34a6..c20c02d1 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBSessionsStore.java +++ b/broker/src/main/java/io/moquette/spi/persistence/MapDBSessionsStore.java @@ -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.spi.ClientSession; -import org.eclipse.moquette.spi.IMessagesStore; -import org.eclipse.moquette.spi.ISessionsStore; -import org.eclipse.moquette.spi.impl.subscriptions.Subscription; -import org.eclipse.moquette.spi.persistence.MapDBPersistentStore.PersistentSession; +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 io.moquette.spi.persistence.MapDBPersistentStore.PersistentSession; import org.mapdb.DB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +28,6 @@ import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.ConcurrentMap; -import static org.eclipse.moquette.spi.impl.Utils.defaultGet; - /** * ISessionsStore implementation backed by MapDB. * @@ -221,33 +220,33 @@ class MapDBSessionsStore implements ISessionsStore { @Override public void bindToDeliver(String guid, String clientID) { - List guids = defaultGet(m_enqueuedStore, clientID, new ArrayList()); + List guids = Utils.defaultGet(m_enqueuedStore, clientID, new ArrayList()); guids.add(guid); m_enqueuedStore.put(clientID, guids); } @Override public Collection enqueued(String clientID) { - return defaultGet(m_enqueuedStore, clientID, new ArrayList()); + return Utils.defaultGet(m_enqueuedStore, clientID, new ArrayList()); } @Override public void removeEnqueued(String clientID, String guid) { - List guids = defaultGet(m_enqueuedStore, clientID, new ArrayList()); + List guids = Utils.defaultGet(m_enqueuedStore, clientID, new ArrayList()); guids.remove(guid); m_enqueuedStore.put(clientID, guids); } @Override public void secondPhaseAcknowledged(String clientID, int messageID) { - Set messageIDs = defaultGet(m_secondPhaseStore, clientID, new HashSet()); + Set messageIDs = Utils.defaultGet(m_secondPhaseStore, clientID, new HashSet()); messageIDs.remove(messageID); m_secondPhaseStore.put(clientID, messageIDs); } @Override public void secondPhaseAckWaiting(String clientID, int messageID) { - Set messageIDs = defaultGet(m_secondPhaseStore, clientID, new HashSet()); + Set messageIDs = Utils.defaultGet(m_secondPhaseStore, clientID, new HashSet()); messageIDs.add(messageID); m_secondPhaseStore.put(clientID, messageIDs); } diff --git a/broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java b/broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java similarity index 75% rename from broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java rename to broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java index 6e71ac00..083860a8 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java +++ b/broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java @@ -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(); diff --git a/broker/src/test/java/org/eclipse/moquette/server/IntegrationUtils.java b/broker/src/test/java/io/moquette/server/IntegrationUtils.java similarity index 86% rename from broker/src/test/java/org/eclipse/moquette/server/IntegrationUtils.java rename to broker/src/test/java/io/moquette/server/IntegrationUtils.java index 7a291aa6..67b2e883 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/IntegrationUtils.java +++ b/broker/src/test/java/io/moquette/server/IntegrationUtils.java @@ -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; /** diff --git a/broker/src/test/java/org/eclipse/moquette/server/MQTTWebSocket.java b/broker/src/test/java/io/moquette/server/MQTTWebSocket.java similarity index 98% rename from broker/src/test/java/org/eclipse/moquette/server/MQTTWebSocket.java rename to broker/src/test/java/io/moquette/server/MQTTWebSocket.java index bd04bb36..07f991f9 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/MQTTWebSocket.java +++ b/broker/src/test/java/io/moquette/server/MQTTWebSocket.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationFuseTest.java similarity index 98% rename from broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java rename to broker/src/test/java/io/moquette/server/ServerIntegrationFuseTest.java index a50e6389..6eac6601 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java +++ b/broker/src/test/java/io/moquette/server/ServerIntegrationFuseTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationPahoTest.java similarity index 99% rename from broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java rename to broker/src/test/java/io/moquette/server/ServerIntegrationPahoTest.java index c1985015..00bc27d8 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java +++ b/broker/src/test/java/io/moquette/server/ServerIntegrationPahoTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationQoSValidationTest.java similarity index 98% rename from broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java rename to broker/src/test/java/io/moquette/server/ServerIntegrationQoSValidationTest.java index 2920151b..93b6b793 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java +++ b/broker/src/test/java/io/moquette/server/ServerIntegrationQoSValidationTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationSSLTest.java similarity index 88% rename from broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java rename to broker/src/test/java/io/moquette/server/ServerIntegrationSSLTest.java index 3809dd29..f424a12c 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java +++ b/broker/src/test/java/io/moquette/server/ServerIntegrationSSLTest.java @@ -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); } diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java b/broker/src/test/java/io/moquette/server/ServerIntegrationWebSocketTest.java similarity index 85% rename from broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java rename to broker/src/test/java/io/moquette/server/ServerIntegrationWebSocketTest.java index 5482ae76..218f3138 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java +++ b/broker/src/test/java/io/moquette/server/ServerIntegrationWebSocketTest.java @@ -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(); diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java b/broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java similarity index 91% rename from broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java rename to broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java index 8619dc5d..7f9a85f1 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java +++ b/broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java @@ -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.*; /** diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java b/broker/src/test/java/io/moquette/server/ServerRestartIntegrationTest.java similarity index 97% rename from broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java rename to broker/src/test/java/io/moquette/server/ServerRestartIntegrationTest.java index 4bc16a6e..fab59bdb 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java +++ b/broker/src/test/java/io/moquette/server/ServerRestartIntegrationTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/server/TestCallback.java b/broker/src/test/java/io/moquette/server/TestCallback.java similarity index 98% rename from broker/src/test/java/org/eclipse/moquette/server/TestCallback.java rename to broker/src/test/java/io/moquette/server/TestCallback.java index fa3d5cf3..3b6c3ce3 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/TestCallback.java +++ b/broker/src/test/java/io/moquette/server/TestCallback.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java b/broker/src/test/java/io/moquette/server/config/ConfigurationParserTest.java similarity index 89% rename from broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java rename to broker/src/test/java/io/moquette/server/config/ConfigurationParserTest.java index cd286d7f..f94d24eb 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java +++ b/broker/src/test/java/io/moquette/server/config/ConfigurationParserTest.java @@ -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")); } } \ No newline at end of file diff --git a/broker/src/test/java/org/eclipse/moquette/spec/v3_1_1/connection/ConnectionIT.java b/broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java similarity index 90% rename from broker/src/test/java/org/eclipse/moquette/spec/v3_1_1/connection/ConnectionIT.java rename to broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java index 6260e066..fbe86d14 100644 --- a/broker/src/test/java/org/eclipse/moquette/spec/v3_1_1/connection/ConnectionIT.java +++ b/broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java @@ -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()); } diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/BrokerInterceptorTest.java b/broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java similarity index 89% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/BrokerInterceptorTest.java rename to broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java index 56e33957..b64bf7cd 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/BrokerInterceptorTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannel.java b/broker/src/test/java/io/moquette/spi/impl/DummyChannel.java similarity index 90% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannel.java rename to broker/src/test/java/io/moquette/spi/impl/DummyChannel.java index c4bbcf34..f175e853 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannel.java +++ b/broker/src/test/java/io/moquette/spi/impl/DummyChannel.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannelHandlerContext.java b/broker/src/test/java/io/moquette/spi/impl/DummyChannelHandlerContext.java similarity index 68% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannelHandlerContext.java rename to broker/src/test/java/io/moquette/spi/impl/DummyChannelHandlerContext.java index ca1f24a3..d35cb6c9 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/DummyChannelHandlerContext.java +++ b/broker/src/test/java/io/moquette/spi/impl/DummyChannelHandlerContext.java @@ -1,4 +1,4 @@ -package org.eclipse.moquette.spi.impl; +package io.moquette.spi.impl; /** * Created by andrea on 6/7/15. diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryMessagesStore.java b/broker/src/test/java/io/moquette/spi/impl/MemoryMessagesStore.java similarity index 95% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryMessagesStore.java rename to broker/src/test/java/io/moquette/spi/impl/MemoryMessagesStore.java index b8a03ef1..e60277d7 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryMessagesStore.java +++ b/broker/src/test/java/io/moquette/spi/impl/MemoryMessagesStore.java @@ -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 diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java b/broker/src/test/java/io/moquette/spi/impl/MemoryStorageService.java similarity index 85% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java rename to broker/src/test/java/io/moquette/spi/impl/MemoryStorageService.java index 22407e6a..54cfea1c 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java +++ b/broker/src/test/java/io/moquette/spi/impl/MemoryStorageService.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/MockAuthenticator.java b/broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java similarity index 91% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/MockAuthenticator.java rename to broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java index da21be54..a2ac5ca5 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/MockAuthenticator.java +++ b/broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java @@ -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. diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/MockReceiverChannel.java b/broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java similarity index 92% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/MockReceiverChannel.java rename to broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java index fb155ece..c6a13fa0 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/MockReceiverChannel.java +++ b/broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java similarity index 96% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java rename to broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java index 57077553..29715350 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java similarity index 84% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java rename to broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java index 42b44177..399937ef 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java +++ b/broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java @@ -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 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 diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/security/ACLFileParserTest.java b/broker/src/test/java/io/moquette/spi/impl/security/ACLFileParserTest.java similarity index 97% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/security/ACLFileParserTest.java rename to broker/src/test/java/io/moquette/spi/impl/security/ACLFileParserTest.java index af4b199d..f6e0a7c6 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/security/ACLFileParserTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/security/ACLFileParserTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/security/AuthorizationsCollectorTest.java b/broker/src/test/java/io/moquette/spi/impl/security/AuthorizationsCollectorTest.java similarity index 98% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/security/AuthorizationsCollectorTest.java rename to broker/src/test/java/io/moquette/spi/impl/security/AuthorizationsCollectorTest.java index bc7dc774..240b483f 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/security/AuthorizationsCollectorTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/security/AuthorizationsCollectorTest.java @@ -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.*; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/security/FileAuthenticatorTest.java b/broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java similarity index 97% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/security/FileAuthenticatorTest.java rename to broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java index afc41e05..7fe156c9 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/security/FileAuthenticatorTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java b/broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java similarity index 98% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java rename to broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java index 08b6d972..970aee62 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNodeTest.java b/broker/src/test/java/io/moquette/spi/impl/subscriptions/TreeNodeTest.java similarity index 89% rename from broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNodeTest.java rename to broker/src/test/java/io/moquette/spi/impl/subscriptions/TreeNodeTest.java index 3520d2c2..89bff7b7 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNodeTest.java +++ b/broker/src/test/java/io/moquette/spi/impl/subscriptions/TreeNodeTest.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java b/broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java similarity index 85% rename from broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java rename to broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java index 164892de..c3cb1bdc 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStoreTest.java +++ b/broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java @@ -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 diff --git a/broker/src/test/java/org/eclipse/moquette/spi/persistence/MemorySessionStore.java b/broker/src/test/java/io/moquette/spi/persistence/MemorySessionStore.java similarity index 83% rename from broker/src/test/java/org/eclipse/moquette/spi/persistence/MemorySessionStore.java rename to broker/src/test/java/io/moquette/spi/persistence/MemorySessionStore.java index 05a46ff4..ed1e487a 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/persistence/MemorySessionStore.java +++ b/broker/src/test/java/io/moquette/spi/persistence/MemorySessionStore.java @@ -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> m_persistentSubscriptions = new HashMap<>(); - private Map m_persistentSessions = new HashMap<>(); + private Map m_persistentSessions = new HashMap<>(); //maps clientID->[MessageId -> guid] private Map> 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()); - 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 guids = defaultGet(m_enqueuedStore, clientID, new HashSet()); + Set guids = Utils.defaultGet(m_enqueuedStore, clientID, new HashSet()); guids.add(guid); m_enqueuedStore.put(clientID, guids); } @Override public Collection enqueued(String clientID) { - return defaultGet(m_enqueuedStore, clientID, new HashSet()); + return Utils.defaultGet(m_enqueuedStore, clientID, new HashSet()); } @Override public void removeEnqueued(String clientID, String guid) { - Set guids = defaultGet(m_enqueuedStore, clientID, new HashSet()); + Set guids = Utils.defaultGet(m_enqueuedStore, clientID, new HashSet()); guids.remove(guid); m_enqueuedStore.put(clientID, guids); } @Override public void secondPhaseAcknowledged(String clientID, int messageID) { - Set messageIDs = defaultGet(m_secondPhaseStore, clientID, new HashSet()); + Set messageIDs = Utils.defaultGet(m_secondPhaseStore, clientID, new HashSet()); messageIDs.remove(messageID); m_secondPhaseStore.put(clientID, messageIDs); } @Override public void secondPhaseAckWaiting(String clientID, int messageID) { - Set messageIDs = defaultGet(m_secondPhaseStore, clientID, new HashSet()); + Set messageIDs = Utils.defaultGet(m_secondPhaseStore, clientID, new HashSet()); messageIDs.add(messageID); m_secondPhaseStore.put(clientID, messageIDs); } @Override public String mapToGuid(String clientID, int messageID) { - HashMap guids = (HashMap) defaultGet(m_messageToGuids, + HashMap guids = (HashMap) Utils.defaultGet(m_messageToGuids, clientID, new HashMap()); return guids.get(messageID); } diff --git a/broker/src/test/java/org/eclipse/moquette/testclient/Client.java b/broker/src/test/java/io/moquette/testclient/Client.java similarity index 93% rename from broker/src/test/java/org/eclipse/moquette/testclient/Client.java rename to broker/src/test/java/io/moquette/testclient/Client.java index f2b1fb3b..5445fe38 100644 --- a/broker/src/test/java/org/eclipse/moquette/testclient/Client.java +++ b/broker/src/test/java/io/moquette/testclient/Client.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/testclient/ClientNettyMQTTHandler.java b/broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java similarity index 88% rename from broker/src/test/java/org/eclipse/moquette/testclient/ClientNettyMQTTHandler.java rename to broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java index eeddc6b6..b4a0bf2f 100644 --- a/broker/src/test/java/org/eclipse/moquette/testclient/ClientNettyMQTTHandler.java +++ b/broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java @@ -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; diff --git a/broker/src/test/java/org/eclipse/moquette/testclient/RawClient.java b/broker/src/test/java/io/moquette/testclient/RawClient.java similarity index 98% rename from broker/src/test/java/org/eclipse/moquette/testclient/RawClient.java rename to broker/src/test/java/io/moquette/testclient/RawClient.java index af309b7d..1cd4066c 100644 --- a/broker/src/test/java/org/eclipse/moquette/testclient/RawClient.java +++ b/broker/src/test/java/io/moquette/testclient/RawClient.java @@ -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; diff --git a/broker/src/test/resources/log4j.properties b/broker/src/test/resources/log4j.properties index 920607e8..4d59128e 100644 --- a/broker/src/test/resources/log4j.properties +++ b/broker/src/test/resources/log4j.properties @@ -1,19 +1,19 @@ # Set root logger level to DEBUG and its only appender to A1. log4j.rootLogger=ERROR, stdout, file -#og4j.logger.org.eclipse.moquette=WARN -log4j.logger.org.eclipse.moquette=DEBUG +#og4j.logger.io.moquette=WARN +log4j.logger.io.moquette=DEBUG -log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=DEBUG -log4j.logger.org.eclipse.moquette.spi.impl.SimpleMessaging=DEBUG +log4j.logger.io.moquette.spi.impl.ProtocolProcessor=DEBUG +log4j.logger.io.moquette.spi.impl.SimpleMessaging=DEBUG #Protocol parsing -log4j.logger.org.eclipse.moquette.server.netty.NettyMQTTHandler=DEBUG -log4j.logger.org.eclipse.moquette.parser.netty=DEBUG +log4j.logger.io.moquette.server.netty.NettyMQTTHandler=DEBUG +log4j.logger.io.moquette.parser.netty=DEBUG #Storage service -#log4j.logger.org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore=DEBUG -log4j.logger.org.eclipse.moquette.spi.persistence.MapDBPersistentStore=DEBUG +#log4j.logger.io.moquette.spi.impl.subscriptions.SubscriptionsStore=DEBUG +log4j.logger.io.moquette.spi.persistence.MapDBPersistentStore=DEBUG # stdout appender is set to be a ConsoleAppender. log4j.appender.stdout=org.apache.log4j.ConsoleAppender diff --git a/distribution/pom.xml b/distribution/pom.xml index 43cb9af3..7bbc9898 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ ../ moquette-parent - org.eclipse.moquette + io.moquette 0.8-SNAPSHOT diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties index 5a9cc456..0e0ac1d8 100644 --- a/distribution/src/main/resources/log4j.properties +++ b/distribution/src/main/resources/log4j.properties @@ -2,17 +2,17 @@ #log4j.rootLogger=ERROR, A1 log4j.rootLogger=ERROR, stdout, file -log4j.logger.org.eclipse.moquette=INFO -log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=INFO -log4j.logger.org.eclipse.moquette.spi.impl.SimpleMessaging=WARN +log4j.logger.io.moquette=INFO +log4j.logger.io.moquette.spi.impl.ProtocolProcessor=INFO +log4j.logger.io.moquette.spi.impl.SimpleMessaging=WARN #Protocol parsing -log4j.logger.org.eclipse.moquette.server.netty.NettyMQTTHandler=WARN -#log4j.logger.org.eclipse.moquette.server.netty.NettyMQTTHandler=DEBUG -log4j.logger.org.eclipse.moquette.parser.netty=WARN +log4j.logger.io.moquette.server.netty.NettyMQTTHandler=WARN +#log4j.logger.io.moquette.server.netty.NettyMQTTHandler=DEBUG +log4j.logger.io.moquette.parser.netty=WARN #Storage server -#log4j.logger.org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore=DEBUG -#log4j.logger.org.eclipse.moquette.spi.impl.HawtDBStorageService=DEBUG +#log4j.logger.io.moquette.spi.impl.subscriptions.SubscriptionsStore=DEBUG +#log4j.logger.io.moquette.spi.impl.HawtDBStorageService=DEBUG # stdout appender is set to be a ConsoleAppender. log4j.appender.stdout=org.apache.log4j.ConsoleAppender diff --git a/distribution/src/main/resources/moquette.conf b/distribution/src/main/resources/moquette.conf index 9ec95fdf..e1a960eb 100644 --- a/distribution/src/main/resources/moquette.conf +++ b/distribution/src/main/resources/moquette.conf @@ -66,13 +66,13 @@ password_file config/password_file.conf # authorizator_class: # class name of the authorizator, by default uses the # password_file.conf. -# If not specified uses the class: org.eclipse.moquette.spi.impl.security.AuthorizationsCollector +# If not specified uses the class: AuthorizationsCollector # # Optional # authenticator_class: # class name of the authenticator, default implementation uses # definitions in the acl.conf. -# If not specified uses org.eclipse.moquette.spi.impl.security.FileAuthenticator +# If not specified uses FileAuthenticator #********************************************************************* # authenticator_class [[path to your class>]] # authorizator_class [[path to your class>]] \ No newline at end of file diff --git a/distribution/src/main/scripts/moquette.bat b/distribution/src/main/scripts/moquette.bat index dee6df1f..5c1e606d 100644 --- a/distribution/src/main/scripts/moquette.bat +++ b/distribution/src/main/scripts/moquette.bat @@ -42,4 +42,4 @@ set JAVA_OPTS= set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true set MOQUETTE_PATH=%MOQUETTE_HOME% set LOG_FILE=%MOQUETTE_HOME%\config\moquette-log.properties -%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* org.eclipse.moquette.server.Server +%JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dmoquette.path=%MOQUETTE_PATH% -cp %MOQUETTE_HOME%\lib\* Server diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh index fff69068..2090f196 100644 --- a/distribution/src/main/scripts/moquette.sh +++ b/distribution/src/main/scripts/moquette.sh @@ -52,5 +52,5 @@ MOQUETTE_PATH=$MOQUETTE_HOME/ #LOG_FILE_LEVEL=fine JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true" -$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/*" org.eclipse.moquette.server.Server +$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/*" Server diff --git a/embedding_moquette/pom.xml b/embedding_moquette/pom.xml index 6ae53f47..a9f40233 100644 --- a/embedding_moquette/pom.xml +++ b/embedding_moquette/pom.xml @@ -5,7 +5,7 @@ ../ moquette-parent - org.eclipse.moquette + io.moquette 0.8-SNAPSHOT @@ -15,7 +15,7 @@ - org.eclipse.moquette + io.moquette moquette-broker ${project.version} diff --git a/embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java b/embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java similarity index 72% rename from embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java rename to embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java index a8689570..04c6c540 100644 --- a/embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java +++ b/embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java @@ -1,8 +1,8 @@ -package org.eclipse.moquette.testembedded; +package io.moquette.testembedded; -import org.eclipse.moquette.server.config.ClasspathConfig; -import org.eclipse.moquette.server.config.IConfig; -import org.eclipse.moquette.server.Server; +import io.moquette.server.Server; +import io.moquette.server.config.IConfig; +import io.moquette.server.config.ClasspathConfig; import java.io.IOException; diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml index 0aa374e8..137a12f5 100644 --- a/netty_parser/pom.xml +++ b/netty_parser/pom.xml @@ -5,7 +5,7 @@ ../ moquette-parent - org.eclipse.moquette + io.moquette 0.8-SNAPSHOT @@ -79,8 +79,8 @@ maven-surefire-plugin - org/eclipse/moquette/parser/netty/TestUtils.java - org/eclipse/moquette/parser/netty/TestUtils$* + io/moquette/parser/netty/TestUtils.java + io/moquette/parser/netty/TestUtils$* diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java similarity index 86% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java index 149287f9..40c41649 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java @@ -1,9 +1,9 @@ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.ConnAckMessage; +import io.moquette.proto.messages.ConnAckMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java similarity index 87% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java index 6cb1e880..55496d33 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.ConnAckMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.ConnAckMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java similarity index 93% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java index 2a811ba6..9b8d6d60 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java @@ -13,8 +13,9 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.ConnectMessage; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.Attribute; @@ -22,10 +23,8 @@ import io.netty.util.AttributeKey; import io.netty.util.AttributeMap; import java.io.UnsupportedEncodingException; import java.util.List; -import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1; -import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.ConnectMessage; + +import io.moquette.proto.messages.AbstractMessage; /** * @@ -69,7 +68,7 @@ public class ConnectDecoder extends DemuxDecoder { } message.setProtocolName(protoName); - versionAttr.set((int) VERSION_3_1); + versionAttr.set((int) Utils.VERSION_3_1); break; case 4: //MQTT version 3.1.1 "MQTT" @@ -86,7 +85,7 @@ public class ConnectDecoder extends DemuxDecoder { throw new CorruptedFrameException("Invalid protoName: " + protoName); } message.setProtocolName(protoName); - versionAttr.set((int) VERSION_3_1_1); + versionAttr.set((int) Utils.VERSION_3_1_1); break; default: //protocol broken @@ -95,7 +94,7 @@ public class ConnectDecoder extends DemuxDecoder { //ProtocolVersion 1 byte (value 0x03 for 3.1, 0x04 for 3.1.1) message.setProtocolVersion(in.readByte()); - if (message.getProtocolVersion() == VERSION_3_1_1) { + if (message.getProtocolVersion() == Utils.VERSION_3_1_1) { //if 3.1.1, check the flags (dup, retain and qos == 0) if (message.isDupFlag() || message.isRetainFlag() || message.getQos() != AbstractMessage.QOSType.MOST_ONE) { throw new CorruptedFrameException("Received a CONNECT with fixed header flags != 0"); @@ -114,7 +113,7 @@ public class ConnectDecoder extends DemuxDecoder { //Connection flag byte connFlags = in.readByte(); - if (message.getProtocolVersion() == VERSION_3_1_1) { + if (message.getProtocolVersion() == Utils.VERSION_3_1_1) { if ((connFlags & 0x01) != 0) { //bit(0) of connection flags is != 0 throw new CorruptedFrameException("Received a CONNECT with connectionFlags[0(bit)] != 0"); } @@ -147,8 +146,8 @@ public class ConnectDecoder extends DemuxDecoder { int keepAlive = in.readUnsignedShort(); message.setKeepAlive(keepAlive); - if ((remainingLength == 12 && message.getProtocolVersion() == VERSION_3_1) || - (remainingLength == 10 && message.getProtocolVersion() == VERSION_3_1_1)) { + if ((remainingLength == 12 && message.getProtocolVersion() == Utils.VERSION_3_1) || + (remainingLength == 10 && message.getProtocolVersion() == Utils.VERSION_3_1_1)) { out.add(message); return; } diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java similarity index 95% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java index f6994623..a7d693f8 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.ConnectMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.ConnectMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java similarity index 96% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java index c742b2b0..59e0ba9a 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java @@ -13,13 +13,13 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java similarity index 89% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java index 97942d4c..769db766 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java @@ -13,11 +13,11 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java index 615fe37e..5c9e33d4 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.DisconnectMessage; +import io.moquette.proto.messages.DisconnectMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java similarity index 85% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java index 538fdfaa..f601821c 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.DisconnectMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.DisconnectMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java similarity index 96% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java index 2adc5bfe..322e3b15 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; @@ -23,7 +23,7 @@ import io.netty.util.AttributeKey; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java similarity index 96% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java index 7c73f260..1a6e3a30 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; @@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException; import io.netty.handler.codec.MessageToByteEncoder; import java.util.HashMap; import java.util.Map; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MessageIDDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java similarity index 92% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MessageIDDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java index 04ff11f7..f2f05975 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MessageIDDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.MessageIDMessage; import io.netty.buffer.ByteBuf; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.MessageIDMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java index 5e539a51..bc50eb5b 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.PingReqMessage; import io.netty.buffer.ByteBuf; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.PingReqMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java similarity index 85% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java index 2aee02fd..52904b9d 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PingReqMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.PingReqMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java index 64a9701e..d4488507 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.PingRespMessage; +import io.moquette.proto.messages.PingRespMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java similarity index 85% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java index b14a4970..1da301e0 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PingRespMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.PingRespMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java index 7fb94b24..80f0dca1 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java @@ -13,10 +13,10 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; -import org.eclipse.moquette.proto.messages.MessageIDMessage; -import org.eclipse.moquette.proto.messages.PubAckMessage; +import io.moquette.proto.messages.MessageIDMessage; +import io.moquette.proto.messages.PubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java similarity index 88% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java index 5de14f0e..cc01f42f 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PubAckMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.PubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java index ed787bfd..5f4bc123 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java @@ -13,10 +13,10 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; -import org.eclipse.moquette.proto.messages.MessageIDMessage; -import org.eclipse.moquette.proto.messages.PubCompMessage; +import io.moquette.proto.messages.MessageIDMessage; +import io.moquette.proto.messages.PubCompMessage; /** diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java index a42123ef..fe18efc4 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.PubCompMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.PubCompMessage; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java index 3af4bd6a..0d96336a 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java @@ -13,10 +13,10 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; -import org.eclipse.moquette.proto.messages.MessageIDMessage; -import org.eclipse.moquette.proto.messages.PubRecMessage; +import io.moquette.proto.messages.MessageIDMessage; +import io.moquette.proto.messages.PubRecMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java index 19fa7743..de9ae61c 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.PubRecMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PubRecMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java similarity index 88% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java index 6a9f0f43..99c430ba 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java @@ -13,14 +13,14 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.MessageIDMessage; +import io.moquette.proto.messages.PubRelMessage; import io.netty.buffer.ByteBuf; import io.netty.util.AttributeMap; import java.io.UnsupportedEncodingException; import java.util.List; -import org.eclipse.moquette.proto.messages.MessageIDMessage; -import org.eclipse.moquette.proto.messages.PubRelMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java index 38adf48f..e9dc769b 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.PubRelMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PubRelMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java similarity index 95% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java index c991d038..08a5204a 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java @@ -13,15 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PublishMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.PublishMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java similarity index 93% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java index c0802f9b..6b720aac 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PublishMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.PublishMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java index 90848b23..e0e1d8bc 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java @@ -13,13 +13,13 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.SubAckMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.SubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java similarity index 87% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java index e6dff215..0e30df60 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java @@ -13,13 +13,13 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType; -import org.eclipse.moquette.proto.messages.SubAckMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage.QOSType; +import io.moquette.proto.messages.SubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java similarity index 94% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java index 1360f73d..6a7fd9e7 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java @@ -13,15 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.AttributeMap; import java.io.UnsupportedEncodingException; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType; -import org.eclipse.moquette.proto.messages.SubscribeMessage; +import io.moquette.proto.messages.AbstractMessage.QOSType; +import io.moquette.proto.messages.SubscribeMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java similarity index 92% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java index 7b4d0d32..55f16bef 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.SubscribeMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.SubscribeMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java index 91b9c457..aa64dc9b 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java @@ -13,10 +13,10 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; -import org.eclipse.moquette.proto.messages.MessageIDMessage; -import org.eclipse.moquette.proto.messages.UnsubAckMessage; +import io.moquette.proto.messages.MessageIDMessage; +import io.moquette.proto.messages.UnsubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java index 6766a2d6..6eb565c0 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.UnsubAckMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.UnsubAckMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java similarity index 93% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java index 8a3b0aa6..9bdcbe05 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java @@ -13,14 +13,14 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.UnsubscribeMessage; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.AttributeMap; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.UnsubscribeMessage; +import io.moquette.proto.messages.AbstractMessage; /** * diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoder.java b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java similarity index 92% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoder.java rename to netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java index 4109cfee..47c934bb 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoder.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java @@ -13,12 +13,12 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.UnsubscribeMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.UnsubscribeMessage; +import io.moquette.proto.messages.AbstractMessage; /** diff --git a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/Utils.java b/netty_parser/src/main/java/io/moquette/parser/netty/Utils.java similarity index 98% rename from netty_parser/src/main/java/org/eclipse/moquette/parser/netty/Utils.java rename to netty_parser/src/main/java/io/moquette/parser/netty/Utils.java index 7b93d04f..e2c536c5 100644 --- a/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/Utils.java +++ b/netty_parser/src/main/java/io/moquette/parser/netty/Utils.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.Attribute; import io.netty.util.AttributeMap; import java.io.UnsupportedEncodingException; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; import org.slf4j.LoggerFactory; /** diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java similarity index 92% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java index c4c09bf9..5413f910 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java @@ -13,14 +13,14 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.ConnAckMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.ConnAckMessage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckEncoderTest.java similarity index 95% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/ConnAckEncoderTest.java index 45658e96..897353d9 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/ConnAckEncoderTest.java @@ -13,14 +13,14 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.ConnAckMessage; +import io.moquette.proto.messages.ConnAckMessage; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java similarity index 97% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java index f2ed0c14..6df905ff 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java @@ -13,8 +13,9 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.ConnectMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.CorruptedFrameException; @@ -24,10 +25,10 @@ import io.netty.util.DefaultAttributeMap; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; -import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1; -import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.ConnectMessage; +import static io.moquette.parser.netty.Utils.VERSION_3_1; +import static io.moquette.parser.netty.Utils.VERSION_3_1_1; +import io.moquette.proto.messages.AbstractMessage; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java similarity index 85% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java index a41d9d58..ceaf1925 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java @@ -13,16 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.ConnectMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.ConnectMessage; import org.junit.Test; import org.junit.Before; import static org.junit.Assert.*; -import static org.eclipse.moquette.parser.netty.TestUtils.*; /** @@ -36,7 +35,7 @@ public class ConnectEncoderTest { @Before public void setUp() { //mock the ChannelHandlerContext to return an UnpooledAllocator - m_mockedContext = mockChannelHandler(); + m_mockedContext = TestUtils.mockChannelHandler(); } @Test @@ -55,7 +54,7 @@ public class ConnectEncoderTest { //Verify assertEquals(0x10, out.readByte()); //1 byte assertEquals(12, out.readByte()); //remaining length - verifyString("MQIsdp", out); + TestUtils.verifyString("MQIsdp", out); assertEquals(0x03, out.readByte()); //protocol version assertEquals(0x32, out.readByte()); //flags assertEquals(2, out.readByte()); //keepAliveTimer msb @@ -85,16 +84,16 @@ public class ConnectEncoderTest { //Verify assertEquals(0x10, out.readByte()); //1 byte assertEquals(36, out.readByte()); //remaining length - verifyString("MQIsdp", out); + TestUtils.verifyString("MQIsdp", out); assertEquals(0x03, out.readByte()); //protocol version assertEquals(0x36, out.readByte()); //flags assertEquals(2, out.readByte()); //keepAliveTimer msb assertEquals(0, out.readByte()); //keepAliveTimer lsb //Variable part - verifyString("ABCDEF", out); - verifyString("Topic", out); - verifyString("Message", out); + TestUtils.verifyString("ABCDEF", out); + TestUtils.verifyString("Topic", out); + TestUtils.verifyString("Message", out); } @Test @@ -123,17 +122,17 @@ public class ConnectEncoderTest { //Verify assertEquals(0x10, out.readByte()); //1 byte assertEquals(48, out.readByte()); //remaining length - verifyString("MQIsdp", out); + TestUtils.verifyString("MQIsdp", out); assertEquals(0x03, out.readByte()); //protocol version assertEquals((byte)0xF6, (byte)out.readByte()); //flags assertEquals(2, out.readByte()); //keepAliveTimer msb assertEquals(0, out.readByte()); //keepAliveTimer lsb //Variable part - verifyString("ABCDEF", out); - verifyString("Topic", out); - verifyString("Message", out); - verifyString("Pablo", out);//username - verifyString("PBL", out);//password + TestUtils.verifyString("ABCDEF", out); + TestUtils.verifyString("Topic", out); + TestUtils.verifyString("Message", out); + TestUtils.verifyString("Pablo", out);//username + TestUtils.verifyString("PBL", out);//password } } diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java similarity index 89% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java index e85bc6e5..c9550390 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java @@ -13,14 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.PubAckMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PubAckMessage; +import io.moquette.proto.messages.AbstractMessage; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -51,7 +52,7 @@ public class PubAckDecoderTest { m_msgdec.decode(null, m_buff, results); assertFalse(results.isEmpty()); - PubAckMessage message = (PubAckMessage)results.get(0); + PubAckMessage message = (PubAckMessage)results.get(0); assertNotNull(message); assertEquals(messageId, message.getMessageID().intValue()); assertEquals(AbstractMessage.PUBACK, message.getMessageType()); diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java similarity index 88% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java index a526980a..505ecb41 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java @@ -13,16 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.PubAckMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import org.junit.Test; import org.junit.Before; import static org.junit.Assert.*; -import static org.eclipse.moquette.parser.netty.TestUtils.*; -import org.eclipse.moquette.proto.messages.PubAckMessage; /** * @@ -34,7 +33,7 @@ public class PubAckEncoderTest { @Before public void setUp() { //mock the ChannelHandlerContext to return an UnpooledAllocator - m_mockedContext = mockChannelHandler(); + m_mockedContext = TestUtils.mockChannelHandler(); } @Test diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java similarity index 95% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java index a37122a6..319081b3 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -22,7 +22,7 @@ import io.netty.util.AttributeMap; import io.netty.util.DefaultAttributeMap; import java.util.ArrayList; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; import org.junit.Test; import static org.junit.Assert.*; import org.junit.Before; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java similarity index 88% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java index 64799d15..8e5eeade 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java @@ -13,16 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; +import io.moquette.proto.messages.PubRelMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.PubRelMessage; import org.junit.Before; import org.junit.Test; -import static org.eclipse.moquette.parser.netty.TestUtils.mockChannelHandler; import static org.junit.Assert.assertEquals; /** @@ -35,7 +34,7 @@ public class PubRelEncoderTest { @Before public void setUp() { //mock the ChannelHandlerContext to return an UnpooledAllocator - m_mockedContext = mockChannelHandler(); + m_mockedContext = TestUtils.mockChannelHandler(); } @Test diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java similarity index 98% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java index bbc24051..8f67408d 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -24,8 +24,8 @@ import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.PublishMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.PublishMessage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/PublishEncoderTest.java similarity index 93% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/PublishEncoderTest.java index f3ccc3e8..db711afd 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/PublishEncoderTest.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -22,9 +22,9 @@ import java.nio.ByteBuffer; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import static org.eclipse.moquette.parser.netty.TestUtils.*; -import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType; -import org.eclipse.moquette.proto.messages.PublishMessage; + +import io.moquette.proto.messages.AbstractMessage.QOSType; +import io.moquette.proto.messages.PublishMessage; /** * @@ -38,7 +38,7 @@ public class PublishEncoderTest { @Before public void setUp() { //mock the ChannelHandlerContext to return an UnpooledAllocator - m_mockedContext = mockChannelHandler(); + m_mockedContext = TestUtils.mockChannelHandler(); m_out = Unpooled.buffer(); } @@ -64,9 +64,9 @@ public class PublishEncoderTest { assertEquals(12, m_out.readByte()); //remaining length //Variable part - verifyString(topic, m_out); + TestUtils.verifyString(topic, m_out); payload.rewind(); - verifyBuff(bpayload.length, payload, m_out); + TestUtils.verifyBuff(bpayload.length, payload, m_out); } @@ -92,11 +92,11 @@ public class PublishEncoderTest { assertEquals(14, m_out.readByte()); //remaining length //Variable part - verifyString(topic, m_out); + TestUtils.verifyString(topic, m_out); assertEquals(0, m_out.readByte()); //MessageID MSB assertEquals(1, m_out.readByte()); //MessageID LSB payload.rewind(); - verifyBuff(bpayload.length, payload, m_out); + TestUtils.verifyBuff(bpayload.length, payload, m_out); } @Test(expected = IllegalArgumentException.class) diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java similarity index 95% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java index 2f941182..8f3585ec 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java @@ -13,14 +13,14 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.SubAckMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.SubAckMessage; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java similarity index 91% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java index caec56a6..036035e8 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java @@ -13,14 +13,13 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; -import static org.eclipse.moquette.parser.netty.TestUtils.mockChannelHandler; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.SubAckMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.SubAckMessage; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; @@ -37,7 +36,7 @@ public class SubAckEncoderTest { @Before public void setUp() { //mock the ChannelHandlerContext to return an UnpooledAllocator - m_mockedContext = mockChannelHandler(); + m_mockedContext = TestUtils.mockChannelHandler(); m_out = Unpooled.buffer(); } diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java similarity index 96% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java index 58ab2a17..bcf3b04d 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java @@ -13,15 +13,15 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.CorruptedFrameException; import java.util.ArrayList; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.SubscribeMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.SubscribeMessage; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java similarity index 88% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java index 6c3d186c..11ceaf7c 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java @@ -13,17 +13,16 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.SubscribeMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.SubscribeMessage; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import static org.eclipse.moquette.parser.netty.TestUtils.*; /** * @@ -37,7 +36,7 @@ public class SubscribeEncoderTest { @Before public void setUp() { //mock the ChannelHandlerContext to return an UnpooledAllocator - m_mockedContext = mockChannelHandler(); + m_mockedContext = TestUtils.mockChannelHandler(); m_out = Unpooled.buffer(); } @@ -65,9 +64,9 @@ public class SubscribeEncoderTest { assertEquals((byte)0xBB, m_out.readByte()); //Variable part - verifyString(c1.getTopicFilter(), m_out); + TestUtils.verifyString(c1.getTopicFilter(), m_out); assertEquals(c1.getQos(), m_out.readByte()); - verifyString(c2.getTopicFilter(), m_out); + TestUtils.verifyString(c2.getTopicFilter(), m_out); assertEquals(c2.getQos(), m_out.readByte()); } diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/TestUtils.java b/netty_parser/src/test/java/io/moquette/parser/netty/TestUtils.java similarity index 98% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/TestUtils.java rename to netty_parser/src/test/java/io/moquette/parser/netty/TestUtils.java index c5f0b9d8..5f9daf73 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/TestUtils.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/TestUtils.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeDecoderTest.java similarity index 96% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeDecoderTest.java index 7b2211b4..5f98d396 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeDecoderTest.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -21,8 +21,8 @@ import io.netty.handler.codec.CorruptedFrameException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.UnsubscribeMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.UnsubscribeMessage; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoderTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java similarity index 89% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoderTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java index 226d4116..f2a7dfc9 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoderTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java @@ -13,17 +13,16 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.UnsubscribeMessage; +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.UnsubscribeMessage; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import static org.eclipse.moquette.parser.netty.TestUtils.*; /** * @@ -38,7 +37,7 @@ public class UnsubscribeEncoderTest { @Before public void setUp() { //mock the ChannelHandlerContext to return an UnpooledAllocator - m_mockedContext = mockChannelHandler(); + m_mockedContext = TestUtils.mockChannelHandler(); m_out = Unpooled.buffer(); m_msg = new UnsubscribeMessage(); m_msg.setMessageID(0xAABB); @@ -65,7 +64,7 @@ public class UnsubscribeEncoderTest { assertEquals((byte)0xBB, m_out.readByte()); //Variable part - verifyString(topic1, m_out); + TestUtils.verifyString(topic1, m_out); } @@ -91,8 +90,8 @@ public class UnsubscribeEncoderTest { assertEquals((byte)0xBB, m_out.readByte()); //Variable part - verifyString(topic1, m_out); - verifyString(topic2, m_out); + TestUtils.verifyString(topic1, m_out); + TestUtils.verifyString(topic2, m_out); } @Test(expected = IllegalArgumentException.class) diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UtilsTest.java b/netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java similarity index 94% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UtilsTest.java rename to netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java index 201dec4d..9b1b5c1e 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UtilsTest.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java @@ -13,17 +13,19 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.parser.netty; +package io.moquette.parser.netty; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.CorruptedFrameException; import org.junit.Before; import org.junit.Test; + +import static io.moquette.parser.netty.TestUtils.verifyBuff; import static org.junit.Assert.*; -import static org.eclipse.moquette.parser.netty.TestUtils.*; -import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.proto.messages.UnsubscribeMessage; + +import io.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.UnsubscribeMessage; /** * diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/LoopHandler.java b/netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java similarity index 95% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/LoopHandler.java rename to netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java index d038d2ff..78b567a2 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/LoopHandler.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java @@ -1,17 +1,16 @@ -package org.eclipse.moquette.parser.netty.performance; +package io.moquette.parser.netty.performance; +import io.moquette.proto.messages.*; +import static io.moquette.proto.messages.AbstractMessage.*; 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.*; +import io.moquette.proto.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.nio.ByteBuffer; -import static org.eclipse.moquette.proto.messages.AbstractMessage.*; - /** * Created by andrea on 6/2/15. */ diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/ProtocolDecodingServer.java b/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java similarity index 96% rename from netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/ProtocolDecodingServer.java rename to netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java index b3dc3f53..c2f6fedb 100644 --- a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/ProtocolDecodingServer.java +++ b/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java @@ -1,5 +1,8 @@ -package org.eclipse.moquette.parser.netty.performance; +package io.moquette.parser.netty.performance; +import io.moquette.commons.Constants; +import io.moquette.parser.netty.MQTTDecoder; +import io.moquette.parser.netty.MQTTEncoder; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; @@ -8,9 +11,6 @@ import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; import io.netty.handler.timeout.IdleStateHandler; -import org.eclipse.moquette.commons.Constants; -import org.eclipse.moquette.parser.netty.MQTTDecoder; -import org.eclipse.moquette.parser.netty.MQTTEncoder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/parser_commons/pom.xml b/parser_commons/pom.xml index c6a88c52..269a56f6 100644 --- a/parser_commons/pom.xml +++ b/parser_commons/pom.xml @@ -5,7 +5,7 @@ ../ moquette-parent - org.eclipse.moquette + io.moquette 0.8-SNAPSHOT diff --git a/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java b/parser_commons/src/main/java/io/moquette/commons/Constants.java similarity index 98% rename from parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java rename to parser_commons/src/main/java/io/moquette/commons/Constants.java index 6e0a1015..6b4c28fa 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java +++ b/parser_commons/src/main/java/io/moquette/commons/Constants.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.commons; +package io.moquette.commons; import java.io.File; diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/MQTTException.java b/parser_commons/src/main/java/io/moquette/proto/MQTTException.java similarity index 96% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/MQTTException.java rename to parser_commons/src/main/java/io/moquette/proto/MQTTException.java index 067df7bc..ed397c8d 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/MQTTException.java +++ b/parser_commons/src/main/java/io/moquette/proto/MQTTException.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto; +package io.moquette.proto; /** * diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/Utils.java b/parser_commons/src/main/java/io/moquette/proto/Utils.java similarity index 95% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/Utils.java rename to parser_commons/src/main/java/io/moquette/proto/Utils.java index e07dd48a..a62c89ab 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/Utils.java +++ b/parser_commons/src/main/java/io/moquette/proto/Utils.java @@ -13,9 +13,9 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto; +package io.moquette.proto; -import org.eclipse.moquette.proto.messages.AbstractMessage; +import io.moquette.proto.messages.AbstractMessage; /** * Common utils methodd used in codecs. diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/AbstractMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/AbstractMessage.java similarity index 98% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/AbstractMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/AbstractMessage.java index e979d887..8689b62f 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/AbstractMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/AbstractMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * Basic abstract message for all MQTT protocol messages. diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnAckMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/ConnAckMessage.java similarity index 94% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnAckMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/ConnAckMessage.java index 9719486d..f36b5d39 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnAckMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/ConnAckMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * The attributes Qos, Dup and Retain aren't used. @@ -32,7 +32,7 @@ public class ConnAckMessage extends AbstractMessage { private boolean sessionPresent; public ConnAckMessage() { - m_messageType = AbstractMessage.CONNACK; + m_messageType = CONNACK; } public byte getReturnCode() { diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnectMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/ConnectMessage.java similarity index 97% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnectMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/ConnectMessage.java index fc1884ff..f696b93c 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnectMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/ConnectMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * The attributes Qos, Dup and Retain aren't used for Connect message @@ -41,7 +41,7 @@ public class ConnectMessage extends AbstractMessage { protected byte[] m_willMessage; public ConnectMessage() { - m_messageType = AbstractMessage.CONNECT; + m_messageType = CONNECT; } public boolean isCleanSession() { diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/DisconnectMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/DisconnectMessage.java similarity index 88% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/DisconnectMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/DisconnectMessage.java index 7361967c..3ad9b7db 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/DisconnectMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/DisconnectMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * Doesn't care DUP, QOS and RETAIN flags. @@ -23,6 +23,6 @@ package org.eclipse.moquette.proto.messages; public class DisconnectMessage extends ZeroLengthMessage { public DisconnectMessage() { - m_messageType = AbstractMessage.DISCONNECT; + m_messageType = DISCONNECT; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/MessageIDMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/MessageIDMessage.java similarity index 96% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/MessageIDMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/MessageIDMessage.java index eba9258b..6560d2bd 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/MessageIDMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/MessageIDMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * Base class for alla the messages that carries only MessageID. (PUBACK, PUBREC, diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingReqMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/PingReqMessage.java similarity index 89% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingReqMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/PingReqMessage.java index 2769362c..ebab3d8d 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingReqMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/PingReqMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * Doesn't care DUP, QOS and RETAIN flags. @@ -23,6 +23,6 @@ package org.eclipse.moquette.proto.messages; public class PingReqMessage extends ZeroLengthMessage { public PingReqMessage() { - m_messageType = AbstractMessage.PINGREQ; + m_messageType = PINGREQ; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingRespMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/PingRespMessage.java similarity index 89% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingRespMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/PingRespMessage.java index 3aa88aef..fe49079e 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingRespMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/PingRespMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * Doesn't care DUP, QOS and RETAIN flags. @@ -22,6 +22,6 @@ package org.eclipse.moquette.proto.messages; public class PingRespMessage extends ZeroLengthMessage { public PingRespMessage() { - m_messageType = AbstractMessage.PINGRESP; + m_messageType = PINGRESP; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubAckMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/PubAckMessage.java similarity index 89% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubAckMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/PubAckMessage.java index 12fec637..612f4762 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubAckMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/PubAckMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * Placeholder for PUBACK message. @@ -23,6 +23,6 @@ package org.eclipse.moquette.proto.messages; public class PubAckMessage extends MessageIDMessage { public PubAckMessage() { - m_messageType = AbstractMessage.PUBACK; + m_messageType = PUBACK; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubCompMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/PubCompMessage.java similarity index 88% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubCompMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/PubCompMessage.java index 40294187..ac415555 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubCompMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/PubCompMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * @@ -22,7 +22,7 @@ package org.eclipse.moquette.proto.messages; public class PubCompMessage extends MessageIDMessage { public PubCompMessage() { - m_messageType = AbstractMessage.PUBCOMP; + m_messageType = PUBCOMP; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRecMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/PubRecMessage.java similarity index 89% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRecMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/PubRecMessage.java index 5d3cbe37..ce173000 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRecMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/PubRecMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * Placeholder for PUBREC message. @@ -23,6 +23,6 @@ package org.eclipse.moquette.proto.messages; public class PubRecMessage extends MessageIDMessage { public PubRecMessage() { - m_messageType = AbstractMessage.PUBREC; + m_messageType = PUBREC; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRelMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/PubRelMessage.java similarity index 88% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRelMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/PubRelMessage.java index 9a8632a2..c3a58863 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRelMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/PubRelMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * @@ -22,6 +22,6 @@ package org.eclipse.moquette.proto.messages; public class PubRelMessage extends MessageIDMessage { public PubRelMessage() { - m_messageType = AbstractMessage.PUBREL; + m_messageType = PUBREL; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PublishMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/PublishMessage.java similarity index 96% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PublishMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/PublishMessage.java index 2d1ea237..c6eadd47 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PublishMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/PublishMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; import java.nio.ByteBuffer; diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubAckMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/SubAckMessage.java similarity index 91% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubAckMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/SubAckMessage.java index c25950db..7034dad8 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubAckMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/SubAckMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ public class SubAckMessage extends MessageIDMessage { List m_types = new ArrayList(); public SubAckMessage() { - m_messageType = AbstractMessage.SUBACK; + m_messageType = SUBACK; } public List types() { diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubscribeMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/SubscribeMessage.java similarity index 97% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubscribeMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/SubscribeMessage.java index 3308f239..414578cb 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubscribeMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/SubscribeMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; import java.util.ArrayList; import java.util.List; diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubAckMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/UnsubAckMessage.java similarity index 88% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubAckMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/UnsubAckMessage.java index 1ab231dc..2275e55e 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubAckMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/UnsubAckMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * @@ -22,7 +22,7 @@ package org.eclipse.moquette.proto.messages; public class UnsubAckMessage extends MessageIDMessage { public UnsubAckMessage() { - m_messageType = AbstractMessage.UNSUBACK; + m_messageType = UNSUBACK; } } diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubscribeMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/UnsubscribeMessage.java similarity index 90% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubscribeMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/UnsubscribeMessage.java index 1f49d13e..23cd03ec 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubscribeMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/UnsubscribeMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; import java.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ public class UnsubscribeMessage extends MessageIDMessage { List m_types = new ArrayList(); public UnsubscribeMessage() { - m_messageType = AbstractMessage.UNSUBSCRIBE; + m_messageType = UNSUBSCRIBE; } public List topicFilters() { diff --git a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ZeroLengthMessage.java b/parser_commons/src/main/java/io/moquette/proto/messages/ZeroLengthMessage.java similarity index 93% rename from parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ZeroLengthMessage.java rename to parser_commons/src/main/java/io/moquette/proto/messages/ZeroLengthMessage.java index 90664102..7327c0a2 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ZeroLengthMessage.java +++ b/parser_commons/src/main/java/io/moquette/proto/messages/ZeroLengthMessage.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.proto.messages; +package io.moquette.proto.messages; /** * diff --git a/pom.xml b/pom.xml index 2d62d191..ba1c11b1 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 UTF-8 @@ -10,8 +9,8 @@ andsel/maven org.dna.mqtt.moquette-parent - - org.eclipse.moquette + + io.moquette moquette-parent pom @@ -58,7 +57,7 @@ distribution embedding_moquette - + diff --git a/tools_scripts/integration/brokerEmbeddedTest.groovy b/tools_scripts/integration/brokerEmbeddedTest.groovy index da08f1a9..f5c9d662 100644 --- a/tools_scripts/integration/brokerEmbeddedTest.groovy +++ b/tools_scripts/integration/brokerEmbeddedTest.groovy @@ -1,7 +1,7 @@ @GrabResolver(name='moquette-bintray', root='http://dl.bintray.com/andsel/maven/') -@Grab(group='org.dna.mqtt', module='moquette-broker', version='0.6') +@Grab(group='io.moquette', module='moquette-broker', version='0.8-SNAPSHOT') -import org.eclipse.moquette.server.Server +import io.moquette.server.Server println "Starting broker in embedded mode" Server server = new Server()