From 1c60b3d282c15af41603cdbe9157fae7ca908f38 Mon Sep 17 00:00:00 2001 From: ctlove0523 <478309639@qq.com> Date: Wed, 16 Feb 2022 22:04:37 +0800 Subject: [PATCH] remove unused codes and imports --- .../java/io/moquette/broker/MQTTConnection.java | 1 - .../io/moquette/broker/NewNettyMQTTHandler.java | 5 ----- broker/src/main/java/io/moquette/broker/Server.java | 2 +- .../java/io/moquette/broker/config/IConfig.java | 4 ---- .../io/moquette/broker/config/MemoryConfig.java | 13 ------------- .../broker/metrics/DropWizardMetricsHandler.java | 5 ----- .../moquette/broker/security/DBAuthenticator.java | 2 +- .../io/moquette/broker/subscriptions/Token.java | 7 +++---- .../io/moquette/persistence/ByteBufDataType.java | 1 - 9 files changed, 5 insertions(+), 35 deletions(-) diff --git a/broker/src/main/java/io/moquette/broker/MQTTConnection.java b/broker/src/main/java/io/moquette/broker/MQTTConnection.java index aa77e1697..6b79f240d 100644 --- a/broker/src/main/java/io/moquette/broker/MQTTConnection.java +++ b/broker/src/main/java/io/moquette/broker/MQTTConnection.java @@ -25,7 +25,6 @@ import io.netty.channel.ChannelPipeline; import io.netty.handler.codec.mqtt.*; import io.netty.handler.timeout.IdleStateHandler; -import io.netty.util.ReferenceCountUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/io/moquette/broker/NewNettyMQTTHandler.java b/broker/src/main/java/io/moquette/broker/NewNettyMQTTHandler.java index 41889a3d4..10fa6848f 100644 --- a/broker/src/main/java/io/moquette/broker/NewNettyMQTTHandler.java +++ b/broker/src/main/java/io/moquette/broker/NewNettyMQTTHandler.java @@ -24,8 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - import static io.netty.channel.ChannelFutureListener.CLOSE_ON_FAILURE; @Sharable @@ -97,9 +95,6 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { @Override public void channelWritabilityChanged(ChannelHandlerContext ctx) { -// if (ctx.channel().isWritable()) { -// m_processor.notifyChannelWritable(ctx.channel()); -// } final MQTTConnection mqttConnection = mqttConnection(ctx.channel()); mqttConnection.writabilityChanged(); ctx.fireChannelWritabilityChanged(); diff --git a/broker/src/main/java/io/moquette/broker/Server.java b/broker/src/main/java/io/moquette/broker/Server.java index 1fab4260e..ce76cbba3 100644 --- a/broker/src/main/java/io/moquette/broker/Server.java +++ b/broker/src/main/java/io/moquette/broker/Server.java @@ -43,7 +43,7 @@ public class Server { - private static final Logger LOG = LoggerFactory.getLogger(io.moquette.broker.Server.class); + private static final Logger LOG = LoggerFactory.getLogger(Server.class); private ScheduledExecutorService scheduler; private NewNettyAcceptor acceptor; diff --git a/broker/src/main/java/io/moquette/broker/config/IConfig.java b/broker/src/main/java/io/moquette/broker/config/IConfig.java index 3bd06b60e..7425fea7e 100644 --- a/broker/src/main/java/io/moquette/broker/config/IConfig.java +++ b/broker/src/main/java/io/moquette/broker/config/IConfig.java @@ -47,11 +47,7 @@ public abstract class IConfig { void assignDefaults() { setProperty(BrokerConstants.PORT_PROPERTY_NAME, Integer.toString(BrokerConstants.PORT)); setProperty(BrokerConstants.HOST_PROPERTY_NAME, BrokerConstants.HOST); - // setProperty(BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, - // Integer.toString(BrokerConstants.WEBSOCKET_PORT)); setProperty(BrokerConstants.PASSWORD_FILE_PROPERTY_NAME, ""); - // setProperty(BrokerConstants.PERSISTENT_STORE_PROPERTY_NAME, - // BrokerConstants.DEFAULT_PERSISTENT_PATH); setProperty(BrokerConstants.ALLOW_ANONYMOUS_PROPERTY_NAME, Boolean.TRUE.toString()); setProperty(BrokerConstants.AUTHENTICATOR_CLASS_NAME, ""); setProperty(BrokerConstants.AUTHORIZATOR_CLASS_NAME, ""); diff --git a/broker/src/main/java/io/moquette/broker/config/MemoryConfig.java b/broker/src/main/java/io/moquette/broker/config/MemoryConfig.java index fbf0de3a8..419d84fc2 100644 --- a/broker/src/main/java/io/moquette/broker/config/MemoryConfig.java +++ b/broker/src/main/java/io/moquette/broker/config/MemoryConfig.java @@ -33,19 +33,6 @@ public MemoryConfig(Properties properties) { } } - // private void createDefaults() { - // m_properties.put(BrokerConstants.PORT_PROPERTY_NAME, Integer.toString(BrokerConstants.PORT)); - // m_properties.put(BrokerConstants.HOST_PROPERTY_NAME, BrokerConstants.HOST); - // m_properties.put(BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, - // Integer.toString(BrokerConstants.WEBSOCKET_PORT)); - // m_properties.put(BrokerConstants.PASSWORD_FILE_PROPERTY_NAME, ""); - // m_properties.put(BrokerConstants.PERSISTENT_STORE_PROPERTY_NAME, - // BrokerConstants.DEFAULT_PERSISTENT_PATH); - // m_properties.put(BrokerConstants.ALLOW_ANONYMOUS_PROPERTY_NAME, true); - // m_properties.put(BrokerConstants.AUTHENTICATOR_CLASS_NAME, ""); - // m_properties.put(BrokerConstants.AUTHORIZATOR_CLASS_NAME, ""); - // } - @Override public void setProperty(String name, String value) { m_properties.setProperty(name, value); diff --git a/broker/src/main/java/io/moquette/broker/metrics/DropWizardMetricsHandler.java b/broker/src/main/java/io/moquette/broker/metrics/DropWizardMetricsHandler.java index 83ae6f8e6..6aa537562 100644 --- a/broker/src/main/java/io/moquette/broker/metrics/DropWizardMetricsHandler.java +++ b/broker/src/main/java/io/moquette/broker/metrics/DropWizardMetricsHandler.java @@ -46,11 +46,6 @@ public void init(IConfig props) { this.publishesMetrics = metrics.meter("publish.requests"); this.subscribeMetrics = metrics.meter("subscribe.requests"); this.connectedClientsMetrics = metrics.counter("connect.num_clients"); -// ConsoleReporter reporter = ConsoleReporter.forRegistry(metrics) -// .convertRatesTo(TimeUnit.SECONDS) -// .convertDurationsTo(TimeUnit.MILLISECONDS) -// .build(); -// reporter.start(1, TimeUnit.MINUTES); final String email = props.getProperty(METRICS_LIBRATO_EMAIL_PROPERTY_NAME); final String token = props.getProperty(METRICS_LIBRATO_TOKEN_PROPERTY_NAME); final String source = props.getProperty(METRICS_LIBRATO_SOURCE_PROPERTY_NAME); diff --git a/broker/src/main/java/io/moquette/broker/security/DBAuthenticator.java b/broker/src/main/java/io/moquette/broker/security/DBAuthenticator.java index e23fc0f29..9f5df71fe 100644 --- a/broker/src/main/java/io/moquette/broker/security/DBAuthenticator.java +++ b/broker/src/main/java/io/moquette/broker/security/DBAuthenticator.java @@ -111,7 +111,7 @@ public synchronized boolean checkValid(String clientId, String username, byte[] conn.close(); } } catch (SQLException e) { - LOG.error("Error releasing connection to the datasource", username, e); + LOG.error("Error releasing connection to the datasource, username = {},exception = {}", username, e); } } return false; diff --git a/broker/src/main/java/io/moquette/broker/subscriptions/Token.java b/broker/src/main/java/io/moquette/broker/subscriptions/Token.java index 550a60046..6453c856e 100644 --- a/broker/src/main/java/io/moquette/broker/subscriptions/Token.java +++ b/broker/src/main/java/io/moquette/broker/subscriptions/Token.java @@ -16,6 +16,8 @@ package io.moquette.broker.subscriptions; +import java.util.Objects; + /** * Internal use only class. */ @@ -62,10 +64,7 @@ public boolean equals(Object obj) { return false; } final Token other = (Token) obj; - if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { - return false; - } - return true; + return Objects.equals(this.name, other.name); } @Override diff --git a/broker/src/main/java/io/moquette/persistence/ByteBufDataType.java b/broker/src/main/java/io/moquette/persistence/ByteBufDataType.java index 2a824f055..bc5883221 100644 --- a/broker/src/main/java/io/moquette/persistence/ByteBufDataType.java +++ b/broker/src/main/java/io/moquette/persistence/ByteBufDataType.java @@ -17,7 +17,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import org.h2.mvstore.DataUtils; import org.h2.mvstore.WriteBuffer; import java.nio.ByteBuffer;