Skip to content

Commit 803de14

Browse files
committed
small updates
1 parent 11b8d64 commit 803de14

File tree

7 files changed

+67
-13
lines changed

7 files changed

+67
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repositories {
1414
}
1515
1616
ext {
17-
rlibVersion = "10.0.alpha4"
17+
rlibVersion = "10.0.alpha5"
1818
}
1919
2020
dependencies {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rootProject.version = "10.0.alpha4"
1+
rootProject.version = "10.0.alpha5"
22
group = 'javasabr.rlib'
33

44
allprojects {

rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import javasabr.rlib.common.function.NotNullSafeBiConsumer;
1212
import javasabr.rlib.common.function.NotNullSafeBiFunction;
1313
import javasabr.rlib.common.function.NotNullSafeConsumer;
14-
import javasabr.rlib.common.function.NotNullSafeFactory;
1514
import javasabr.rlib.common.function.NotNullSafeFunction;
1615
import javasabr.rlib.common.function.NotNullSafeSupplier;
1716
import javasabr.rlib.common.function.NotNullSafeTriFunction;

rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,22 @@ default void info(@NonNull String message) {
181181
print(LoggerLevel.INFO, message);
182182
}
183183

184-
default <T> void info(T arg1, @NonNull N1Factory<T> factory) {
184+
default void info(int arg1, @NonNull IntFactory factory) {
185+
print(LoggerLevel.INFO, arg1, factory);
186+
}
187+
188+
default <A> void info(A arg1, @NonNull N1Factory<A> factory) {
185189
print(LoggerLevel.INFO, arg1, factory);
186190
}
187191

188192
default <A, B> void info(A arg1, B arg2, @NonNull N2Factory<A, B> factory) {
189193
print(LoggerLevel.INFO, arg1, arg2, factory);
190194
}
191195

196+
default <B> void info(int arg1, B arg2, @NonNull IntN1Factory<B> factory) {
197+
print(LoggerLevel.INFO, arg1, arg2, factory);
198+
}
199+
192200
default <A, B, C> void info(A arg1, B arg2, C arg3, @NonNull N3Factory<A, B, C> factory) {
193201
print(LoggerLevel.INFO, arg1, arg2, arg3, factory);
194202
}
@@ -236,6 +244,10 @@ default <A> void warning(A arg1, @NonNull N1Factory<A> factory) {
236244
print(LoggerLevel.WARNING, arg1, factory);
237245
}
238246

247+
default void warning(int arg1, @NonNull IntFactory factory) {
248+
print(LoggerLevel.WARNING, arg1, factory);
249+
}
250+
239251
default <A, B> void warning(A arg1, B arg2, @NonNull N2Factory<A, B> factory) {
240252
print(LoggerLevel.WARNING, arg1, arg2, factory);
241253
}

rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,26 @@ public void shutdown() {
139139
}
140140

141141
private static String buildConfigDescription(NetworkConfig conf) {
142-
return "Client network configuration: {\n" + " groupName: \"" + conf.threadGroupName() + "\",\n"
143-
+ " readBufferSize: " + conf.readBufferSize() + ",\n" + " pendingBufferSize: " + conf.pendingBufferSize()
144-
+ ",\n" + " writeBufferSize: " + conf.writeBufferSize() + "\n" + "}";
142+
return """
143+
Server network configuration: {
144+
"threadGroupName": "%s",
145+
"scheduledThreadGroupName": "%s",
146+
"readBufferSize": %d,
147+
"pendingBufferSize": %d,
148+
"writeBufferSize": %d,
149+
"useDirectByteBuffer": %s,
150+
"maxEmptyReadsBeforeClose": %d,
151+
"maxPacketSize": %d,
152+
"retryDelayInMs": %d
153+
}""".formatted(
154+
conf.threadGroupName(),
155+
conf.scheduledThreadGroupName(),
156+
conf.readBufferSize(),
157+
conf.pendingBufferSize(),
158+
conf.writeBufferSize(),
159+
conf.useDirectByteBuffer(),
160+
conf.maxEmptyReadsBeforeClose(),
161+
conf.maxPacketSize(),
162+
conf.retryDelayInMs());
145163
}
146164
}

rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadableNetworkPacketRegistry.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ public <P extends R> IdBasedReadableNetworkPacketRegistry<R, C> register(Class<P
162162
@Override
163163
public R resolvePrototypeById(int id) {
164164
try {
165-
return ObjectUtils.notNull(idToPrototype[id], id, integer -> new IllegalArgumentException("Not found a packet for the id " + integer));
165+
return ObjectUtils.notNull(idToPrototype[id], id,
166+
value -> new IllegalArgumentException("Not found a packet for the id " + value));
166167
} catch (IndexOutOfBoundsException e) {
167168
throw new IllegalArgumentException("Not found prototype for the id " + id);
168169
}

rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,34 @@ protected ScheduledExecutorService buildScheduledExecutor(ServerNetworkConfig co
216216
}
217217

218218
private static String buildConfigDescription(ServerNetworkConfig conf) {
219-
return "Server network configuration: {\n" + " minThreads: " + conf.threadGroupMinSize() + ",\n" + " maxThreads: "
220-
+ conf.threadGroupMaxSize() + ",\n" + " priority: " + conf.threadPriority() + ",\n" + " threadGroupName: \""
221-
+ conf.threadGroupName() + "\",\n" + " readBufferSize: " + conf.readBufferSize() + ",\n"
222-
+ " pendingBufferSize: " + conf.pendingBufferSize() + ",\n" + " writeBufferSize: " + conf.writeBufferSize()
223-
+ "\n" + "}";
219+
return """
220+
Server network configuration: {
221+
"threadGroupMinSize": %d,
222+
"threadGroupMaxSize": %d,
223+
"threadPriority": %d,
224+
"threadGroupName": "%s",
225+
"scheduledThreadGroupSize": %d,
226+
"scheduledThreadGroupName": "%s",
227+
"readBufferSize": %d,
228+
"pendingBufferSize": %d,
229+
"writeBufferSize": %d,
230+
"useDirectByteBuffer": %s,
231+
"maxEmptyReadsBeforeClose": %d,
232+
"maxPacketSize": %d,
233+
"retryDelayInMs": %d
234+
}""".formatted(
235+
conf.threadGroupMinSize(),
236+
conf.threadGroupMaxSize(),
237+
conf.threadPriority(),
238+
conf.threadGroupName(),
239+
conf.scheduledThreadGroupSize(),
240+
conf.scheduledThreadGroupName(),
241+
conf.readBufferSize(),
242+
conf.pendingBufferSize(),
243+
conf.writeBufferSize(),
244+
conf.useDirectByteBuffer(),
245+
conf.maxEmptyReadsBeforeClose(),
246+
conf.maxPacketSize(),
247+
conf.retryDelayInMs());
224248
}
225249
}

0 commit comments

Comments
 (0)