From d8875dd8b9b9f8b87048822aa101544c1433740c Mon Sep 17 00:00:00 2001 From: andrea Date: Sat, 22 Aug 2015 15:40:55 +0200 Subject: [PATCH] Moved config part in its separate package --- ChangeLog.txt | 1 + .../src/main/java/org/eclipse/moquette/server/Server.java | 3 +++ .../java/org/eclipse/moquette/server/ServerAcceptor.java | 3 ++- .../moquette/server/{ => config}/ClasspathConfig.java | 2 +- .../moquette/server/{ => config}/ConfigurationParser.java | 3 +-- .../moquette/server/{ => config}/FilesystemConfig.java | 2 +- .../org/eclipse/moquette/server/{ => config}/IConfig.java | 2 +- .../eclipse/moquette/server/{ => config}/MemoryConfig.java | 2 +- .../org/eclipse/moquette/server/netty/NettyAcceptor.java | 2 +- .../org/eclipse/moquette/spi/impl/SimpleMessaging.java | 4 +--- .../moquette/server/ConfigurationClassLoaderTest.java | 7 ++----- .../eclipse/moquette/server/ServerIntegrationFuseTest.java | 2 ++ .../eclipse/moquette/server/ServerIntegrationPahoTest.java | 5 ++--- .../server/ServerIntegrationQoSValidationTest.java | 2 ++ .../moquette/server/ServerIntegrationWebSocketTest.java | 2 ++ .../server/ServerLowlevelMessagesIntegrationTests.java | 2 ++ .../moquette/server/ServerRestartIntegrationTest.java | 2 ++ .../server/{ => config}/ConfigurationParserTest.java | 3 ++- .../eclipse/moquette/testembedded/EmbeddedLauncher.java | 4 ++-- 19 files changed, 31 insertions(+), 22 deletions(-) rename broker/src/main/java/org/eclipse/moquette/server/{ => config}/ClasspathConfig.java (98%) rename broker/src/main/java/org/eclipse/moquette/server/{ => config}/ConfigurationParser.java (98%) rename broker/src/main/java/org/eclipse/moquette/server/{ => config}/FilesystemConfig.java (97%) rename broker/src/main/java/org/eclipse/moquette/server/{ => config}/IConfig.java (95%) rename broker/src/main/java/org/eclipse/moquette/server/{ => config}/MemoryConfig.java (98%) rename broker/src/test/java/org/eclipse/moquette/server/{ => config}/ConfigurationParserTest.java (96%) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8e3fa985..a99c22f6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -5,6 +5,7 @@ Version 0.8: Fixed issue #69 Fixed bug #68, UNSUBSCRIBE has to fail on bad topicFilter names Fixed bug #81, on stop of moquette broker it doesn't shutdown due to no shutdown of ringbuffer used on the back of ProtocolProcessor + Moved config to be not only filesystem based, but also classpath and memory (fix issue #73) Version 0.7: Fix issue #38, added aligned to MQTT 3.1.1 diff --git a/broker/src/main/java/org/eclipse/moquette/server/Server.java b/broker/src/main/java/org/eclipse/moquette/server/Server.java index 76687270..6df25933 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/Server.java +++ b/broker/src/main/java/org/eclipse/moquette/server/Server.java @@ -15,6 +15,9 @@ */ package org.eclipse.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.SimpleMessaging; import org.slf4j.Logger; diff --git a/broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java b/broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java index 51e4ea12..89983407 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java +++ b/broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java @@ -16,7 +16,8 @@ package org.eclipse.moquette.server; import java.io.IOException; -import java.util.Properties; + +import org.eclipse.moquette.server.config.IConfig; import org.eclipse.moquette.spi.IMessaging; /** diff --git a/broker/src/main/java/org/eclipse/moquette/server/ClasspathConfig.java b/broker/src/main/java/org/eclipse/moquette/server/config/ClasspathConfig.java similarity index 98% rename from broker/src/main/java/org/eclipse/moquette/server/ClasspathConfig.java rename to broker/src/main/java/org/eclipse/moquette/server/config/ClasspathConfig.java index 40e2d1b7..d037885f 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/ClasspathConfig.java +++ b/broker/src/main/java/org/eclipse/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; +package org.eclipse.moquette.server.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java b/broker/src/main/java/org/eclipse/moquette/server/config/ConfigurationParser.java similarity index 98% rename from broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java rename to broker/src/main/java/org/eclipse/moquette/server/config/ConfigurationParser.java index 1a76aecf..ca1e28da 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java +++ b/broker/src/main/java/org/eclipse/moquette/server/config/ConfigurationParser.java @@ -13,14 +13,13 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server; +package org.eclipse.moquette.server.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.*; import java.text.ParseException; -import java.util.Map.Entry; import java.util.Properties; import static org.eclipse.moquette.commons.Constants.*; diff --git a/broker/src/main/java/org/eclipse/moquette/server/FilesystemConfig.java b/broker/src/main/java/org/eclipse/moquette/server/config/FilesystemConfig.java similarity index 97% rename from broker/src/main/java/org/eclipse/moquette/server/FilesystemConfig.java rename to broker/src/main/java/org/eclipse/moquette/server/config/FilesystemConfig.java index 26ca4672..f5162f96 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/FilesystemConfig.java +++ b/broker/src/main/java/org/eclipse/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; +package org.eclipse.moquette.server.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/org/eclipse/moquette/server/IConfig.java b/broker/src/main/java/org/eclipse/moquette/server/config/IConfig.java similarity index 95% rename from broker/src/main/java/org/eclipse/moquette/server/IConfig.java rename to broker/src/main/java/org/eclipse/moquette/server/config/IConfig.java index b3281ce9..1b4bc36c 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/IConfig.java +++ b/broker/src/main/java/org/eclipse/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; +package org.eclipse.moquette.server.config; /** * Base interface for all configuration implementations (filesystem, memory or classpath) diff --git a/broker/src/main/java/org/eclipse/moquette/server/MemoryConfig.java b/broker/src/main/java/org/eclipse/moquette/server/config/MemoryConfig.java similarity index 98% rename from broker/src/main/java/org/eclipse/moquette/server/MemoryConfig.java rename to broker/src/main/java/org/eclipse/moquette/server/config/MemoryConfig.java index 8e5150b2..f706b6ff 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/MemoryConfig.java +++ b/broker/src/main/java/org/eclipse/moquette/server/config/MemoryConfig.java @@ -13,7 +13,7 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server; +package org.eclipse.moquette.server.config; import java.util.Map; import java.util.Properties; diff --git a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java index 08c233b8..3d16cba0 100644 --- a/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java @@ -48,7 +48,7 @@ import javax.net.ssl.SSLEngine; import io.netty.util.concurrent.Future; import org.eclipse.moquette.commons.Constants; -import org.eclipse.moquette.server.IConfig; +import org.eclipse.moquette.server.config.IConfig; import org.eclipse.moquette.spi.IMessaging; import org.eclipse.moquette.parser.netty.MQTTDecoder; import org.eclipse.moquette.parser.netty.MQTTEncoder; diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java index d61d764b..48475336 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java @@ -18,11 +18,10 @@ package org.eclipse.moquette.spi.impl; import com.lmax.disruptor.EventHandler; import com.lmax.disruptor.RingBuffer; import com.lmax.disruptor.dsl.Disruptor; -import io.netty.util.internal.StringUtil; import org.HdrHistogram.Histogram; import org.eclipse.moquette.interception.InterceptHandler; import org.eclipse.moquette.proto.messages.AbstractMessage; -import org.eclipse.moquette.server.IConfig; +import org.eclipse.moquette.server.config.IConfig; import org.eclipse.moquette.spi.impl.security.*; import org.eclipse.moquette.server.ServerChannel; import org.eclipse.moquette.spi.IMessagesStore; @@ -43,7 +42,6 @@ import java.lang.reflect.Method; import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java b/broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java index 4c599fe3..647fcac8 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java @@ -15,19 +15,16 @@ */ package org.eclipse.moquette.server; -import org.fusesource.mqtt.client.*; +import org.eclipse.moquette.server.config.IConfig; +import org.eclipse.moquette.server.config.MemoryConfig; 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.util.Iterator; -import java.util.Map; import java.util.Properties; -import java.util.concurrent.TimeUnit; import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME; import static org.eclipse.moquette.commons.Constants.AUTHENTICATOR_CLASS_NAME; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java index 336ed48c..cf3ff44c 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java @@ -15,6 +15,8 @@ */ package org.eclipse.moquette.server; +import org.eclipse.moquette.server.config.IConfig; +import org.eclipse.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/org/eclipse/moquette/server/ServerIntegrationPahoTest.java index c020b7a5..7cf776d1 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java @@ -15,9 +15,10 @@ */ package org.eclipse.moquette.server; +import org.eclipse.moquette.server.config.IConfig; +import org.eclipse.moquette.server.config.MemoryConfig; import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence; -import org.fusesource.mqtt.client.QoS; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -30,8 +31,6 @@ import java.io.IOException; import java.util.Properties; import static org.eclipse.moquette.commons.Constants.*; -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.junit.Assert.*; public class ServerIntegrationPahoTest { diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java index 3f813f43..48044a29 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java @@ -16,6 +16,8 @@ package org.eclipse.moquette.server; +import org.eclipse.moquette.server.config.IConfig; +import org.eclipse.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/ServerIntegrationWebSocketTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java index 9e906971..a04420f6 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java @@ -18,6 +18,8 @@ package org.eclipse.moquette.server; import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.moquette.commons.Constants; +import org.eclipse.moquette.server.config.IConfig; +import org.eclipse.moquette.server.config.MemoryConfig; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java b/broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java index ac391abd..474dcde7 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java @@ -19,6 +19,8 @@ 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 org.fusesource.mqtt.client.*; import org.junit.After; diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java index a656a200..c309bc3e 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java @@ -15,6 +15,8 @@ */ package org.eclipse.moquette.server; +import org.eclipse.moquette.server.config.IConfig; +import org.eclipse.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/ConfigurationParserTest.java b/broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java similarity index 96% rename from broker/src/test/java/org/eclipse/moquette/server/ConfigurationParserTest.java rename to broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java index 9c452d1e..cd286d7f 100644 --- a/broker/src/test/java/org/eclipse/moquette/server/ConfigurationParserTest.java +++ b/broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java @@ -13,8 +13,9 @@ * * You may elect to redistribute this code under either of these licenses. */ -package org.eclipse.moquette.server; +package org.eclipse.moquette.server.config; +import org.eclipse.moquette.server.config.ConfigurationParser; import org.junit.Before; import org.junit.Test; diff --git a/embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java b/embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java index c6399be4..a8689570 100644 --- a/embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java +++ b/embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java @@ -1,7 +1,7 @@ package org.eclipse.moquette.testembedded; -import org.eclipse.moquette.server.ClasspathConfig; -import org.eclipse.moquette.server.IConfig; +import org.eclipse.moquette.server.config.ClasspathConfig; +import org.eclipse.moquette.server.config.IConfig; import org.eclipse.moquette.server.Server; import java.io.IOException;