cleanup

Author: JavaSaBr

application/src/main/java/javasabr/mqtt/broker/application/config/MqttBrokerConfig.java

@@ -1,33 +1,12 @@
 package javasabr.mqtt.broker.application.config;
 
 import javasabr.mqtt.network.handler.MqttClientReleaseHandler;
-import javasabr.mqtt.network.handler.PacketInHandler;
-import javasabr.mqtt.network.handler.PublishInHandler;
-import javasabr.mqtt.network.packet.MqttPacketType;
 import javasabr.mqtt.service.AuthenticationService;
 import javasabr.mqtt.service.ClientIdRegistry;
 import javasabr.mqtt.service.CredentialSource;
 import javasabr.mqtt.service.MqttSessionService;
-import javasabr.mqtt.service.PublishingService;
 import javasabr.mqtt.service.SubscriptionService;
 import javasabr.mqtt.service.handler.client.ExternalMqttClientReleaseHandler;
-import javasabr.mqtt.service.handler.in.ConnectInPacketHandler;
-import javasabr.mqtt.service.handler.in.DisconnetInPacketHandler;
-import javasabr.mqtt.service.handler.in.PublishAckInPacketHandler;
-import javasabr.mqtt.service.handler.in.PublishCompleteInPacketHandler;
-import javasabr.mqtt.service.handler.in.PublishInPacketHandler;
-import javasabr.mqtt.service.handler.in.PublishReceiveInPacketHandler;
-import javasabr.mqtt.service.handler.in.PublishReleaseInPacketHandler;
-import javasabr.mqtt.service.handler.in.SubscribeInPacketHandler;
-import javasabr.mqtt.service.handler.in.UnsubscribeInPacketHandler;
-import javasabr.mqtt.service.handler.publish.in.Qos0PublishInHandler;
-import javasabr.mqtt.service.handler.publish.in.Qos1PublishInHandler;
-import javasabr.mqtt.service.handler.publish.in.Qos2PublishInHandler;
-import javasabr.mqtt.service.handler.publish.out.PublishOutHandler;
-import javasabr.mqtt.service.handler.publish.out.Qos0PublishOutHandler;
-import javasabr.mqtt.service.handler.publish.out.Qos1PublishOutHandler;
-import javasabr.mqtt.service.handler.publish.out.Qos2PublishOutHandler;
-import javasabr.mqtt.service.impl.DefaultPublishingService;
 import javasabr.mqtt.service.impl.FileCredentialsSource;
 import javasabr.mqtt.service.impl.InMemoryClientIdRegistry;
 import javasabr.mqtt.service.impl.InMemoryMqttSessionService;
@@ -72,32 +51,6 @@ AuthenticationService authenticationService(CredentialSource credentialSource) {
         env.getProperty("authentication.allow.anonymous", boolean.class, false));
   }
 
