continue updating subscription service

Author: JavaSaBr

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

@@ -270,7 +270,7 @@ MqttClientReleaseHandler externalMqttClientReleaseHandler(
   @Bean
   MqttServerConnectionConfig externalConnectionConfig(Environment env) {
     return new MqttServerConnectionConfig(
-        QoS.of(env.getProperty("mqtt.connection.max.qos", int.class, 2)),
+        QoS.ofCode(env.getProperty("mqtt.connection.max.qos", int.class, 2)),
         env.getProperty(
             "mqtt.external.connection.max.packet.size",
             int.class,

application/src/test/groovy/javasabr/mqtt/broker/application/service/SubscribtionServiceTest.groovy

@@ -3,7 +3,7 @@ package javasabr.mqtt.broker.application.service
 import com.hivemq.client.mqtt.datatypes.MqttQos
 import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException
 import javasabr.mqtt.broker.application.IntegrationSpecification
-import javasabr.mqtt.model.ActionResult
+
 import javasabr.mqtt.model.subscriber.SingleSubscriber
 import javasabr.mqtt.service.ClientIdRegistry
 import javasabr.mqtt.service.impl.InMemorySubscriptionService
@@ -13,10 +13,6 @@ import spock.lang.Unroll
 
 import java.util.concurrent.CompletionException
 
-import static com.hivemq.client.mqtt.datatypes.MqttQos.*
-import static javasabr.mqtt.model.util.TopicUtils.buildTopicName
-import static org.spockframework.util.Pair.of
-
 class SubscribtionServiceTest extends IntegrationSpecification {
 
   @Autowired

model/src/main/java/javasabr/mqtt/model/ActionResult.java

@@ -19,14 +19,14 @@ public enum QoS {
 
   private static final QoS[] VALUES = values();
 
-  public static QoS of(int level) {
+  public static QoS ofCode(int level) {
     if (level < 0 || level > EXACTLY_ONCE.ordinal()) {
       return INVALID;
     } else {
       return VALUES[level];
     }
   }
 
-  int index;
+  int level;
   SubscribeAckReasonCode subscribeAckReasonCode;
 }

model/src/main/java/javasabr/mqtt/model/MqttUser.java

@@ -1,6 +1,6 @@
 package javasabr.mqtt.model;
 
-public interface HasMessageId {
+public interface TrackableMessage {
 
   int messageId();
 }

model/src/main/java/javasabr/mqtt/model/QoS.java

@@ -3,8 +3,8 @@
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
-public class MalformedMqttProtocolException extends MqttException {
-  public MalformedMqttProtocolException(String message) {
+public class MalformedProtocolMqttException extends MqttException {
+  public MalformedProtocolMqttException(String message) {
     super(message);
   }
 }

model/src/main/java/javasabr/mqtt/model/HasMessageId.java renamed to model/src/main/java/javasabr/mqtt/model/TrackableMessage.java

@@ -1,6 +1,6 @@
 package javasabr.mqtt.model.publishing;
 
-import javasabr.mqtt.model.HasMessageId;
+import javasabr.mqtt.model.TrackableMessage;
 import javasabr.mqtt.model.PayloadFormat;
 import javasabr.mqtt.model.QoS;
 import javasabr.mqtt.model.data.type.StringPair;
@@ -22,7 +22,7 @@ public record Publish(
     long messageExpiryInterval,
     int topicAlias,
     PayloadFormat payloadFormat,
-    Array<StringPair> userProperties) implements HasMessageId {
+    Array<StringPair> userProperties) implements TrackableMessage {
 
   public Publish withDuplicated() {
     if (duplicated) {

model/src/main/java/javasabr/mqtt/model/exception/MalformedMqttProtocolException.java renamed to model/src/main/java/javasabr/mqtt/model/exception/MalformedProtocolMqttException.java

@@ -19,6 +19,6 @@ public QoS qos() {
   @JsonValue
   @Override
   public String toString() {
-    return "[" + owner + "]->[" + subscription.topicFilter().rawTopic() + "|" + subscription.qos().index() + "]";
+    return "[" + owner + "]->[" + subscription.topicFilter().rawTopic() + "|" + subscription.qos().level() + "]";
   }
 }

model/src/main/java/javasabr/mqtt/model/publishing/Publish.java

@@ -3,11 +3,11 @@
 import javasabr.mqtt.model.QoS;
 import javasabr.mqtt.model.SubscribeRetainHandling;
 
-public record RequestedRawSubscription(
+public record RequestedSubscription(
     /*
       The subscriber's topic filter.
      */
-    String topicFilter,
+    String rawTopicFilter,
     /*
       Maximum QoS field. This gives the maximum QoS level at which the Server can send Application Messages to the
       Client.