From 8481fada93229cb81b8836455ed8158ec767c8b1 Mon Sep 17 00:00:00 2001 From: Luis Barrios Date: Wed, 11 Jan 2017 10:16:58 +0100 Subject: [PATCH] Remove unused imports, raw types and some deprecated method calls.. --- .../main/java/io/moquette/interception/HazelcastMsg.java | 3 ++- .../java/io/moquette/server/config/IResourceLoader.java | 4 +++- .../java/io/moquette/server/netty/AutoFlushHandler.java | 1 - .../main/java/io/moquette/server/netty/NettyAcceptor.java | 1 - .../main/java/io/moquette/server/netty/NettyUtils.java | 1 - .../server/netty/metrics/BytesMetricsHandler.java | 8 ++++---- .../server/netty/metrics/MessageMetricsHandler.java | 8 ++++---- broker/src/main/java/io/moquette/spi/IMessagesStore.java | 5 ++--- broker/src/main/java/io/moquette/spi/MessageGUID.java | 3 ++- .../java/io/moquette/spi/impl/InternalRepublisher.java | 1 - .../moquette/spi/impl/ProtocolProcessorBootstrapper.java | 1 - .../io/moquette/spi/impl/security/DBAuthenticator.java | 2 -- .../moquette/spi/impl/security/ResourceAuthenticator.java | 1 - .../io/moquette/spi/impl/subscriptions/Subscription.java | 3 ++- .../io/moquette/spi/persistence/MapDBPersistentStore.java | 3 ++- .../io/moquette/spi/persistence/MapDBSessionsStore.java | 1 - 16 files changed, 21 insertions(+), 25 deletions(-) diff --git a/broker/src/main/java/io/moquette/interception/HazelcastMsg.java b/broker/src/main/java/io/moquette/interception/HazelcastMsg.java index 92ff4235..990decb6 100644 --- a/broker/src/main/java/io/moquette/interception/HazelcastMsg.java +++ b/broker/src/main/java/io/moquette/interception/HazelcastMsg.java @@ -9,7 +9,8 @@ import java.io.Serializable; */ public class HazelcastMsg implements Serializable { - private final String clientId; + private static final long serialVersionUID = 1L; + private final String clientId; private final byte qos; private final byte[] payload; private final String topic; diff --git a/broker/src/main/java/io/moquette/server/config/IResourceLoader.java b/broker/src/main/java/io/moquette/server/config/IResourceLoader.java index e1a035ac..74ca0a55 100644 --- a/broker/src/main/java/io/moquette/server/config/IResourceLoader.java +++ b/broker/src/main/java/io/moquette/server/config/IResourceLoader.java @@ -11,7 +11,9 @@ public interface IResourceLoader { String getName(); class ResourceIsDirectoryException extends RuntimeException { - public ResourceIsDirectoryException(String message) { + private static final long serialVersionUID = 1L; + + public ResourceIsDirectoryException(String message) { super(message); } } diff --git a/broker/src/main/java/io/moquette/server/netty/AutoFlushHandler.java b/broker/src/main/java/io/moquette/server/netty/AutoFlushHandler.java index 534e21e2..66cbcd9a 100644 --- a/broker/src/main/java/io/moquette/server/netty/AutoFlushHandler.java +++ b/broker/src/main/java/io/moquette/server/netty/AutoFlushHandler.java @@ -17,7 +17,6 @@ package io.moquette.server.netty; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.timeout.IdleStateEvent; import io.netty.util.concurrent.EventExecutor; import java.util.concurrent.ScheduledFuture; diff --git a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java index 7aa98725..39eb04ca 100644 --- a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java @@ -38,7 +38,6 @@ import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame; -import io.netty.handler.codec.http.websocketx.Utf8FrameValidator; import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.ssl.SslHandler; import io.netty.handler.timeout.IdleStateHandler; diff --git a/broker/src/main/java/io/moquette/server/netty/NettyUtils.java b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java index 3d1a583d..5d43857a 100644 --- a/broker/src/main/java/io/moquette/server/netty/NettyUtils.java +++ b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java @@ -16,7 +16,6 @@ package io.moquette.server.netty; import io.moquette.server.Constants; -import io.moquette.spi.impl.ProtocolProcessor; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.util.Attribute; diff --git a/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java index 299dfc55..938b3d20 100644 --- a/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java @@ -34,7 +34,7 @@ public class BytesMetricsHandler extends ChannelDuplexHandler { @Override public void channelActive(ChannelHandlerContext ctx) throws Exception { - Attribute attr = ctx.attr(ATTR_KEY_METRICS); + Attribute attr = ctx.channel().attr(ATTR_KEY_METRICS); attr.set(new BytesMetrics()); super.channelActive(ctx); @@ -42,14 +42,14 @@ public class BytesMetricsHandler extends ChannelDuplexHandler { @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { - BytesMetrics metrics = ctx.attr(ATTR_KEY_METRICS).get(); + BytesMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get(); metrics.incrementRead(((ByteBuf)msg).readableBytes()); ctx.fireChannelRead(msg); } @Override public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { - BytesMetrics metrics = ctx.attr(ATTR_KEY_METRICS).get(); + BytesMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get(); metrics.incrementWrote(((ByteBuf)msg).writableBytes()); ctx.write(msg, promise); } @@ -58,7 +58,7 @@ public class BytesMetricsHandler extends ChannelDuplexHandler { @Override public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception { - BytesMetrics metrics = ctx.attr(ATTR_KEY_METRICS).get(); + BytesMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get(); m_collector.sumReadBytes(metrics.readBytes()); m_collector.sumWroteBytes(metrics.wroteBytes()); super.close(ctx, promise); diff --git a/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java index 862ed8d8..b11f0ee4 100644 --- a/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java +++ b/broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java @@ -33,7 +33,7 @@ public class MessageMetricsHandler extends ChannelDuplexHandler { @Override public void channelActive(ChannelHandlerContext ctx) throws Exception { - Attribute attr = ctx.attr(ATTR_KEY_METRICS); + Attribute attr = ctx.channel().attr(ATTR_KEY_METRICS); attr.set(new MessageMetrics()); super.channelActive(ctx); @@ -41,14 +41,14 @@ public class MessageMetricsHandler extends ChannelDuplexHandler { @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { - MessageMetrics metrics = ctx.attr(ATTR_KEY_METRICS).get(); + MessageMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get(); metrics.incrementRead(1); ctx.fireChannelRead(msg); } @Override public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { - MessageMetrics metrics = ctx.attr(ATTR_KEY_METRICS).get(); + MessageMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get(); metrics.incrementWrote(1); ctx.write(msg, promise); } @@ -57,7 +57,7 @@ public class MessageMetricsHandler extends ChannelDuplexHandler { @Override public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception { - MessageMetrics metrics = ctx.attr(ATTR_KEY_METRICS).get(); + MessageMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get(); m_collector.sumReadMessages(metrics.messagesRead()); m_collector.sumWroteMessages(metrics.messagesWrote()); super.close(ctx, promise); diff --git a/broker/src/main/java/io/moquette/spi/IMessagesStore.java b/broker/src/main/java/io/moquette/spi/IMessagesStore.java index 8be4af80..f4d64579 100644 --- a/broker/src/main/java/io/moquette/spi/IMessagesStore.java +++ b/broker/src/main/java/io/moquette/spi/IMessagesStore.java @@ -20,8 +20,6 @@ import java.nio.ByteBuffer; import io.moquette.parser.proto.messages.AbstractMessage; import java.util.Collection; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; /** * Defines the SPI to be implemented by a StorageService that handle persistence of messages @@ -29,7 +27,8 @@ import java.util.concurrent.atomic.AtomicInteger; public interface IMessagesStore { class StoredMessage implements Serializable { - final AbstractMessage.QOSType m_qos; + private static final long serialVersionUID = 1L; + final AbstractMessage.QOSType m_qos; final byte[] m_payload; final String m_topic; private boolean m_retained; diff --git a/broker/src/main/java/io/moquette/spi/MessageGUID.java b/broker/src/main/java/io/moquette/spi/MessageGUID.java index 4bd7cd84..ab91bb8e 100644 --- a/broker/src/main/java/io/moquette/spi/MessageGUID.java +++ b/broker/src/main/java/io/moquette/spi/MessageGUID.java @@ -21,7 +21,8 @@ import java.io.Serializable; * Value object for GUIDs of messages. * */ public class MessageGUID implements Serializable { - private final String guid; + private static final long serialVersionUID = 1L; + private final String guid; public MessageGUID(String guid) { this.guid = guid; diff --git a/broker/src/main/java/io/moquette/spi/impl/InternalRepublisher.java b/broker/src/main/java/io/moquette/spi/impl/InternalRepublisher.java index 10db65f7..b568dc2b 100644 --- a/broker/src/main/java/io/moquette/spi/impl/InternalRepublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/InternalRepublisher.java @@ -12,7 +12,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Queue; import java.util.concurrent.BlockingQueue; class InternalRepublisher { diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java index 3c9e8d6e..13fbb510 100644 --- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java +++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java @@ -106,7 +106,6 @@ public class ProtocolProcessorBootstrapper { subscriptions.init(m_sessionsStore); - String configPath = System.getProperty("moquette.path", null); String authenticatorClassName = props.getProperty(BrokerConstants.AUTHENTICATOR_CLASS_NAME, ""); if (!authenticatorClassName.isEmpty()) { diff --git a/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java index e2c8e849..e1cd774f 100644 --- a/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java @@ -22,7 +22,6 @@ public class DBAuthenticator implements IAuthenticator { private static final Logger LOG = LoggerFactory.getLogger(DBAuthenticator.class); - private final String sqlQuery; private final MessageDigest messageDigest; private final PreparedStatement preparedStatement; @@ -44,7 +43,6 @@ public class DBAuthenticator implements IAuthenticator { */ public DBAuthenticator(String driver, String jdbcUrl, String sqlQuery, String digestMethod){ - this.sqlQuery = sqlQuery; try { Class.forName(driver); final Connection connection = DriverManager.getConnection(jdbcUrl); diff --git a/broker/src/main/java/io/moquette/spi/impl/security/ResourceAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/ResourceAuthenticator.java index 275c9e40..38cbb60a 100644 --- a/broker/src/main/java/io/moquette/spi/impl/security/ResourceAuthenticator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/ResourceAuthenticator.java @@ -17,7 +17,6 @@ package io.moquette.spi.impl.security; import io.moquette.server.config.IResourceLoader; import io.moquette.spi.security.IAuthenticator; -import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java index 12f86946..b088b6ab 100644 --- a/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java +++ b/broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java @@ -28,7 +28,8 @@ import io.moquette.spi.ISessionsStore.ClientTopicCouple; */ public final class Subscription implements Serializable { - final QOSType requestedQos; //max QoS acceptable + private static final long serialVersionUID = 1L; + final QOSType requestedQos; //max QoS acceptable final String clientId; final String topicFilter; final boolean active; diff --git a/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java index a52a87ba..31058a5c 100644 --- a/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java +++ b/broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java @@ -45,7 +45,8 @@ public class MapDBPersistentStore { * a session. * */ public static class PersistentSession implements Serializable { - public final boolean cleanSession; + private static final long serialVersionUID = 1L; + public final boolean cleanSession; public PersistentSession(boolean cleanSession) { this.cleanSession = cleanSession; diff --git a/broker/src/main/java/io/moquette/spi/persistence/MapDBSessionsStore.java b/broker/src/main/java/io/moquette/spi/persistence/MapDBSessionsStore.java index 9a6ca0a8..38515931 100644 --- a/broker/src/main/java/io/moquette/spi/persistence/MapDBSessionsStore.java +++ b/broker/src/main/java/io/moquette/spi/persistence/MapDBSessionsStore.java @@ -16,7 +16,6 @@ package io.moquette.spi.persistence; import io.moquette.spi.ClientSession; -import io.moquette.spi.IMessagesStore; import io.moquette.spi.IMessagesStore.StoredMessage; import io.moquette.spi.ISessionsStore; import io.moquette.spi.MessageGUID;