upgrading for new rlib

Author: JavaSaBr

build.gradle

@@ -26,7 +26,6 @@ allprojects {
   repositories {
     mavenCentral()
     mavenLocal()
-    maven { url "https://dl.bintray.com/javasabr/maven" }
   }
 
   dependencies {

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # https://gitlab.com/JavaSaBr/maven-repo/-/packages
-rlib = "9.10.0"
+rlib = "10.0.alpha"
 # https://mvnrepository.com/artifact/org.jetbrains/annotations
 jetbrains-annotations = "26.0.2"
 # https://mvnrepository.com/artifact/org.projectlombok/lombok
@@ -34,9 +34,10 @@ hivemq-mqtt-client = "1.3.7"
 # https://mvnrepository.com/artifact/io.moquette/moquette-broker
 moquette-broker = "0.17"
 
+
 [libraries]
-rlib-network = { module = "javasabr:rlib-network", version.ref = "rlib" }
-rlib-logger-slf4j = { module = "javasabr:rlib-logger-slf4j", version.ref = "rlib" }
+rlib-network = { module = "javasabr.rlib:rlib-network", version.ref = "rlib" }
+rlib-logger-slf4j = { module = "javasabr.rlib:rlib-logger-slf4j", version.ref = "rlib" }
 springboot-starter-core = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot" }
 springboot-starter-log4j2 = { module = "org.springframework.boot:spring-boot-starter-log4j2", version.ref = "springboot" }
 project-reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "project-reactor" }
@@ -48,7 +49,7 @@ lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
 
 spring-test = { module = "org.springframework:spring-test", version.ref = "spring" }
 spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
-spock-spring = { module = "org.spockframework:spock-core", version.ref = "spock" }
+spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spock" }
 groovy-all = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
 byte-buddy-dep = { module = "net.bytebuddy:byte-buddy-dep", version.ref = "byte-buddy" }
 objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" }

src/main/java/com/ss/mqtt/broker/config/MqttConnectionConfig.java

@@ -11,7 +11,7 @@
 @RequiredArgsConstructor
 public class MqttConnectionConfig {
 
-    private final @NotNull QoS maxQos;
+    private final QoS maxQos;
 
     private final int maximumPacketSize;
     private final int minKeepAliveTime;

src/main/java/com/ss/mqtt/broker/config/MqttNetworkConfig.java

@@ -8,16 +8,15 @@
 import com.ss.mqtt.broker.network.client.ExternalMqttClient;
 import com.ss.mqtt.broker.network.client.InternalMqttClient;
 import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
-import com.ss.rlib.network.BufferAllocator;
-import com.ss.rlib.network.Network;
-import com.ss.rlib.network.NetworkFactory;
-import com.ss.rlib.network.ServerNetworkConfig;
-import com.ss.rlib.network.ServerNetworkConfig.SimpleServerNetworkConfig;
-import com.ss.rlib.network.impl.DefaultBufferAllocator;
-import com.ss.rlib.network.server.ServerNetwork;
+import javasabr.rlib.network.BufferAllocator;
+import javasabr.rlib.network.Network;
+import javasabr.rlib.network.NetworkFactory;
+import javasabr.rlib.network.ServerNetworkConfig;
+import javasabr.rlib.network.ServerNetworkConfig.SimpleServerNetworkConfig;
+import javasabr.rlib.network.impl.DefaultBufferAllocator;
+import javasabr.rlib.network.server.ServerNetwork;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -38,8 +37,9 @@ private interface ChannelFactory extends
     private final Environment env;
 
     @Bean
-    @NotNull ServerNetworkConfig internalNetworkConfig() {
-        return SimpleServerNetworkConfig.builder()
+    ServerNetworkConfig internalNetworkConfig() {
+        return SimpleServerNetworkConfig
+            .builder()
             .readBufferSize(env.getProperty("mqtt.internal.network.read.buffer.size", int.class, 2048))
             .pendingBufferSize(env.getProperty("mqtt.internal.network.pending.buffer.size", int.class, 4096))
             .writeBufferSize(env.getProperty("mqtt.internal.network.write.buffer.size", int.class, 2048))
@@ -49,8 +49,9 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull ServerNetworkConfig externalNetworkConfig() {
-        return SimpleServerNetworkConfig.builder()
+    ServerNetworkConfig externalNetworkConfig() {
+        return SimpleServerNetworkConfig
+            .builder()
             .readBufferSize(env.getProperty("mqtt.external.network.read.buffer.size", int.class, 100))
             .pendingBufferSize(env.getProperty("mqtt.external.network.pending.buffer.size", int.class, 200))
             .writeBufferSize(env.getProperty("mqtt.external.network.write.buffer.size", int.class, 100))
@@ -60,22 +61,22 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull BufferAllocator internalBufferAllocator(@NotNull ServerNetworkConfig internalNetworkConfig) {
+    BufferAllocator internalBufferAllocator(ServerNetworkConfig internalNetworkConfig) {
         return new DefaultBufferAllocator(internalNetworkConfig);
     }
 
     @Bean
-    @NotNull BufferAllocator externalBufferAllocator(@NotNull ServerNetworkConfig externalNetworkConfig) {
+    BufferAllocator externalBufferAllocator(ServerNetworkConfig externalNetworkConfig) {
         return new DefaultBufferAllocator(externalNetworkConfig);
     }
 
     @Bean
-    @NotNull ServerNetwork<@NotNull MqttConnection> externalNetwork(
-        @NotNull ServerNetworkConfig externalNetworkConfig,
-        @NotNull BufferAllocator externalBufferAllocator,
-        @NotNull MqttConnectionConfig externalConnectionConfig,
-        PacketInHandler @NotNull [] packetHandlers,
-        @NotNull MqttClientReleaseHandler mqttClientReleaseHandler
+    ServerNetwork<MqttConnection> externalNetwork(
+        ServerNetworkConfig externalNetworkConfig,
+        BufferAllocator externalBufferAllocator,
+        MqttConnectionConfig externalConnectionConfig,
+        PacketInHandler[] packetHandlers,
+        MqttClientReleaseHandler mqttClientReleaseHandler
     ) {
         return NetworkFactory.newServerNetwork(
             externalNetworkConfig,
@@ -89,12 +90,12 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull ServerNetwork<@NotNull MqttConnection> internalNetwork(
-        @NotNull ServerNetworkConfig internalNetworkConfig,
-        @NotNull BufferAllocator internalBufferAllocator,
-        @NotNull MqttConnectionConfig internalConnectionConfig,
-        PacketInHandler @NotNull [] packetHandlers,
-        @NotNull MqttClientReleaseHandler mqttClientReleaseHandler
+    ServerNetwork<MqttConnection> internalNetwork(
+        ServerNetworkConfig internalNetworkConfig,
+        BufferAllocator internalBufferAllocator,
+        MqttConnectionConfig internalConnectionConfig,
+        PacketInHandler[] packetHandlers,
+        MqttClientReleaseHandler mqttClientReleaseHandler
     ) {
         return NetworkFactory.newServerNetwork(
             internalNetworkConfig,
@@ -108,9 +109,9 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull InetSocketAddress externalNetworkAddress(
-        @NotNull ServerNetwork<@NotNull MqttConnection> externalNetwork,
-        @NotNull Consumer<@NotNull MqttConnection> externalConnectionConsumer
+    InetSocketAddress externalNetworkAddress(
+        ServerNetwork<MqttConnection> externalNetwork,
+        Consumer<MqttConnection> externalConnectionConsumer
     ) {
 
         var address = new InetSocketAddress(
@@ -125,9 +126,9 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull InetSocketAddress internalNetworkAddress(
-        @NotNull ServerNetwork<@NotNull MqttConnection> internalNetwork,
-        @NotNull Consumer<@NotNull MqttConnection> internalConnectionConsumer
+     InetSocketAddress internalNetworkAddress(
+        ServerNetwork<MqttConnection> internalNetwork,
+        Consumer<MqttConnection> internalConnectionConsumer
     ) {
 
         var address = new InetSocketAddress(
@@ -142,7 +143,7 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull Consumer<@NotNull MqttConnection> externalConnectionConsumer() {
+    Consumer<MqttConnection> externalConnectionConsumer() {
         return mqttConnection -> {
             log.info("Accepted external connection: {}", mqttConnection);
             var client = (UnsafeMqttClient) mqttConnection.getClient();
@@ -151,7 +152,7 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull Consumer<@NotNull MqttConnection> internalConnectionConsumer() {
+    Consumer<MqttConnection> internalConnectionConsumer() {
         return mqttConnection -> {
             log.info("Accepted internal connection: {}", mqttConnection);
             var client = (UnsafeMqttClient) mqttConnection.getClient();
@@ -160,7 +161,7 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull MqttConnectionConfig externalConnectionConfig() {
+    MqttConnectionConfig externalConnectionConfig() {
         return new MqttConnectionConfig(
             QoS.of(env.getProperty("mqtt.connection.max.qos", int.class, 2)),
             env.getProperty(
@@ -222,7 +223,7 @@ private interface ChannelFactory extends
     }
 
     @Bean
-    @NotNull MqttConnectionConfig internalConnectionConfig() {
+    MqttConnectionConfig internalConnectionConfig() {
         return new MqttConnectionConfig(
             QoS.of(env.getProperty("mqtt.internal.connection.max.qos", int.class, 2)),
             env.getProperty(
@@ -283,11 +284,11 @@ private interface ChannelFactory extends
         );
     }
 
-    private @NotNull ChannelFactory externalConnectionFactory(
-        @NotNull BufferAllocator bufferAllocator,
-        @NotNull MqttConnectionConfig connectionConfig,
-        PacketInHandler @NotNull [] packetHandlers,
-        @NotNull MqttClientReleaseHandler releaseHandler
+    private ChannelFactory externalConnectionFactory(
+        BufferAllocator bufferAllocator,
+        MqttConnectionConfig connectionConfig,
+        PacketInHandler[] packetHandlers,
+        MqttClientReleaseHandler releaseHandler
     ) {
         return connectionFactory(
             bufferAllocator,
@@ -298,11 +299,11 @@ private interface ChannelFactory extends
         );
     }
 
-    private @NotNull ChannelFactory internalConnectionFactory(
-        @NotNull BufferAllocator bufferAllocator,
-        @NotNull MqttConnectionConfig connectionConfig,
-        PacketInHandler @NotNull [] packetHandlers,
-        @NotNull MqttClientReleaseHandler releaseHandler
+    private ChannelFactory internalConnectionFactory(
+        BufferAllocator bufferAllocator,
+        MqttConnectionConfig connectionConfig,
+        PacketInHandler[] packetHandlers,
+        MqttClientReleaseHandler releaseHandler
     ) {
         return connectionFactory(
             bufferAllocator,
@@ -313,12 +314,12 @@ private interface ChannelFactory extends
         );
     }
 
-    private @NotNull ChannelFactory connectionFactory(
-        @NotNull BufferAllocator bufferAllocator,
-        @NotNull MqttConnectionConfig connectionConfig,
-        PacketInHandler @NotNull [] packetHandlers,
-        @NotNull MqttClientReleaseHandler releaseHandler,
-        @NotNull BiFunction<MqttConnection, MqttClientReleaseHandler, UnsafeMqttClient> clientFactory
+    private ChannelFactory connectionFactory(
+        BufferAllocator bufferAllocator,
+        MqttConnectionConfig connectionConfig,
+        PacketInHandler[] packetHandlers,
+        MqttClientReleaseHandler releaseHandler,
+        BiFunction<MqttConnection, MqttClientReleaseHandler, UnsafeMqttClient> clientFactory
     ) {
         return (network, channel) -> new MqttConnection(
             network,

src/main/java/com/ss/mqtt/broker/config/package-info.java

@@ -0,0 +1,4 @@
+@NullMarked
+package com.ss.mqtt.broker.config;
+
+import org.jspecify.annotations.NullMarked;

src/main/java/com/ss/mqtt/broker/exception/ConnectionRejectException.java

@@ -2,17 +2,16 @@
 
 import com.ss.mqtt.broker.model.reason.code.ConnectAckReasonCode;
 import lombok.Getter;
-import org.jetbrains.annotations.NotNull;
 
 public class ConnectionRejectException extends MqttException {
 
-    private final @Getter @NotNull ConnectAckReasonCode reasonCode;
+    private final @Getter ConnectAckReasonCode reasonCode;
 
-    public ConnectionRejectException(@NotNull ConnectAckReasonCode reasonCode) {
+    public ConnectionRejectException(ConnectAckReasonCode reasonCode) {
         this.reasonCode = reasonCode;
     }
 
-    public ConnectionRejectException(@NotNull Throwable cause, @NotNull ConnectAckReasonCode reasonCode) {
+    public ConnectionRejectException(Throwable cause, ConnectAckReasonCode reasonCode) {
         super(cause);
         this.reasonCode = reasonCode;
     }

src/main/java/com/ss/mqtt/broker/exception/CredentialsSourceException.java

@@ -1,14 +1,12 @@
 package com.ss.mqtt.broker.exception;
 
-import org.jetbrains.annotations.NotNull;
-
 public class CredentialsSourceException extends RuntimeException {
 
-    public CredentialsSourceException(@NotNull String message) {
+    public CredentialsSourceException(String message) {
         super(message);
     }
 
-    public CredentialsSourceException(@NotNull Throwable cause) {
+    public CredentialsSourceException(Throwable cause) {
         super(cause);
     }
 }

src/main/java/com/ss/mqtt/broker/exception/InconsistentSubscriptionStateException.java

@@ -1,14 +1,12 @@
 package com.ss.mqtt.broker.exception;
 
-import org.jetbrains.annotations.NotNull;
-
 public class InconsistentSubscriptionStateException extends RuntimeException {
 
-    public InconsistentSubscriptionStateException(@NotNull String message) {
+    public InconsistentSubscriptionStateException(String message) {
         super(message);
     }
 
-    public InconsistentSubscriptionStateException(@NotNull Throwable cause) {
+    public InconsistentSubscriptionStateException(Throwable cause) {
         super(cause);
     }
 }

src/main/java/com/ss/mqtt/broker/exception/MqttException.java

@@ -1,17 +1,15 @@
 package com.ss.mqtt.broker.exception;
 
-import org.jetbrains.annotations.NotNull;
-
 public class MqttException extends RuntimeException {
 
     public MqttException() {
     }
 
-    public MqttException(@NotNull String message) {
+    public MqttException(String message) {
         super(message);
     }
 
-    public MqttException(@NotNull Throwable cause) {
+    public MqttException(Throwable cause) {
         super(cause);
     }
 }

src/main/java/com/ss/mqtt/broker/exception/package-info.java

@@ -0,0 +1,4 @@
+@NullMarked
+package com.ss.mqtt.broker.exception;
+
+import org.jspecify.annotations.NullMarked;