Refactor MoP to prepare for split Proxy to seperate module (#1509)

streamnative · Oct 18, 2024 · 8121554 · 8121554
1 parent 07d7526
commit 8121554
Show file tree

Hide file tree

Showing 202 changed files with 809 additions and 621 deletions.
diff --git a/...ar/handlers/mqtt/MQTTProtocolHandler.java → ...lers/mqtt/broker/MQTTProtocolHandler.java b/...ar/handlers/mqtt/MQTTProtocolHandler.java → ...lers/mqtt/broker/MQTTProtocolHandler.java
@@ -11,24 +11,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.LISTENER_DEL;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.PLAINTEXT_PREFIX;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.PROTOCOL_NAME;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.SSL_PREFIX;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.SSL_PSK_PREFIX;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.WS_PLAINTEXT_PREFIX;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.WS_SSL_PREFIX;
-import static io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils.getListenerPort;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.LISTENER_DEL;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.PLAINTEXT_PREFIX;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.PROTOCOL_NAME;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.SSL_PREFIX;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.SSL_PSK_PREFIX;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.WS_PLAINTEXT_PREFIX;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.WS_SSL_PREFIX;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils.getListenerPort;
 import com.google.common.collect.ImmutableMap;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.util.concurrent.DefaultThreadFactory;
+import io.streamnative.pulsar.handlers.mqtt.MopVersion;
+import io.streamnative.pulsar.handlers.mqtt.broker.channel.MQTTChannelInitializer;
+import io.streamnative.pulsar.handlers.mqtt.common.utils.ConfigurationUtils;
 import io.streamnative.pulsar.handlers.mqtt.proxy.MQTTProxyConfiguration;
 import io.streamnative.pulsar.handlers.mqtt.proxy.MQTTProxyService;
-import io.streamnative.pulsar.handlers.mqtt.utils.ConfigurationUtils;
 import java.net.InetSocketAddress;
 import java.util.Map;
 import java.util.concurrent.Executors;
@@ -97,7 +99,7 @@ public void start(BrokerService brokerService) {
             try {
                 MQTTProxyConfiguration proxyConfig =
                         ConfigurationUtils.create(mqttConfig.getProperties(), MQTTProxyConfiguration.class);
-                proxyService = new MQTTProxyService(mqttService, proxyConfig);
+                proxyService = new MQTTProxyService(brokerService, proxyConfig);
                 proxyService.start();
                 log.info("Start MQTT proxy service at port: {}", proxyConfig.getMqttProxyPort());
             } catch (Exception ex) {

diff --git a/...andlers/mqtt/MQTTServerConfiguration.java → .../mqtt/broker/MQTTServerConfiguration.java b/...andlers/mqtt/MQTTServerConfiguration.java → .../mqtt/broker/MQTTServerConfiguration.java
@@ -11,8 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker;
 
+import io.streamnative.pulsar.handlers.mqtt.common.MQTTCommonConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.pulsar.common.configuration.FieldContext;

diff --git a/...ive/pulsar/handlers/mqtt/MQTTService.java → ...sar/handlers/mqtt/broker/MQTTService.java b/...ive/pulsar/handlers/mqtt/MQTTService.java → ...sar/handlers/mqtt/broker/MQTTService.java
@@ -11,20 +11,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
-
-import io.streamnative.pulsar.handlers.mqtt.support.MQTTMetricsCollector;
-import io.streamnative.pulsar.handlers.mqtt.support.MQTTMetricsProvider;
-import io.streamnative.pulsar.handlers.mqtt.support.QosPublishHandlersImpl;
-import io.streamnative.pulsar.handlers.mqtt.support.RetainedMessageHandler;
-import io.streamnative.pulsar.handlers.mqtt.support.WillMessageHandler;
-import io.streamnative.pulsar.handlers.mqtt.support.event.DisableEventCenter;
-import io.streamnative.pulsar.handlers.mqtt.support.event.PulsarEventCenter;
-import io.streamnative.pulsar.handlers.mqtt.support.event.PulsarEventCenterImpl;
-import io.streamnative.pulsar.handlers.mqtt.support.psk.PSKConfiguration;
-import io.streamnative.pulsar.handlers.mqtt.support.systemtopic.SystemEventService;
+package io.streamnative.pulsar.handlers.mqtt.broker;
+
+import io.streamnative.pulsar.handlers.mqtt.broker.impl.MQTTNamespaceBundleOwnershipListener;
+import io.streamnative.pulsar.handlers.mqtt.broker.impl.MQTTSubscriptionManager;
+import io.streamnative.pulsar.handlers.mqtt.broker.metric.MQTTMetricsCollector;
+import io.streamnative.pulsar.handlers.mqtt.broker.metric.MQTTMetricsProvider;
+import io.streamnative.pulsar.handlers.mqtt.broker.mqtt5.WillMessageHandler;
+import io.streamnative.pulsar.handlers.mqtt.broker.qos.QosPublishHandlers;
+import io.streamnative.pulsar.handlers.mqtt.broker.qos.QosPublishHandlersImpl;
+import io.streamnative.pulsar.handlers.mqtt.common.MQTTConnectionManager;
+import io.streamnative.pulsar.handlers.mqtt.common.authentication.MQTTAuthenticationService;
+import io.streamnative.pulsar.handlers.mqtt.common.event.DisableEventCenter;
+import io.streamnative.pulsar.handlers.mqtt.common.event.PulsarEventCenter;
+import io.streamnative.pulsar.handlers.mqtt.common.event.PulsarEventCenterImpl;
+import io.streamnative.pulsar.handlers.mqtt.common.mqtt5.RetainedMessageHandler;
+import io.streamnative.pulsar.handlers.mqtt.common.psk.PSKConfiguration;
+import io.streamnative.pulsar.handlers.mqtt.common.systemtopic.DisabledSystemEventService;
+import io.streamnative.pulsar.handlers.mqtt.common.systemtopic.SystemEventService;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.broker.PulsarService;
 import org.apache.pulsar.broker.authorization.AuthorizationService;
@@ -82,8 +87,7 @@ public class MQTTService {
     private final QosPublishHandlers qosPublishHandlers;
 
     @Getter
-    @Setter
-    private SystemEventService eventService;
+    private final SystemEventService eventService;
 
     public MQTTService(BrokerService brokerService, MQTTServerConfiguration serverConfiguration) {
         this.brokerService = brokerService;
@@ -107,21 +111,15 @@ public MQTTService(BrokerService brokerService, MQTTServerConfiguration serverCo
             this.eventCenter = new PulsarEventCenterImpl(brokerService,
                     serverConfiguration.getEventCenterCallbackPoolThreadNum());
         }
-        this.retainedMessageHandler = new RetainedMessageHandler(this);
+        this.eventService = new DisabledSystemEventService();
+        this.retainedMessageHandler = new RetainedMessageHandler(eventService);
         this.qosPublishHandlers = new QosPublishHandlersImpl(this);
         this.willMessageHandler = new WillMessageHandler(this);
     }
 
-    public boolean isSystemTopicEnabled() {
-        return eventService != null;
-    }
-
     public void close() {
         this.connectionManager.close();
         this.eventCenter.shutdown();
-        if (eventService != null) {
-            eventService.close();
-        }
         this.willMessageHandler.close();
     }
 }
diff --git a/...handlers/mqtt/MQTTChannelInitializer.java → ...roker/channel/MQTTChannelInitializer.java b/...handlers/mqtt/MQTTChannelInitializer.java → ...roker/channel/MQTTChannelInitializer.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.channel;
 
 import static org.apache.pulsar.client.impl.PulsarChannelInitializer.TLS_HANDLER;
 import io.netty.channel.ChannelInitializer;
@@ -24,11 +24,14 @@
 import io.netty.handler.codec.mqtt.MqttDecoder;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.timeout.IdleStateHandler;
-import io.streamnative.pulsar.handlers.mqtt.adapter.CombineAdapterHandler;
-import io.streamnative.pulsar.handlers.mqtt.adapter.MqttAdapterDecoder;
-import io.streamnative.pulsar.handlers.mqtt.adapter.MqttAdapterEncoder;
-import io.streamnative.pulsar.handlers.mqtt.codec.MqttWebSocketCodec;
-import io.streamnative.pulsar.handlers.mqtt.support.psk.PSKUtils;
+import io.streamnative.pulsar.handlers.mqtt.broker.MQTTServerConfiguration;
+import io.streamnative.pulsar.handlers.mqtt.broker.MQTTService;
+import io.streamnative.pulsar.handlers.mqtt.broker.codec.MqttWebSocketCodec;
+import io.streamnative.pulsar.handlers.mqtt.common.Constants;
+import io.streamnative.pulsar.handlers.mqtt.common.adapter.CombineAdapterHandler;
+import io.streamnative.pulsar.handlers.mqtt.common.adapter.MqttAdapterDecoder;
+import io.streamnative.pulsar.handlers.mqtt.common.adapter.MqttAdapterEncoder;
+import io.streamnative.pulsar.handlers.mqtt.common.psk.PSKUtils;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...sar/handlers/mqtt/MQTTInboundHandler.java → ...tt/broker/channel/MQTTInboundHandler.java b/...sar/handlers/mqtt/MQTTInboundHandler.java → ...tt/broker/channel/MQTTInboundHandler.java
@@ -11,10 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.channel;
 
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
+import io.streamnative.pulsar.handlers.mqtt.broker.MQTTService;
+import io.streamnative.pulsar.handlers.mqtt.common.MQTTCommonInboundHandler;
 import lombok.extern.slf4j.Slf4j;
 /**
  * MQTT in bound handler.

diff --git a/.../handlers/mqtt/support/MQTTServerCnx.java → ...rs/mqtt/broker/channel/MQTTServerCnx.java b/.../handlers/mqtt/support/MQTTServerCnx.java → ...rs/mqtt/broker/channel/MQTTServerCnx.java
@@ -11,9 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.support;
+package io.streamnative.pulsar.handlers.mqtt.broker.channel;
 
 import io.netty.channel.ChannelHandlerContext;
+import io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer.MQTTConsumer;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/channel/package-info.java b/...-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/channel/package-info.java
@@ -0,0 +1,18 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Package info.
+ */
+package io.streamnative.pulsar.handlers.mqtt.broker.channel;
diff --git a/...ndlers/mqtt/codec/MqttWebSocketCodec.java → ...mqtt/broker/codec/MqttWebSocketCodec.java b/...ndlers/mqtt/codec/MqttWebSocketCodec.java → ...mqtt/broker/codec/MqttWebSocketCodec.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.codec;
+package io.streamnative.pulsar.handlers.mqtt.broker.codec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;

diff --git a/...r/handlers/mqtt/adapter/package-info.java → ...dlers/mqtt/broker/codec/package-info.java b/...r/handlers/mqtt/adapter/package-info.java → ...dlers/mqtt/broker/codec/package-info.java
@@ -15,4 +15,4 @@
 /**
  * Package info.
  */
-package io.streamnative.pulsar.handlers.mqtt.adapter;
+package io.streamnative.pulsar.handlers.mqtt.broker.codec;
diff --git a/...MQTTNamespaceBundleOwnershipListener.java → ...MQTTNamespaceBundleOwnershipListener.java b/...MQTTNamespaceBundleOwnershipListener.java → ...MQTTNamespaceBundleOwnershipListener.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...andlers/mqtt/MQTTSubscriptionManager.java → .../broker/impl/MQTTSubscriptionManager.java b/...andlers/mqtt/MQTTSubscriptionManager.java → .../broker/impl/MQTTSubscriptionManager.java
@@ -11,9 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;
 
 import io.netty.handler.codec.mqtt.MqttTopicSubscription;
+import io.streamnative.pulsar.handlers.mqtt.common.TopicFilterImpl;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

diff --git a/...lers/mqtt/MQTTTopicOwnershipListener.java → ...oker/impl/MQTTTopicOwnershipListener.java b/...lers/mqtt/MQTTTopicOwnershipListener.java → ...oker/impl/MQTTTopicOwnershipListener.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;
 
 import java.util.function.Predicate;
 import org.apache.pulsar.common.naming.NamespaceName;

diff --git a/...lsar/handlers/mqtt/PacketIdGenerator.java → ...s/mqtt/broker/impl/PacketIdGenerator.java b/...lsar/handlers/mqtt/PacketIdGenerator.java → ...s/mqtt/broker/impl/PacketIdGenerator.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;
 
 /**
  * Packed ID generator.

diff --git a/...rs/mqtt/utils/PulsarMessageConverter.java → ...t/broker/impl/PulsarMessageConverter.java b/...rs/mqtt/utils/PulsarMessageConverter.java → ...t/broker/impl/PulsarMessageConverter.java
@@ -11,21 +11,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.utils;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static io.streamnative.pulsar.handlers.mqtt.Constants.MQTT_PROPERTIES;
-import static io.streamnative.pulsar.handlers.mqtt.Constants.MQTT_PROPERTIES_PREFIX;
+import static io.streamnative.pulsar.handlers.mqtt.common.Constants.MQTT_PROPERTIES;
+import static io.streamnative.pulsar.handlers.mqtt.common.Constants.MQTT_PROPERTIES_PREFIX;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.mqtt.MqttProperties;
 import io.netty.handler.codec.mqtt.MqttPublishMessage;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import io.netty.util.concurrent.FastThreadLocal;
-import io.streamnative.pulsar.handlers.mqtt.MQTTServerConfiguration;
-import io.streamnative.pulsar.handlers.mqtt.PacketIdGenerator;
-import io.streamnative.pulsar.handlers.mqtt.support.MessageBuilder;
+import io.streamnative.pulsar.handlers.mqtt.broker.MQTTServerConfiguration;
+import io.streamnative.pulsar.handlers.mqtt.common.utils.MessageBuilder;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;

diff --git a/...lsar/handlers/mqtt/TopicAliasManager.java → ...s/mqtt/broker/impl/TopicAliasManager.java b/...lsar/handlers/mqtt/TopicAliasManager.java → ...s/mqtt/broker/impl/TopicAliasManager.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;
 
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ndlers/mqtt/TopicSubscriptionManager.java → ...broker/impl/TopicSubscriptionManager.java b/...ndlers/mqtt/TopicSubscriptionManager.java → ...broker/impl/TopicSubscriptionManager.java
@@ -11,10 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;
 
 import com.google.common.collect.Maps;
-import io.streamnative.pulsar.handlers.mqtt.exception.MQTTNoSubscriptionExistedException;
+import io.streamnative.pulsar.handlers.mqtt.common.exception.MQTTNoSubscriptionExistedException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;

diff --git a/...r/handlers/mqtt/support/MQTTConsumer.java → ...tt/broker/impl/consumer/MQTTConsumer.java b/...r/handlers/mqtt/support/MQTTConsumer.java → ...tt/broker/impl/consumer/MQTTConsumer.java
@@ -11,22 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.support;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer;
 
-import static io.streamnative.pulsar.handlers.mqtt.utils.MqttMessageUtils.getMessageExpiryInterval;
+import static io.streamnative.pulsar.handlers.mqtt.common.utils.MqttMessageUtils.getMessageExpiryInterval;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.mqtt.MqttPublishMessage;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import io.netty.util.concurrent.Future;
-import io.streamnative.pulsar.handlers.mqtt.Connection;
-import io.streamnative.pulsar.handlers.mqtt.OutstandingPacket;
-import io.streamnative.pulsar.handlers.mqtt.OutstandingPacketContainer;
-import io.streamnative.pulsar.handlers.mqtt.PacketIdGenerator;
-import io.streamnative.pulsar.handlers.mqtt.adapter.MqttAdapterMessage;
-import io.streamnative.pulsar.handlers.mqtt.restrictions.ClientRestrictions;
-import io.streamnative.pulsar.handlers.mqtt.utils.PulsarMessageConverter;
-import io.streamnative.pulsar.handlers.mqtt.utils.PulsarTopicUtils;
+import io.streamnative.pulsar.handlers.mqtt.broker.channel.MQTTServerCnx;
+import io.streamnative.pulsar.handlers.mqtt.broker.impl.PacketIdGenerator;
+import io.streamnative.pulsar.handlers.mqtt.broker.impl.PulsarMessageConverter;
+import io.streamnative.pulsar.handlers.mqtt.broker.metric.MQTTMetricsCollector;
+import io.streamnative.pulsar.handlers.mqtt.common.Connection;
+import io.streamnative.pulsar.handlers.mqtt.common.adapter.MqttAdapterMessage;
+import io.streamnative.pulsar.handlers.mqtt.common.mqtt5.restrictions.ClientRestrictions;
+import io.streamnative.pulsar.handlers.mqtt.common.utils.PulsarTopicUtils;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;

diff --git a/...ers/mqtt/utils/MessagePublishContext.java → .../impl/consumer/MessagePublishContext.java b/...ers/mqtt/utils/MessagePublishContext.java → .../impl/consumer/MessagePublishContext.java
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.utils;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer;
 
-import static io.streamnative.pulsar.handlers.mqtt.utils.PulsarMessageConverter.messageToByteBuf;
+import static io.streamnative.pulsar.handlers.mqtt.broker.impl.PulsarMessageConverter.messageToByteBuf;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.Recycler;
 import io.netty.util.Recycler.Handle;

diff --git a/...lsar/handlers/mqtt/OutstandingPacket.java → ...oker/impl/consumer/OutstandingPacket.java b/...lsar/handlers/mqtt/OutstandingPacket.java → ...oker/impl/consumer/OutstandingPacket.java
@@ -11,9 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer;
 
-import io.streamnative.pulsar.handlers.mqtt.support.MQTTConsumer;
 import java.util.Objects;
 import lombok.Getter;
 

diff --git a/...lers/mqtt/OutstandingPacketContainer.java → .../consumer/OutstandingPacketContainer.java b/...lers/mqtt/OutstandingPacketContainer.java → .../consumer/OutstandingPacketContainer.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer;
 
 /**
  * Outstanding packet container.

diff --git a/...pport/OutstandingPacketContainerImpl.java → ...sumer/OutstandingPacketContainerImpl.java b/...pport/OutstandingPacketContainerImpl.java → ...sumer/OutstandingPacketContainerImpl.java
@@ -11,10 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.support;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer;
 
-import io.streamnative.pulsar.handlers.mqtt.OutstandingPacket;
-import io.streamnative.pulsar.handlers.mqtt.OutstandingPacketContainer;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**

diff --git a/...qtt/support/systemtopic/package-info.java → ...tt/broker/impl/consumer/package-info.java b/...qtt/support/systemtopic/package-info.java → ...tt/broker/impl/consumer/package-info.java
@@ -11,4 +11,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.support.systemtopic;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer;
diff --git a/...ndlers/mqtt/support/psk/package-info.java → ...ndlers/mqtt/broker/impl/package-info.java b/...ndlers/mqtt/support/psk/package-info.java → ...ndlers/mqtt/broker/impl/package-info.java
@@ -11,4 +11,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.streamnative.pulsar.handlers.mqtt.support.psk;
+package io.streamnative.pulsar.handlers.mqtt.broker.impl;