-  @Bean
-  PacketInHandler[] packetHandlers(
-      AuthenticationService authenticationService,
-      ClientIdRegistry clientIdRegistry,
-      SubscriptionService subscriptionService,
-      PublishingService publishingService,
-      MqttSessionService mqttSessionService) {
-
-    var handlers = new PacketInHandler[MqttPacketType.INVALID.ordinal()];
-    handlers[MqttPacketType.CONNECT.ordinal()] = new ConnectInPacketHandler(
-        clientIdRegistry,
-        authenticationService,
-        mqttSessionService,
-        subscriptionService);
-    handlers[MqttPacketType.SUBSCRIBE.ordinal()] = new SubscribeInPacketHandler(subscriptionService);
-    handlers[MqttPacketType.UNSUBSCRIBE.ordinal()] = new UnsubscribeInPacketHandler(subscriptionService);
-    handlers[MqttPacketType.PUBLISH.ordinal()] = new PublishInPacketHandler(publishingService);
-    handlers[MqttPacketType.DISCONNECT.ordinal()] = new DisconnetInPacketHandler();
-    handlers[MqttPacketType.PUBLISH_ACK.ordinal()] = new PublishAckInPacketHandler();
-    handlers[MqttPacketType.PUBLISH_RECEIVED.ordinal()] = new PublishReceiveInPacketHandler();
-    handlers[MqttPacketType.PUBLISH_RELEASED.ordinal()] = new PublishReleaseInPacketHandler();
-    handlers[MqttPacketType.PUBLISH_COMPLETED.ordinal()] = new PublishCompleteInPacketHandler();
-
-    return handlers;
-  }
-
   @Bean
   MqttClientReleaseHandler mqttClientReleaseHandler(
       ClientIdRegistry clientIdRegistry,
@@ -110,29 +63,4 @@ MqttClientReleaseHandler mqttClientReleaseHandler(
   SubscriptionService subscriptionService() {
     return new SimpleSubscriptionService();
   }
-
-  @Bean
-  PublishOutHandler[] publishOutHandlers() {
-    return new PublishOutHandler[]{
-        new Qos0PublishOutHandler(),
-        new Qos1PublishOutHandler(),
-        new Qos2PublishOutHandler()
-    };
-  }
-
-  @Bean
-  PublishInHandler[] publishInHandlers(
-      SubscriptionService subscriptionService,
-      PublishOutHandler[] publishOutHandlers) {
-    return new PublishInHandler[]{
-        new Qos0PublishInHandler(subscriptionService, publishOutHandlers),
-        new Qos1PublishInHandler(subscriptionService, publishOutHandlers),
-        new Qos2PublishInHandler(subscriptionService, publishOutHandlers)
-    };
-  }
-
-  @Bean
-  PublishingService publishingService(PublishInHandler[] publishInHandlers) {
-    return new DefaultPublishingService(publishInHandlers);
-  }
 }

application/src/main/java/javasabr/mqtt/broker/application/config/MqttBrokerSpringConfig.java

@@ -9,22 +9,19 @@
 import javasabr.mqtt.network.MqttConnection;
 import javasabr.mqtt.network.MqttConnectionFactory;
 import javasabr.mqtt.network.handler.MqttClientReleaseHandler;
-import javasabr.mqtt.network.handler.PublishInHandler;
 import javasabr.mqtt.service.AuthenticationService;
 import javasabr.mqtt.service.ClientIdRegistry;
 import javasabr.mqtt.service.ConnectionService;
 import javasabr.mqtt.service.CredentialSource;
 import javasabr.mqtt.service.MqttSessionService;
 import javasabr.mqtt.service.PublishDeliveringService;
 import javasabr.mqtt.service.PublishReceivingService;
-import javasabr.mqtt.service.PublishingService;
 import javasabr.mqtt.service.SubscriptionService;
 import javasabr.mqtt.service.handler.client.ExternalMqttClientReleaseHandler;
 import javasabr.mqtt.service.impl.DefaultConnectionService;
 import javasabr.mqtt.service.impl.DefaultMqttConnectionFactory;
 import javasabr.mqtt.service.impl.DefaultPublishDeliveringService;
 import javasabr.mqtt.service.impl.DefaultPublishReceivingService;
-import javasabr.mqtt.service.impl.DefaultPublishingService;
 import javasabr.mqtt.service.impl.ExternalMqttClientFactory;
 import javasabr.mqtt.service.impl.FileCredentialsSource;
 import javasabr.mqtt.service.impl.InMemoryClientIdRegistry;
@@ -97,11 +94,6 @@ SubscriptionService subscriptionService() {
     return new SimpleSubscriptionService();
   }
 
-  @Bean
-  PublishingService publishingService() {
-    return new DefaultPublishingService(new PublishInHandler[0]);
-  }
-
   @Bean
   MqttInMessageHandler connectInMqttInMessageHandler(
       ClientIdRegistry clientIdRegistry,
@@ -126,8 +118,8 @@ MqttInMessageHandler publishCompleteMqttInMessageHandler() {
   }
 
   @Bean
-  MqttInMessageHandler publishMqttInMessageHandler(PublishingService publishingService) {
-    return new PublishMqttInMessageHandler(publishingService);
+  MqttInMessageHandler publishMqttInMessageHandler(PublishReceivingService publishReceivingService) {
+    return new PublishMqttInMessageHandler(publishReceivingService);
   }
 
   @Bean

network/src/main/java/javasabr/mqtt/network/handler/PublishInHandler.java

@@ -59,7 +59,7 @@ protected boolean isPropertiesSupported(MqttConnection connection) {
   protected void writeVariableHeader(MqttConnection connection, ByteBuffer buffer) {
     super.writeVariableHeader(connection, buffer);
     // https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901123
-    writeByte(buffer, reasonCode.getValue());
+    writeByte(buffer, reasonCode.value());
   }
 
   @Override

network/src/main/java/javasabr/mqtt/network/packet/out/PublishAck5OutPacket.java

@@ -65,7 +65,7 @@ protected void writeVariableHeader(MqttConnection connection, ByteBuffer buffer)
     super.writeVariableHeader(connection, buffer);
 
     // https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901143
-    writeByte(buffer, reasonCode.getValue());
+    writeByte(buffer, reasonCode.value());
   }
 
   @Override