diff --git a/README.md b/README.md index ad8a3a9c..7c7d77cd 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ repositories { } ext { - rlibVersion = "10.0.alpha4" + rlibVersion = "10.0.alpha5" } dependencies { diff --git a/build.gradle b/build.gradle index def2e707..1ce0de42 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -rootProject.version = "10.0.alpha4" +rootProject.version = "10.0.alpha5" group = 'javasabr.rlib' allprojects { diff --git a/rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java index ac62fb51..9d80939e 100644 --- a/rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java @@ -11,7 +11,6 @@ import javasabr.rlib.common.function.NotNullSafeBiConsumer; import javasabr.rlib.common.function.NotNullSafeBiFunction; import javasabr.rlib.common.function.NotNullSafeConsumer; -import javasabr.rlib.common.function.NotNullSafeFactory; import javasabr.rlib.common.function.NotNullSafeFunction; import javasabr.rlib.common.function.NotNullSafeSupplier; import javasabr.rlib.common.function.NotNullSafeTriFunction; diff --git a/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java index dae4343e..c439a8a0 100644 --- a/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java @@ -181,7 +181,11 @@ default void info(@NonNull String message) { print(LoggerLevel.INFO, message); } - default void info(T arg1, @NonNull N1Factory factory) { + default void info(int arg1, @NonNull IntFactory factory) { + print(LoggerLevel.INFO, arg1, factory); + } + + default void info(A arg1, @NonNull N1Factory factory) { print(LoggerLevel.INFO, arg1, factory); } @@ -189,6 +193,10 @@ default void info(A arg1, B arg2, @NonNull N2Factory factory) { print(LoggerLevel.INFO, arg1, arg2, factory); } + default void info(int arg1, B arg2, @NonNull IntN1Factory factory) { + print(LoggerLevel.INFO, arg1, arg2, factory); + } + default void info(A arg1, B arg2, C arg3, @NonNull N3Factory factory) { print(LoggerLevel.INFO, arg1, arg2, arg3, factory); } @@ -236,6 +244,10 @@ default void warning(A arg1, @NonNull N1Factory factory) { print(LoggerLevel.WARNING, arg1, factory); } + default void warning(int arg1, @NonNull IntFactory factory) { + print(LoggerLevel.WARNING, arg1, factory); + } + default void warning(A arg1, B arg2, @NonNull N2Factory factory) { print(LoggerLevel.WARNING, arg1, arg2, factory); } diff --git a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java index a39d2b96..c2028803 100644 --- a/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java @@ -139,8 +139,26 @@ public void shutdown() { } private static String buildConfigDescription(NetworkConfig conf) { - return "Client network configuration: {\n" + " groupName: \"" + conf.threadGroupName() + "\",\n" - + " readBufferSize: " + conf.readBufferSize() + ",\n" + " pendingBufferSize: " + conf.pendingBufferSize() - + ",\n" + " writeBufferSize: " + conf.writeBufferSize() + "\n" + "}"; + return """ + Server network configuration: { + "threadGroupName": "%s", + "scheduledThreadGroupName": "%s", + "readBufferSize": %d, + "pendingBufferSize": %d, + "writeBufferSize": %d, + "useDirectByteBuffer": %s, + "maxEmptyReadsBeforeClose": %d, + "maxPacketSize": %d, + "retryDelayInMs": %d + }""".formatted( + conf.threadGroupName(), + conf.scheduledThreadGroupName(), + conf.readBufferSize(), + conf.pendingBufferSize(), + conf.writeBufferSize(), + conf.useDirectByteBuffer(), + conf.maxEmptyReadsBeforeClose(), + conf.maxPacketSize(), + conf.retryDelayInMs()); } } diff --git a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java index ea22f92f..7a7f193f 100644 --- a/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java @@ -162,7 +162,8 @@ public

IdBasedReadableNetworkPacketRegistry register(Class

new IllegalArgumentException("Not found a packet for the id " + integer)); + return ObjectUtils.notNull(idToPrototype[id], id, + value -> new IllegalArgumentException("Not found a packet for the id " + value)); } catch (IndexOutOfBoundsException e) { throw new IllegalArgumentException("Not found prototype for the id " + id); } diff --git a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java index c523443d..7a932229 100644 --- a/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java @@ -216,10 +216,34 @@ protected ScheduledExecutorService buildScheduledExecutor(ServerNetworkConfig co } private static String buildConfigDescription(ServerNetworkConfig conf) { - return "Server network configuration: {\n" + " minThreads: " + conf.threadGroupMinSize() + ",\n" + " maxThreads: " - + conf.threadGroupMaxSize() + ",\n" + " priority: " + conf.threadPriority() + ",\n" + " threadGroupName: \"" - + conf.threadGroupName() + "\",\n" + " readBufferSize: " + conf.readBufferSize() + ",\n" - + " pendingBufferSize: " + conf.pendingBufferSize() + ",\n" + " writeBufferSize: " + conf.writeBufferSize() - + "\n" + "}"; + return """ + Server network configuration: { + "threadGroupMinSize": %d, + "threadGroupMaxSize": %d, + "threadPriority": %d, + "threadGroupName": "%s", + "scheduledThreadGroupSize": %d, + "scheduledThreadGroupName": "%s", + "readBufferSize": %d, + "pendingBufferSize": %d, + "writeBufferSize": %d, + "useDirectByteBuffer": %s, + "maxEmptyReadsBeforeClose": %d, + "maxPacketSize": %d, + "retryDelayInMs": %d + }""".formatted( + conf.threadGroupMinSize(), + conf.threadGroupMaxSize(), + conf.threadPriority(), + conf.threadGroupName(), + conf.scheduledThreadGroupSize(), + conf.scheduledThreadGroupName(), + conf.readBufferSize(), + conf.pendingBufferSize(), + conf.writeBufferSize(), + conf.useDirectByteBuffer(), + conf.maxEmptyReadsBeforeClose(), + conf.maxPacketSize(), + conf.retryDelayInMs()); } }