Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repositories {
}

ext {
rlibVersion = "10.0.alpha4"
rlibVersion = "10.0.alpha5"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.version = "10.0.alpha4"
rootProject.version = "10.0.alpha5"
group = 'javasabr.rlib'

allprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,22 @@ default void info(@NonNull String message) {
print(LoggerLevel.INFO, message);
}

default <T> void info(T arg1, @NonNull N1Factory<T> factory) {
default void info(int arg1, @NonNull IntFactory factory) {
print(LoggerLevel.INFO, arg1, factory);
}

default <A> void info(A arg1, @NonNull N1Factory<A> factory) {
print(LoggerLevel.INFO, arg1, factory);
}

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

default <B> void info(int arg1, B arg2, @NonNull IntN1Factory<B> factory) {
print(LoggerLevel.INFO, arg1, arg2, factory);
}

default <A, B, C> void info(A arg1, B arg2, C arg3, @NonNull N3Factory<A, B, C> factory) {
print(LoggerLevel.INFO, arg1, arg2, arg3, factory);
}
Expand Down Expand Up @@ -236,6 +244,10 @@ default <A> void warning(A arg1, @NonNull N1Factory<A> factory) {
print(LoggerLevel.WARNING, arg1, factory);
}

default void warning(int arg1, @NonNull IntFactory factory) {
print(LoggerLevel.WARNING, arg1, factory);
}

default <A, B> void warning(A arg1, B arg2, @NonNull N2Factory<A, B> factory) {
print(LoggerLevel.WARNING, arg1, arg2, factory);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ public <P extends R> IdBasedReadableNetworkPacketRegistry<R, C> register(Class<P
@Override
public R resolvePrototypeById(int id) {
try {
return ObjectUtils.notNull(idToPrototype[id], id, integer -> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Loading