Moved security SPI related interfaces into dedicated package

broker/src/main/java/io/moquette/server/DefaultMoquetteSslContextCreator.java

@@ -17,6 +17,7 @@ package io.moquette.server;
 
 import io.moquette.BrokerConstants;
 import io.moquette.server.config.IConfig;
+import io.moquette.spi.security.ISslContextCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/io/moquette/server/Server.java

@@ -24,6 +24,7 @@ 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 io.moquette.spi.security.ISslContextCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/io/moquette/server/ServerAcceptor.java

@@ -19,6 +19,7 @@ import java.io.IOException;
 
 import io.moquette.server.config.IConfig;
 import io.moquette.spi.impl.ProtocolProcessor;
+import io.moquette.spi.security.ISslContextCreator;
 
 /**
  *

broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java

@@ -19,8 +19,7 @@ import io.moquette.BrokerConstants;
 import io.moquette.commons.Constants;
 import io.moquette.parser.netty.MQTTDecoder;
 import io.moquette.parser.netty.MQTTEncoder;
-import io.moquette.server.DefaultMoquetteSslContextCreator;
-import io.moquette.server.ISslContextCreator;
+import io.moquette.spi.security.ISslContextCreator;
 import io.moquette.server.ServerAcceptor;
 import io.moquette.server.config.IConfig;
 import io.moquette.server.netty.metrics.*;

broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java

@@ -26,8 +26,8 @@ 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.security.IAuthenticator;
+import io.moquette.spi.security.IAuthorizator;
 import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
 import io.moquette.spi.impl.subscriptions.Subscription;
 

broker/src/main/java/io/moquette/spi/impl/SimpleMessaging.java

@@ -23,6 +23,8 @@ 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 io.moquette.spi.security.IAuthenticator;
+import io.moquette.spi.security.IAuthorizator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/io/moquette/spi/impl/security/AcceptAllAuthenticator.java

@@ -1,5 +1,7 @@
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthenticator;
+
 /**
  * Created by andrea on 8/23/14.
  */

broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java

@@ -16,6 +16,7 @@
 package io.moquette.spi.impl.security;
 
 import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
+import io.moquette.spi.security.IAuthorizator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java

@@ -15,6 +15,8 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthorizator;
+
 /**
  * @author andrea
  */

broker/src/main/java/io/moquette/spi/impl/security/FileAuthenticator.java

@@ -15,6 +15,7 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthenticator;
 import org.apache.commons.codec.binary.Hex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java

@@ -15,6 +15,8 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthorizator;
+
 /**
  * @author andrea
  */

broker/src/main/java/io/moquette/spi/security/IAuthenticator.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.spi.impl.security;
+package io.moquette.spi.security;
 
 /**
  * username and password checker

broker/src/main/java/io/moquette/spi/security/IAuthorizator.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.spi.impl.security;
+package io.moquette.spi.security;
 
 /**
  * ACL checker.

broker/src/main/java/io/moquette/spi/security/ISslContextCreator.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package io.moquette.server;
+package io.moquette.spi.security;
 
 import javax.net.ssl.SSLContext;
 

broker/src/test/java/io/moquette/server/ConfigurationClassLoaderTest.java

@@ -18,8 +18,8 @@ package io.moquette.server;
 import io.moquette.BrokerConstants;
 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 io.moquette.spi.security.IAuthenticator;
+import io.moquette.spi.security.IAuthorizator;
 import org.junit.After;
 import org.junit.Test;
 

broker/src/test/java/io/moquette/spi/impl/MockAuthenticator.java

@@ -17,7 +17,7 @@ package io.moquette.spi.impl;
 
 import java.util.Map;
 
-import io.moquette.spi.impl.security.IAuthenticator;
+import io.moquette.spi.security.IAuthenticator;
 
 /**
  * Test utility to implements authenticator instance.

broker/src/test/java/io/moquette/spi/impl/security/FileAuthenticatorTest.java

@@ -15,6 +15,7 @@
  */
 package io.moquette.spi.impl.security;
 
+import io.moquette.spi.security.IAuthenticator;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;