[broker-25] small refactoring

Author: JavaSaBr

src/main/java/com/ss/mqtt/broker/MqttBrokerApplication.java

@@ -2,13 +2,11 @@
 
 import com.ss.mqtt.broker.config.MqttBrokerConfig;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-@Log4j2
 @Configuration
 @RequiredArgsConstructor
 @Import(MqttBrokerConfig.class)

src/main/java/com/ss/mqtt/broker/handler/client/AbstractMqttClientReleaseHandler.java

@@ -25,7 +25,7 @@ public abstract class AbstractMqttClientReleaseHandler<T extends AbstractMqttCli
         var clientId = client.getClientId();
         //noinspection unchecked
         return releaseImpl((T) client)
-            .doOnNext(aVoid -> log.info("Client {} was released.", clientId));
+            .doOnNext(aVoid -> log.info("Client {} was released", clientId));
     }
 
     protected @NotNull Mono<?> releaseImpl(@NotNull T client) {
@@ -34,7 +34,7 @@ public abstract class AbstractMqttClientReleaseHandler<T extends AbstractMqttCli
         client.setClientId(StringUtils.EMPTY);
 
         if (StringUtils.isEmpty(clientId)) {
-            log.warn("This client {} is already released.", client);
+            log.warn("This client {} is already released", client);
             return Mono.empty();
         }
 

src/main/java/com/ss/mqtt/broker/model/topic/AbstractTopic.java

@@ -53,7 +53,7 @@ int levelsCount() {
     }
 
     @Override
-    public String toString() {
+    public @NotNull String toString() {
         return rawTopic;
     }
 }

src/main/java/com/ss/mqtt/broker/service/impl/InMemoryMqttSessionService.java

@@ -41,6 +41,7 @@ public InMemoryMqttSessionService(int cleanInterval) {
         var session = storedSession.getInWriteLock(clientId, ObjectDictionary::remove);
 
         if (session != null) {
+            session.onRestored();
             log.debug("Restored session for client {}", clientId);
         } else {
             log.debug("No stored session for client {}", clientId);
@@ -72,6 +73,7 @@ public InMemoryMqttSessionService(int cleanInterval) {
 
         var unsafe = (UnsafeMqttSession) session;
         unsafe.setExpirationTime(System.currentTimeMillis() + (expiryInterval * 1000));
+        unsafe.onPersisted();
 
         storedSession.runInWriteLock(clientId, unsafe, ObjectDictionary::put);