diff --git a/rlib-common/src/main/java/com/ss/rlib/common/classpath/ClassPathScanner.java b/rlib-common/src/main/java/javasabr/rlib/common/classpath/ClassPathScanner.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/classpath/ClassPathScanner.java rename to rlib-common/src/main/java/javasabr/rlib/common/classpath/ClassPathScanner.java index 5dcf8714..a39b946e 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/classpath/ClassPathScanner.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/classpath/ClassPathScanner.java @@ -1,15 +1,14 @@ -package com.ss.rlib.common.classpath; - -import com.ss.rlib.common.classpath.impl.ClassPathScannerImpl; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.classpath; import java.lang.annotation.Annotation; import java.net.URL; import java.net.URLClassLoader; import java.util.function.Predicate; +import javasabr.rlib.common.classpath.impl.ClassPathScannerImpl; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * THe interface to implement a classpath scanner. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/classpath/ClassPathScannerFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/classpath/ClassPathScannerFactory.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/classpath/ClassPathScannerFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/classpath/ClassPathScannerFactory.java index 0ae13017..8d1990d9 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/classpath/ClassPathScannerFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/classpath/ClassPathScannerFactory.java @@ -1,9 +1,7 @@ -package com.ss.rlib.common.classpath; +package javasabr.rlib.common.classpath; -import com.ss.rlib.common.classpath.impl.ClassPathScannerImpl; -import com.ss.rlib.common.classpath.impl.ManifestClassPathScannerImpl; -import com.ss.rlib.common.classpath.impl.ClassPathScannerImpl; -import com.ss.rlib.common.classpath.impl.ManifestClassPathScannerImpl; +import javasabr.rlib.common.classpath.impl.ClassPathScannerImpl; +import javasabr.rlib.common.classpath.impl.ManifestClassPathScannerImpl; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/classpath/impl/ClassPathScannerImpl.java b/rlib-common/src/main/java/javasabr/rlib/common/classpath/impl/ClassPathScannerImpl.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/classpath/impl/ClassPathScannerImpl.java rename to rlib-common/src/main/java/javasabr/rlib/common/classpath/impl/ClassPathScannerImpl.java index 6b4fe628..6b3347e4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/classpath/impl/ClassPathScannerImpl.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/classpath/impl/ClassPathScannerImpl.java @@ -1,21 +1,7 @@ -package com.ss.rlib.common.classpath.impl; +package javasabr.rlib.common.classpath.impl; -import static com.ss.rlib.common.util.ClassUtils.unsafeNNCast; import static java.lang.reflect.Modifier.isAbstract; -import com.ss.rlib.common.classpath.ClassPathScanner; -import com.ss.rlib.common.compiler.Compiler; -import com.ss.rlib.common.io.impl.ReuseBytesInputStream; -import com.ss.rlib.common.io.impl.ReuseBytesOutputStream; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.IOUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import lombok.AccessLevel; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import static javasabr.rlib.common.util.ClassUtils.unsafeNNCast; import java.io.File; import java.io.IOException; @@ -28,6 +14,20 @@ import java.util.function.Predicate; import java.util.jar.JarInputStream; import java.util.zip.ZipException; +import javasabr.rlib.common.classpath.ClassPathScanner; +import javasabr.rlib.common.compiler.Compiler; +import javasabr.rlib.common.io.impl.ReuseBytesInputStream; +import javasabr.rlib.common.io.impl.ReuseBytesOutputStream; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.IOUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import lombok.AccessLevel; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of the {@link ClassPathScanner}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java b/rlib-common/src/main/java/javasabr/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java rename to rlib-common/src/main/java/javasabr/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java index fcbbb124..fe5d7175 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.classpath.impl; - -import com.ss.rlib.common.classpath.ClassPathScanner; -import com.ss.rlib.common.util.Utils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.classpath.impl; import java.nio.file.Files; import java.util.jar.JarFile; import java.util.jar.Manifest; +import javasabr.rlib.common.classpath.ClassPathScanner; +import javasabr.rlib.common.util.Utils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import org.jetbrains.annotations.NotNull; /** * The implementation of the {@link ClassPathScanner} with parsing manifest file. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/ByteCode.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/ByteCode.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/ByteCode.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/ByteCode.java index 5a5528c8..f33cc518 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/ByteCode.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/ByteCode.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.compiler; +package javasabr.rlib.common.compiler; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/Compiler.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/Compiler.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/Compiler.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/Compiler.java index 0af76267..d10ae6e3 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/Compiler.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/Compiler.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.compiler; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.compiler; import java.io.File; import java.net.URI; import java.nio.file.Path; +import org.jetbrains.annotations.NotNull; /** * The interface to implement a compiler. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/CompilerFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/CompilerFactory.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/CompilerFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/CompilerFactory.java index b03cf404..738d429c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/CompilerFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/CompilerFactory.java @@ -1,9 +1,8 @@ -package com.ss.rlib.common.compiler; - -import com.ss.rlib.common.compiler.impl.CompilerImpl; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.compiler; +import javasabr.rlib.common.compiler.impl.CompilerImpl; import javax.tools.ToolProvider; +import org.jetbrains.annotations.NotNull; /** * The factory of java compilers. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileByteCode.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileByteCode.java similarity index 79% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileByteCode.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileByteCode.java index 257d4609..ef36b458 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileByteCode.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileByteCode.java @@ -1,15 +1,12 @@ -package com.ss.rlib.common.compiler.impl; +package javasabr.rlib.common.compiler.impl; -import com.ss.rlib.common.compiler.ByteCode; -import com.ss.rlib.common.compiler.Compiler; -import com.ss.rlib.common.compiler.ByteCode; -import com.ss.rlib.common.compiler.Compiler; -import org.jetbrains.annotations.NotNull; - -import javax.tools.SimpleJavaFileObject; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.net.URI; +import javasabr.rlib.common.compiler.ByteCode; +import javasabr.rlib.common.compiler.Compiler; +import javax.tools.SimpleJavaFileObject; +import org.jetbrains.annotations.NotNull; /** * The implementation of byte code container. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileClassLoader.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileClassLoader.java similarity index 82% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileClassLoader.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileClassLoader.java index a3ae5a76..aa42a3f2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileClassLoader.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileClassLoader.java @@ -1,9 +1,9 @@ -package com.ss.rlib.common.compiler.impl; +package javasabr.rlib.common.compiler.impl; -import com.ss.rlib.common.compiler.ByteCode; -import com.ss.rlib.common.util.Utils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.compiler.ByteCode; +import javasabr.rlib.common.util.Utils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileJavaFileManager.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileJavaFileManager.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileJavaFileManager.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileJavaFileManager.java index 780d857e..e802af62 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileJavaFileManager.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileJavaFileManager.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.compiler.impl; - -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.compiler.impl; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; import javax.tools.FileObject; import javax.tools.ForwardingJavaFileManager; import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; import javax.tools.StandardJavaFileManager; +import org.jetbrains.annotations.NotNull; /** * The manager to load byte code of classes. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileListener.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileListener.java similarity index 80% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileListener.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileListener.java index 50dd5aef..ceb9f40b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompileListener.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompileListener.java @@ -1,14 +1,14 @@ -package com.ss.rlib.common.compiler.impl; +package javasabr.rlib.common.compiler.impl; -import static com.ss.rlib.common.util.ClassUtils.unsafeCast; -import static com.ss.rlib.common.util.ObjectUtils.notNull; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import org.jetbrains.annotations.NotNull; +import static javasabr.rlib.common.util.ClassUtils.unsafeCast; +import static javasabr.rlib.common.util.ObjectUtils.notNull; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.JavaFileObject; +import org.jetbrains.annotations.NotNull; /** * The listener of compile events. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompilerImpl.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompilerImpl.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompilerImpl.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompilerImpl.java index 947515eb..b7cd1105 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/CompilerImpl.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/CompilerImpl.java @@ -1,16 +1,5 @@ -package com.ss.rlib.common.compiler.impl; - -import com.ss.rlib.common.compiler.Compiler; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayCollectors; -import com.ss.rlib.common.util.array.ArrayFactory; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.compiler.impl; -import javax.tools.*; -import javax.tools.JavaCompiler.CompilationTask; import java.io.File; import java.io.IOException; import java.net.URI; @@ -18,6 +7,20 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; +import javasabr.rlib.common.compiler.Compiler; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayCollectors; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javax.tools.Diagnostic; +import javax.tools.JavaCompiler; +import javax.tools.JavaCompiler.CompilationTask; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of a compiler using a compiler from JDK. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/JavaFileSource.java b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/JavaFileSource.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/JavaFileSource.java rename to rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/JavaFileSource.java index d5de8439..c7302b77 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/compiler/impl/JavaFileSource.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/compiler/impl/JavaFileSource.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.compiler.impl; +package javasabr.rlib.common.compiler.impl; -import org.jetbrains.annotations.NotNull; - -import javax.tools.SimpleJavaFileObject; import java.io.File; import java.io.IOException; import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import javax.tools.SimpleJavaFileObject; +import org.jetbrains.annotations.NotNull; /** * The implementation of java class source. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/GroupThreadFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/GroupThreadFactory.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/GroupThreadFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/GroupThreadFactory.java index 868fa9fc..b635eb81 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/GroupThreadFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/GroupThreadFactory.java @@ -1,11 +1,8 @@ -package com.ss.rlib.common.concurrent; +package javasabr.rlib.common.concurrent; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ClassUtils; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Constructor; import java.util.concurrent.ThreadFactory; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import org.jetbrains.annotations.NotNull; /** * The implementation of the {@link ThreadFactory} to create threads in the same thread diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/atomic/AtomicInteger.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/atomic/AtomicInteger.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/atomic/AtomicInteger.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/atomic/AtomicInteger.java index d7d92598..88e36e1d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/atomic/AtomicInteger.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/atomic/AtomicInteger.java @@ -1,7 +1,6 @@ -package com.ss.rlib.common.concurrent.atomic; +package javasabr.rlib.common.concurrent.atomic; -import com.ss.rlib.common.util.pools.Reusable; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.Reusable; /** * The atomic integer with additional methods. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/atomic/AtomicReference.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/atomic/AtomicReference.java similarity index 81% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/atomic/AtomicReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/atomic/AtomicReference.java index cc50614b..75da8677 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/atomic/AtomicReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/atomic/AtomicReference.java @@ -1,7 +1,6 @@ -package com.ss.rlib.common.concurrent.atomic; +package javasabr.rlib.common.concurrent.atomic; -import com.ss.rlib.common.util.pools.Reusable; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.Reusable; /** * The atomic reference with additional methods. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/deadlock/DeadLockDetector.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/deadlock/DeadLockDetector.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/deadlock/DeadLockDetector.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/deadlock/DeadLockDetector.java index 56ebb828..b8773668 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/deadlock/DeadLockDetector.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/deadlock/DeadLockDetector.java @@ -1,22 +1,19 @@ -package com.ss.rlib.common.concurrent.deadlock; - -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.concurrent.deadlock; import java.lang.management.ManagementFactory; -import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The implementation of a deadlock detector. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/deadlock/DeadLockListener.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/deadlock/DeadLockListener.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/deadlock/DeadLockListener.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/deadlock/DeadLockListener.java index 3e7fc958..2d86bd6c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/deadlock/DeadLockListener.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/deadlock/DeadLockListener.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.concurrent.deadlock; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.concurrent.deadlock; import java.lang.management.ThreadInfo; +import org.jetbrains.annotations.NotNull; /** * The interface to implement a deadlock listener. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/PeriodicTaskExecutor.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/PeriodicTaskExecutor.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/PeriodicTaskExecutor.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/PeriodicTaskExecutor.java index 857c23a6..e5ed860b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/PeriodicTaskExecutor.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/PeriodicTaskExecutor.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.concurrent.executor; +package javasabr.rlib.common.concurrent.executor; -import com.ss.rlib.common.concurrent.task.PeriodicTask; +import javasabr.rlib.common.concurrent.task.PeriodicTask; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/TaskExecutor.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/TaskExecutor.java similarity index 78% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/TaskExecutor.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/TaskExecutor.java index 89b21484..cc0c95a2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/TaskExecutor.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/TaskExecutor.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.concurrent.executor; - -import com.ss.rlib.common.concurrent.task.CallableTask; -import com.ss.rlib.common.concurrent.task.SimpleTask; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.concurrent.executor; import java.util.concurrent.Future; +import javasabr.rlib.common.concurrent.task.CallableTask; +import javasabr.rlib.common.concurrent.task.SimpleTask; +import org.jetbrains.annotations.NotNull; /** * The interface to implement a task executor. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/SingleThreadPeriodicTaskExecutor.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/SingleThreadPeriodicTaskExecutor.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/SingleThreadPeriodicTaskExecutor.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/SingleThreadPeriodicTaskExecutor.java index 9578e566..29a29cda 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/SingleThreadPeriodicTaskExecutor.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/SingleThreadPeriodicTaskExecutor.java @@ -1,26 +1,26 @@ -package com.ss.rlib.common.concurrent.executor.impl; +package javasabr.rlib.common.concurrent.executor.impl; import static java.util.Objects.requireNonNull; -import com.ss.rlib.common.concurrent.executor.PeriodicTaskExecutor; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.concurrent.lock.Lockable; -import com.ss.rlib.common.concurrent.task.PeriodicTask; -import com.ss.rlib.common.concurrent.util.ConcurrentUtils; -import com.ss.rlib.common.concurrent.util.ThreadUtils; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import lombok.AccessLevel; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.lang.reflect.Constructor; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.function.Consumer; +import javasabr.rlib.common.concurrent.executor.PeriodicTaskExecutor; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import javasabr.rlib.common.concurrent.lock.Lockable; +import javasabr.rlib.common.concurrent.task.PeriodicTask; +import javasabr.rlib.common.concurrent.util.ConcurrentUtils; +import javasabr.rlib.common.concurrent.util.ThreadUtils; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import lombok.AccessLevel; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The implementation of single thread periodic executor. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/SingleThreadTaskExecutor.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/SingleThreadTaskExecutor.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/SingleThreadTaskExecutor.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/SingleThreadTaskExecutor.java index 18e88a0e..15927ad9 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/SingleThreadTaskExecutor.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/SingleThreadTaskExecutor.java @@ -1,24 +1,24 @@ -package com.ss.rlib.common.concurrent.executor.impl; +package javasabr.rlib.common.concurrent.executor.impl; import static java.util.Objects.requireNonNull; -import com.ss.rlib.common.concurrent.executor.TaskExecutor; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.concurrent.util.ConcurrentUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import com.ss.rlib.common.concurrent.lock.Lockable; -import com.ss.rlib.common.concurrent.task.CallableTask; -import com.ss.rlib.common.concurrent.task.SimpleTask; -import com.ss.rlib.logger.api.Logger; import java.lang.reflect.Constructor; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; +import javasabr.rlib.common.concurrent.executor.TaskExecutor; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import javasabr.rlib.common.concurrent.lock.Lockable; +import javasabr.rlib.common.concurrent.task.CallableTask; +import javasabr.rlib.common.concurrent.task.SimpleTask; +import javasabr.rlib.common.concurrent.util.ConcurrentUtils; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The implementation of single thread task executor. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/ThreadPoolTaskExecutor.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/ThreadPoolTaskExecutor.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/ThreadPoolTaskExecutor.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/ThreadPoolTaskExecutor.java index 834348bb..bad49bf7 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/executor/impl/ThreadPoolTaskExecutor.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/executor/impl/ThreadPoolTaskExecutor.java @@ -1,24 +1,23 @@ -package com.ss.rlib.common.concurrent.executor.impl; - -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.linkedlist.LinkedList; -import com.ss.rlib.common.util.linkedlist.LinkedListFactory; -import com.ss.rlib.common.concurrent.GroupThreadFactory; -import com.ss.rlib.common.concurrent.executor.TaskExecutor; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.concurrent.lock.Lockable; -import com.ss.rlib.common.concurrent.task.CallableTask; -import com.ss.rlib.common.concurrent.task.SimpleTask; -import com.ss.rlib.common.concurrent.util.ConcurrentUtils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.concurrent.executor.impl; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; +import javasabr.rlib.common.concurrent.GroupThreadFactory; +import javasabr.rlib.common.concurrent.executor.TaskExecutor; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import javasabr.rlib.common.concurrent.lock.Lockable; +import javasabr.rlib.common.concurrent.task.CallableTask; +import javasabr.rlib.common.concurrent.task.SimpleTask; +import javasabr.rlib.common.concurrent.util.ConcurrentUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.linkedlist.LinkedList; +import javasabr.rlib.common.util.linkedlist.LinkedListFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; /** * Реализация многопоточного пакетного исполнителя задач. Использовать только в случае необходимости выполнять большое diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/AsyncReadSyncWriteLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/AsyncReadSyncWriteLock.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/AsyncReadSyncWriteLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/AsyncReadSyncWriteLock.java index 92bc494f..84e86505 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/AsyncReadSyncWriteLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/AsyncReadSyncWriteLock.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock; +package javasabr.rlib.common.concurrent.lock; /** * The interface for implementing async reading and sync writing lock. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/LockFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/LockFactory.java similarity index 75% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/LockFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/LockFactory.java index 10844938..1752a9c8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/LockFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/LockFactory.java @@ -1,11 +1,15 @@ -package com.ss.rlib.common.concurrent.lock; - -import com.ss.rlib.common.concurrent.lock.impl.*; -import com.ss.rlib.common.concurrent.lock.impl.*; +package javasabr.rlib.common.concurrent.lock; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.StampedLock; +import javasabr.rlib.common.concurrent.lock.impl.FinalAtomicLock; +import javasabr.rlib.common.concurrent.lock.impl.FinalAtomicReadWriteLock; +import javasabr.rlib.common.concurrent.lock.impl.FinalReentrantAtomicLock; +import javasabr.rlib.common.concurrent.lock.impl.FinalReentrantLock; +import javasabr.rlib.common.concurrent.lock.impl.FinalReentrantReadWriteLock; +import javasabr.rlib.common.concurrent.lock.impl.FinalStampedLock; +import javasabr.rlib.common.concurrent.lock.impl.ReentrantARSWLock; /** * The factory for creating new locks. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/LockUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/LockUtils.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/LockUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/LockUtils.java index 7a3518f3..0130d0ac 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/LockUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/LockUtils.java @@ -1,15 +1,14 @@ -package com.ss.rlib.common.concurrent.lock; - -import com.ss.rlib.common.function.FunctionInt; -import com.ss.rlib.common.function.ObjectIntFunction; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.concurrent.lock; import java.util.concurrent.locks.Lock; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; +import javasabr.rlib.common.function.FunctionInt; +import javasabr.rlib.common.function.ObjectIntFunction; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class with utility methods to work with locks. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/Lockable.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/Lockable.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/Lockable.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/Lockable.java index 0cb65f5c..48b01a74 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/Lockable.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/Lockable.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock; +package javasabr.rlib.common.concurrent.lock; /** * The interface to mark a object that it has a lock/unlock methods. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/AtomicLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/AtomicLock.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/AtomicLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/AtomicLock.java index 8c934579..ff721876 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/AtomicLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/AtomicLock.java @@ -1,13 +1,11 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; - +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; - /** * The implementation of the {@link Lock} based on using {@link AtomicInteger} without supporting * reentrant calls. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/AtomicReadWriteLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/AtomicReadWriteLock.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/AtomicReadWriteLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/AtomicReadWriteLock.java index 4c0937fb..8cf94eea 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/AtomicReadWriteLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/AtomicReadWriteLock.java @@ -1,14 +1,12 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; - +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; - /** * The implementation of the {@link AsyncReadSyncWriteLock} using the several {@link AtomicInteger} without supporting * reentrant calls. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalAtomicLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalAtomicLock.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalAtomicLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalAtomicLock.java index ba59ef45..318f98cf 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalAtomicLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalAtomicLock.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; /** * The final implementation of the {@link AtomicLock}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalAtomicReadWriteLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalAtomicReadWriteLock.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalAtomicReadWriteLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalAtomicReadWriteLock.java index a7d0c4d0..ca647761 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalAtomicReadWriteLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalAtomicReadWriteLock.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; /** * The final implementation of the {@link AtomicReadWriteLock}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantAtomicLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantAtomicLock.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantAtomicLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantAtomicLock.java index 2dd95394..38c6f5ed 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantAtomicLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantAtomicLock.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; /** * The final implementation of the {@link ReentrantAtomicLock}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantLock.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantLock.java index 0a0c9223..622585e2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantLock.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; import java.util.concurrent.locks.ReentrantLock; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantReadWriteLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantReadWriteLock.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantReadWriteLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantReadWriteLock.java index bf4e263c..9eb41ded 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalReentrantReadWriteLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalReentrantReadWriteLock.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalStampedLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalStampedLock.java similarity index 79% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalStampedLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalStampedLock.java index 01fbdd39..111e4b31 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/FinalStampedLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/FinalStampedLock.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; import java.util.concurrent.locks.StampedLock; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/ReentrantARSWLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/ReentrantARSWLock.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/ReentrantARSWLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/ReentrantARSWLock.java index bcc85cb5..e792e946 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/ReentrantARSWLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/ReentrantARSWLock.java @@ -1,12 +1,11 @@ -package com.ss.rlib.common.concurrent.lock.impl; - -import com.ss.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.concurrent.lock.impl; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import javasabr.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import org.jetbrains.annotations.NotNull; /** * The wrapper of {@link ReentrantReadWriteLock} for implementing the interface {@link diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/ReentrantAtomicLock.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/ReentrantAtomicLock.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/ReentrantAtomicLock.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/ReentrantAtomicLock.java index 543cce61..7599adc4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/lock/impl/ReentrantAtomicLock.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/lock/impl/ReentrantAtomicLock.java @@ -1,14 +1,12 @@ -package com.ss.rlib.common.concurrent.lock.impl; +package javasabr.rlib.common.concurrent.lock.impl; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; - +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.concurrent.atomic.AtomicReference; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.concurrent.atomic.AtomicReference; - /** * The implementation of the {@link Lock} based on using {@link AtomicInteger} with supporting * reentrant calls. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/CallableTask.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/CallableTask.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/CallableTask.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/CallableTask.java index 98d62496..386bf48e 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/CallableTask.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/CallableTask.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.task; +package javasabr.rlib.common.concurrent.task; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/PeriodicTask.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/PeriodicTask.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/PeriodicTask.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/PeriodicTask.java index e2f48605..4215a810 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/PeriodicTask.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/PeriodicTask.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.task; +package javasabr.rlib.common.concurrent.task; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/SimpleTask.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/SimpleTask.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/SimpleTask.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/SimpleTask.java index 77177da9..7c40b103 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/task/SimpleTask.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/task/SimpleTask.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.concurrent.task; +package javasabr.rlib.common.concurrent.task; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/util/ConcurrentUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/util/ConcurrentUtils.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/util/ConcurrentUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/util/ConcurrentUtils.java index 4bea929c..17ab330d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/util/ConcurrentUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/util/ConcurrentUtils.java @@ -1,15 +1,14 @@ -package com.ss.rlib.common.concurrent.util; +package javasabr.rlib.common.concurrent.util; -import com.ss.rlib.common.function.ObjectIntFunction; -import com.ss.rlib.common.function.ObjectLongFunction; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.common.concurrent.lock.Lockable; +import java.util.function.Function; +import javasabr.rlib.common.concurrent.lock.Lockable; +import javasabr.rlib.common.function.ObjectIntFunction; +import javasabr.rlib.common.function.ObjectLongFunction; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; - /** * THe utility class with methods to work in concurrent cases. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/util/ThreadUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/util/ThreadUtils.java similarity index 78% rename from rlib-common/src/main/java/com/ss/rlib/common/concurrent/util/ThreadUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/concurrent/util/ThreadUtils.java index a4ae8151..b57baaa0 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/concurrent/util/ThreadUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/concurrent/util/ThreadUtils.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.concurrent.util; +package javasabr.rlib.common.concurrent.util; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; /** * The class with utilities methods to work with threads. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/data/AbstractFileDocument.java b/rlib-common/src/main/java/javasabr/rlib/common/data/AbstractFileDocument.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/data/AbstractFileDocument.java rename to rlib-common/src/main/java/javasabr/rlib/common/data/AbstractFileDocument.java index 66f8015f..f5c77036 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/data/AbstractFileDocument.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/data/AbstractFileDocument.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.data; +package javasabr.rlib.common.data; import static java.nio.file.Files.newInputStream; @@ -9,7 +9,6 @@ import java.io.UncheckedIOException; import java.nio.file.Path; import java.nio.file.StandardOpenOption; - import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/data/AbstractStreamDocument.java b/rlib-common/src/main/java/javasabr/rlib/common/data/AbstractStreamDocument.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/data/AbstractStreamDocument.java rename to rlib-common/src/main/java/javasabr/rlib/common/data/AbstractStreamDocument.java index 709934b5..a3c1cf7f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/data/AbstractStreamDocument.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/data/AbstractStreamDocument.java @@ -1,9 +1,14 @@ -package com.ss.rlib.common.data; +package javasabr.rlib.common.data; import static java.lang.ThreadLocal.withInitial; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.common.util.IOUtils; + +import java.io.IOException; +import java.io.InputStream; +import javasabr.rlib.common.util.IOUtils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import lombok.AccessLevel; import lombok.Setter; import org.jetbrains.annotations.NotNull; @@ -13,12 +18,6 @@ import org.w3c.dom.Node; import org.xml.sax.SAXException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.IOException; -import java.io.InputStream; - /** * The base implementation of the parser of xml documents. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/data/DocumentXML.java b/rlib-common/src/main/java/javasabr/rlib/common/data/DocumentXML.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/data/DocumentXML.java rename to rlib-common/src/main/java/javasabr/rlib/common/data/DocumentXML.java index d70e92a7..c2fb1fd7 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/data/DocumentXML.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/data/DocumentXML.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.data; +package javasabr.rlib.common.data; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/BiIntPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/BiIntPredicate.java similarity index 76% rename from rlib-common/src/main/java/com/ss/rlib/common/function/BiIntPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/BiIntPredicate.java index 20813d65..eee0a691 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/BiIntPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/BiIntPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * @author JavaSaBr diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/BiObjectIntConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/BiObjectIntConsumer.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/BiObjectIntConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/BiObjectIntConsumer.java index bba94587..1ff2743a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/BiObjectIntConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/BiObjectIntConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/BooleanFloatConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/BooleanFloatConsumer.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/BooleanFloatConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/BooleanFloatConsumer.java index 1a9aa34a..b8e1a60a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/BooleanFloatConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/BooleanFloatConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * The function. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ByteFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ByteFunction.java similarity index 74% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ByteFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ByteFunction.java index f6bb5e9e..e94ca20d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ByteFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ByteFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * @author JavaSaBr diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/CharSupplier.java b/rlib-common/src/main/java/javasabr/rlib/common/function/CharSupplier.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/function/CharSupplier.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/CharSupplier.java index ee741998..fe1aa82d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/CharSupplier.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/CharSupplier.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import java.util.function.Supplier; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/DoubleObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/DoubleObjectConsumer.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/function/DoubleObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/DoubleObjectConsumer.java index df14462b..b72b354d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/DoubleObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/DoubleObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/FiveObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/FiveObjectConsumer.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/function/FiveObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/FiveObjectConsumer.java index aae9f484..638d724d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/FiveObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/FiveObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatBiObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatBiObjectConsumer.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/FloatBiObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/FloatBiObjectConsumer.java index a1a19fb4..4d4bd354 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatBiObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatBiObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatConsumer.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/FloatConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/FloatConsumer.java index 663aa46f..717c1c42 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * The function to consume float values. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatFloatConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatFloatConsumer.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/FloatFloatConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/FloatFloatConsumer.java index d3a3b296..5f204f5b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatFloatConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatFloatConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * The function. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatObjectConsumer.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/FloatObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/FloatObjectConsumer.java index bacb48da..f4cd948f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/FloatObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/FloatObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/FourObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/FourObjectConsumer.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/function/FourObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/FourObjectConsumer.java index 52c80447..2ff59220 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/FourObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/FourObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/FunctionInt.java b/rlib-common/src/main/java/javasabr/rlib/common/function/FunctionInt.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/function/FunctionInt.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/FunctionInt.java index ae8d311a..93406d50 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/FunctionInt.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/FunctionInt.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/Functions.java b/rlib-common/src/main/java/javasabr/rlib/common/function/Functions.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/function/Functions.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/Functions.java index 6d179cb5..ff5f3362 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/Functions.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/Functions.java @@ -1,9 +1,8 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.Predicate; import java.util.function.Supplier; +import org.jetbrains.annotations.NotNull; public class Functions { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/IntBiObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/IntBiObjectConsumer.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/IntBiObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/IntBiObjectConsumer.java index 9a089c08..61c542c5 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/IntBiObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/IntBiObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/IntObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/IntObjectConsumer.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/function/IntObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/IntObjectConsumer.java index 2ba312d0..56f63b53 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/IntObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/IntObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/IntObjectPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/IntObjectPredicate.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/function/IntObjectPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/IntObjectPredicate.java index bc0f9ea4..e196277f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/IntObjectPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/IntObjectPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/LongBiObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/LongBiObjectConsumer.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/LongBiObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/LongBiObjectConsumer.java index 88dd7c73..7193af57 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/LongBiObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/LongBiObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/LongObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/LongObjectConsumer.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/function/LongObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/LongObjectConsumer.java index 3ff90e52..9b8b3d30 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/LongObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/LongObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/LongObjectPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/LongObjectPredicate.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/function/LongObjectPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/LongObjectPredicate.java index 7bbb54d1..f18ab142 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/LongObjectPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/LongObjectPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiConsumer.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiConsumer.java index a2ee2758..feeb93b6 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiConsumer.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.BiConsumer; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NotNullBiConsumer extends BiConsumer { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiFunction.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiFunction.java index 7e2b2b70..41e579b5 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiFunction.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.BiFunction; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NotNullBiFunction extends BiFunction { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiPredicate.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiPredicate.java index f039b1e5..6e47c125 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullBiPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullBiPredicate.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.BiPredicate; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NotNullBiPredicate extends BiPredicate { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullConsumer.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullConsumer.java index 0c778fda..54810158 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullConsumer.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.Consumer; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NotNullConsumer extends Consumer { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFloatBiObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFloatBiObjectConsumer.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFloatBiObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFloatBiObjectConsumer.java index 204dce66..820581d8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFloatBiObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFloatBiObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFunction.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFunction.java index 7ae35989..a3c86aa8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFunction.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.Function; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NotNullFunction extends Function { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunctionInt.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFunctionInt.java similarity index 80% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunctionInt.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFunctionInt.java index 006170a0..18ccb761 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunctionInt.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullFunctionInt.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullIntBiObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullIntBiObjectConsumer.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullIntBiObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullIntBiObjectConsumer.java index a0250545..e13147d6 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullIntBiObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullIntBiObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullIntObjectPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullIntObjectPredicate.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullIntObjectPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullIntObjectPredicate.java index 10866e99..7a31dc65 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullIntObjectPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullIntObjectPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullLongBiObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullLongBiObjectConsumer.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullLongBiObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullLongBiObjectConsumer.java index 8fc58a33..13710f63 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullLongBiObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullLongBiObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullLongObjectPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullLongObjectPredicate.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullLongObjectPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullLongObjectPredicate.java index da7e6576..fb247f2f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullLongObjectPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullLongObjectPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableBiFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableBiFunction.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableBiFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableBiFunction.java index 43e7d3ba..8cbd4046 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableBiFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableBiFunction.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; +import java.util.function.BiFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.BiFunction; - @FunctionalInterface public interface NotNullNullableBiFunction extends BiFunction { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableFunction.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableFunction.java index b939b813..6c9aca2d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableFunction.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; +import java.util.function.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; - @FunctionalInterface public interface NotNullNullableFunction extends Function { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableTripleFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableTripleFunction.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableTripleFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableTripleFunction.java index b7bb0520..4ea80df9 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullNullableTripleFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullNullableTripleFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullObjectIntPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullObjectIntPredicate.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullObjectIntPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullObjectIntPredicate.java index de1a4348..5ba84d04 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullObjectIntPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullObjectIntPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullObjectLongPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullObjectLongPredicate.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullObjectLongPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullObjectLongPredicate.java index ce832dcb..3b988b49 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullObjectLongPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullObjectLongPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullPredicate.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullPredicate.java index e54e5abe..19deca8f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullPredicate.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.Predicate; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NotNullPredicate extends Predicate { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeBiConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeBiConsumer.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeBiConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeBiConsumer.java index 0d1f6964..306e5178 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeBiConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeBiConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeBiFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeBiFunction.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeBiFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeBiFunction.java index fa9e5405..629dd26e 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeBiFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeBiFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeConsumer.java similarity index 85% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeConsumer.java index a8766afa..ac8550a2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeFactory.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeFactory.java index 33ad390f..46f352e9 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeFactory.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeFunction.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeFunction.java index e7fc68e7..b167ed4e 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeSupplier.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeSupplier.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeSupplier.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeSupplier.java index fdf580af..2e265ad2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeSupplier.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeSupplier.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeTriFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeTriFunction.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeTriFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeTriFunction.java index 566fd167..c934b7a6 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSafeTriFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSafeTriFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSupplier.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSupplier.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSupplier.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSupplier.java index dd31ee70..defee4f8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullSupplier.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullSupplier.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.function; import java.util.function.Supplier; +import org.jetbrains.annotations.NotNull; @FunctionalInterface public interface NotNullSupplier extends Supplier { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullTripleConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullTripleConsumer.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullTripleConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullTripleConsumer.java index 7c59b35d..6b85f458 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullTripleConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullTripleConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullTriplePredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullTriplePredicate.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NotNullTriplePredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NotNullTriplePredicate.java index 1282a505..91a6c8e2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NotNullTriplePredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NotNullTriplePredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/NullableSupplier.java b/rlib-common/src/main/java/javasabr/rlib/common/function/NullableSupplier.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/function/NullableSupplier.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/NullableSupplier.java index 54ecbc28..25bf8515 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/NullableSupplier.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/NullableSupplier.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.function; - -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.function; import java.util.function.Supplier; +import org.jetbrains.annotations.Nullable; @FunctionalInterface public interface NullableSupplier extends Supplier { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatConsumer.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatConsumer.java index 3cff6480..15646eff 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatFunction.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatFunction.java index 58c578f9..03564de4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatObjectConsumer.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatObjectConsumer.java index 92e1df3e..e5352a46 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectFloatObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectFloatObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntConsumer.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntConsumer.java index c023babb..dcb6bc5b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntFunction.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntFunction.java index 422a6b4d..37e488f1 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntObjectConsumer.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntObjectConsumer.java index d2d3adf7..a5b83cda 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntObjectFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntObjectFunction.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntObjectFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntObjectFunction.java index 402fced2..dc57ac71 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntObjectFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntObjectFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntPredicate.java similarity index 77% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntPredicate.java index 82358259..7fe1ef96 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectIntPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectIntPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * @author JavaSaBr diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongConsumer.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongConsumer.java index 6bb1eb3b..49fa8e33 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongFunction.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongFunction.java index 6c1bba38..1e2df145 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * The function. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongObjectConsumer.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongObjectConsumer.java index 091cd652..05562471 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongPredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongPredicate.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongPredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongPredicate.java index 628bb190..356bd9ad 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/ObjectLongPredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/ObjectLongPredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeBiConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeBiConsumer.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeBiConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeBiConsumer.java index db79d5cc..1fdff695 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeBiConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeBiConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeBiFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeBiFunction.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeBiFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeBiFunction.java index 4f77bc9d..a363455e 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeBiFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeBiFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeConsumer.java similarity index 82% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeConsumer.java index 3d3d0b40..277a900f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeFactory.java similarity index 81% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeFactory.java index cc55a517..da4394a7 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeFactory.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeFunction.java similarity index 80% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeFunction.java index 21128074..b06bad5f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeRunnable.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeRunnable.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeRunnable.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeRunnable.java index 2de37ac4..fdad197c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeRunnable.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeRunnable.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; /** * The function. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeSupplier.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeSupplier.java similarity index 81% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeSupplier.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeSupplier.java index c656e961..e7e20b0e 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeSupplier.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeSupplier.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeTriFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeTriFunction.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeTriFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeTriFunction.java index 20a8d20b..4f51e64b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeTriFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeTriFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeTripleConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeTripleConsumer.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeTripleConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeTripleConsumer.java index 28b68275..aec05934 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeTripleConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeTripleConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeTripleFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeTripleFunction.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SafeTripleFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SafeTripleFunction.java index 86c22481..a6304cec 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SafeTripleFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SafeTripleFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/SixObjectConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/SixObjectConsumer.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/function/SixObjectConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/SixObjectConsumer.java index 9eb7377f..948c26e4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/SixObjectConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/SixObjectConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/TripleConsumer.java b/rlib-common/src/main/java/javasabr/rlib/common/function/TripleConsumer.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/function/TripleConsumer.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/TripleConsumer.java index a6a33548..b3bce91d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/TripleConsumer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/TripleConsumer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/TripleFunction.java b/rlib-common/src/main/java/javasabr/rlib/common/function/TripleFunction.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/function/TripleFunction.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/TripleFunction.java index 5bb692d6..bfe2ed6f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/TripleFunction.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/TripleFunction.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/function/TriplePredicate.java b/rlib-common/src/main/java/javasabr/rlib/common/function/TriplePredicate.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/function/TriplePredicate.java rename to rlib-common/src/main/java/javasabr/rlib/common/function/TriplePredicate.java index 14b5977d..43ff29b3 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/function/TriplePredicate.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/function/TriplePredicate.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.function; +package javasabr.rlib.common.function; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/DirectionType.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/DirectionType.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/DirectionType.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/DirectionType.java index bb34a10e..9e6ed026 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/DirectionType.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/DirectionType.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; /** * The list od direction types. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Matrix3f.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Matrix3f.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Matrix3f.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Matrix3f.java index 7d198c2c..280a79ab 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Matrix3f.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Matrix3f.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.Reusable; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Plane.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Plane.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Plane.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Plane.java index a3b8ac9e..a93ddb89 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Plane.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Plane.java @@ -1,7 +1,8 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; -import static com.ss.rlib.common.geom.Vector3f.substract; -import com.ss.rlib.common.util.ExtMath; +import static javasabr.rlib.common.geom.Vector3f.substract; + +import javasabr.rlib.common.util.ExtMath; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Polygon.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Polygon.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Polygon.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Polygon.java index a39bc56a..dce3a68b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Polygon.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Polygon.java @@ -1,10 +1,10 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; -import static com.ss.rlib.common.util.array.ArrayFactory.toArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import static javasabr.rlib.common.util.array.ArrayFactory.toArray; import java.util.Arrays; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Geometry 3D polygon. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Quaternion4f.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Quaternion4f.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Quaternion4f.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Quaternion4f.java index 22f5aebe..d32123ec 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Quaternion4f.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Quaternion4f.java @@ -1,9 +1,9 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; -import com.ss.rlib.common.geom.util.AngleUtils; -import com.ss.rlib.common.util.ExtMath; -import com.ss.rlib.common.util.random.Random; -import com.ss.rlib.common.util.random.RandomFactory; +import javasabr.rlib.common.geom.util.AngleUtils; +import javasabr.rlib.common.util.ExtMath; +import javasabr.rlib.common.util.random.Random; +import javasabr.rlib.common.util.random.RandomFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Ray3f.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Ray3f.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Ray3f.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Ray3f.java index 5aed6a81..79d5ab5a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Ray3f.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Ray3f.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.Reusable; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Vector2f.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Vector2f.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Vector2f.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Vector2f.java index 927d18de..994d7d1d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Vector2f.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Vector2f.java @@ -1,8 +1,9 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; import static java.lang.Float.floatToIntBits; import static java.lang.Float.isFinite; -import com.ss.rlib.common.util.ExtMath; + +import javasabr.rlib.common.util.ExtMath; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Vector3f.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Vector3f.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Vector3f.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Vector3f.java index ab661717..2da2b0a4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Vector3f.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Vector3f.java @@ -1,8 +1,9 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; import static java.lang.Float.floatToIntBits; import static java.lang.Float.isFinite; -import com.ss.rlib.common.util.ExtMath; + +import javasabr.rlib.common.util.ExtMath; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/Vector3fBuffer.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/Vector3fBuffer.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/Vector3fBuffer.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/Vector3fBuffer.java index 90fd23be..0a71d532 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/Vector3fBuffer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/Vector3fBuffer.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.geom; +package javasabr.rlib.common.geom; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/Bounding.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/Bounding.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/Bounding.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/Bounding.java index 225aab3b..5e236103 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/Bounding.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/Bounding.java @@ -1,9 +1,9 @@ -package com.ss.rlib.common.geom.bounding; +package javasabr.rlib.common.geom.bounding; -import com.ss.rlib.common.geom.Quaternion4f; -import com.ss.rlib.common.geom.Ray3f; -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.common.geom.Vector3fBuffer; +import javasabr.rlib.common.geom.Quaternion4f; +import javasabr.rlib.common.geom.Ray3f; +import javasabr.rlib.common.geom.Vector3f; +import javasabr.rlib.common.geom.Vector3fBuffer; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/BoundingFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/BoundingFactory.java similarity index 73% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/BoundingFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/BoundingFactory.java index 333890f9..ea28b587 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/BoundingFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/BoundingFactory.java @@ -1,13 +1,9 @@ -package com.ss.rlib.common.geom.bounding; +package javasabr.rlib.common.geom.bounding; -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.common.geom.bounding.impl.AbstractBounding; -import com.ss.rlib.common.geom.bounding.impl.AxisAlignedBoundingBox; -import com.ss.rlib.common.geom.bounding.impl.BoundingSphere; -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.common.geom.bounding.impl.AbstractBounding; -import com.ss.rlib.common.geom.bounding.impl.AxisAlignedBoundingBox; -import com.ss.rlib.common.geom.bounding.impl.BoundingSphere; +import javasabr.rlib.common.geom.Vector3f; +import javasabr.rlib.common.geom.bounding.impl.AbstractBounding; +import javasabr.rlib.common.geom.bounding.impl.AxisAlignedBoundingBox; +import javasabr.rlib.common.geom.bounding.impl.BoundingSphere; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/BoundingType.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/BoundingType.java similarity index 86% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/BoundingType.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/BoundingType.java index 4623ec4c..6de419d2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/BoundingType.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/BoundingType.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.geom.bounding; +package javasabr.rlib.common.geom.bounding; /** * The list of bounding types. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/AbstractBounding.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/AbstractBounding.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/AbstractBounding.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/AbstractBounding.java index b13bb36b..d8079b99 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/AbstractBounding.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/AbstractBounding.java @@ -1,13 +1,13 @@ -package com.ss.rlib.common.geom.bounding.impl; - -import com.ss.rlib.common.geom.Quaternion4f; -import com.ss.rlib.common.geom.Ray3f; -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.common.geom.Vector3fBuffer; -import com.ss.rlib.common.geom.bounding.Bounding; -import com.ss.rlib.common.geom.bounding.BoundingType; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; +package javasabr.rlib.common.geom.bounding.impl; + +import javasabr.rlib.common.geom.Quaternion4f; +import javasabr.rlib.common.geom.Ray3f; +import javasabr.rlib.common.geom.Vector3f; +import javasabr.rlib.common.geom.Vector3fBuffer; +import javasabr.rlib.common.geom.bounding.Bounding; +import javasabr.rlib.common.geom.bounding.BoundingType; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/AxisAlignedBoundingBox.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/AxisAlignedBoundingBox.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/AxisAlignedBoundingBox.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/AxisAlignedBoundingBox.java index d8f72bb9..00606c40 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/AxisAlignedBoundingBox.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/AxisAlignedBoundingBox.java @@ -1,11 +1,11 @@ -package com.ss.rlib.common.geom.bounding.impl; - -import com.ss.rlib.common.geom.Matrix3f; -import com.ss.rlib.common.geom.Quaternion4f; -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.common.geom.Vector3fBuffer; -import com.ss.rlib.common.geom.bounding.Bounding; -import com.ss.rlib.common.geom.bounding.BoundingType; +package javasabr.rlib.common.geom.bounding.impl; + +import javasabr.rlib.common.geom.Matrix3f; +import javasabr.rlib.common.geom.Quaternion4f; +import javasabr.rlib.common.geom.Vector3f; +import javasabr.rlib.common.geom.Vector3fBuffer; +import javasabr.rlib.common.geom.bounding.Bounding; +import javasabr.rlib.common.geom.bounding.BoundingType; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/BoundingSphere.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/BoundingSphere.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/BoundingSphere.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/BoundingSphere.java index db0f5ae2..756c3a55 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/bounding/impl/BoundingSphere.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/bounding/impl/BoundingSphere.java @@ -1,15 +1,14 @@ -package com.ss.rlib.common.geom.bounding.impl; +package javasabr.rlib.common.geom.bounding.impl; import static java.lang.Math.abs; -import com.ss.rlib.common.geom.util.GeometryUtils; +import javasabr.rlib.common.geom.Vector3f; +import javasabr.rlib.common.geom.Vector3fBuffer; +import javasabr.rlib.common.geom.bounding.Bounding; +import javasabr.rlib.common.geom.bounding.BoundingType; +import javasabr.rlib.common.geom.util.GeometryUtils; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.common.geom.Vector3fBuffer; -import com.ss.rlib.common.geom.bounding.Bounding; -import com.ss.rlib.common.geom.bounding.BoundingType; - /** * The implementation of sphere bounding. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/util/AngleUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/util/AngleUtils.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/util/AngleUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/util/AngleUtils.java index 20dea394..ffb31c63 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/util/AngleUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/util/AngleUtils.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.geom.util; +package javasabr.rlib.common.geom.util; /** * Реализация утильного класса с методами по работе с углами. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/util/CoordsUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/util/CoordsUtils.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/util/CoordsUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/util/CoordsUtils.java index ea48b4a3..a515d91c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/util/CoordsUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/util/CoordsUtils.java @@ -1,12 +1,11 @@ -package com.ss.rlib.common.geom.util; - -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.common.util.ExtMath; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.geom.util; import java.util.concurrent.ThreadLocalRandom; +import javasabr.rlib.common.geom.Vector3f; +import javasabr.rlib.common.util.ExtMath; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; /** * Реализация утильного класса с методами для рассчета координат. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/geom/util/GeometryUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/geom/util/GeometryUtils.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/geom/util/GeometryUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/geom/util/GeometryUtils.java index 8684c12a..bbab7835 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/geom/util/GeometryUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/geom/util/GeometryUtils.java @@ -1,219 +1,219 @@ -package com.ss.rlib.common.geom.util; - -/** - * Набор геометрически методов. - * - * @author JavaSaBr - */ -public final class GeometryUtils { - - /** - * Рассчет расстояния между 2мя точками. - * - * @param startX координата первой точки. - * @param startY координата первой точки. - * @param startZ координата первой точки. - * @param targetX координата второй точки. - * @param targetY координата второй точки. - * @param targetZ координата второй точки. - * @return расстояние между точками. - */ - public static float getDistance(final float startX, final float startY, final float startZ, - final float targetX, final float targetY, final float targetZ) { - return (float) Math.sqrt(getSquareDistance(startX, startY, startZ, targetX, targetY, targetZ)); - } - - /** - * Возвращает расстояние от точки до отрезка. - * - * @param startX начальная координата отрезка. - * @param startY начальная координата отрезка. - * @param endX конечная координата отрезка. - * @param endY конечная координата отрезка. - * @param targetX координата точки. - * @param targetY координата точки. - * @return расстояние от точки до отрезка. - */ - public static float getDistanceToLine(final float startX, final float startY, final float endX, - final float endY, final float targetX, final float targetY) { - return (float) Math.sqrt(getSquareDistanceToLine(startX, startY, endX, endY, targetX, targetY)); - } - - /** - * Возвращает расстояние от точки до отрезка. - * - * @param startX начальная координата отрезка. - * @param startY начальная координата отрезка. - * @param startZ начальная координата отрезка. - * @param endX конечная координата отрезка. - * @param endY конечная координата отрезка. - * @param endZ конечная координата отрезка. - * @param targetX координата точки. - * @param targetY координата точки. - * @param targetZ координата точки. - * @return расстояние от точки до отрезка. - */ - public static float getDistanceToLine(final float startX, final float startY, final float startZ, - final float endX, final float endY, final float endZ, final float targetX, - final float targetY, final float targetZ) { - return (float) Math.sqrt(getSquareDistanceToLine(startX, startY, startZ, endX, endY, endZ, targetX, targetY, targetZ)); - } - - /** - * Get squared distance distance between two points. - * - * @param startX the start X coordinate. - * @param startY the start Y coordinate. - * @param startZ the start Z coordinate. - * @param targetX the end X coordinate. - * @param targetY the end Y coordinate. - * @param targetZ the end Z coordinate. - * @return the squared distance. - */ - public static float getSquareDistance( - float startX, - float startY, - float startZ, - float targetX, - float targetY, - float targetZ - ) { - - float dx = targetX - startX; - float dy = targetY - startY; - float dz = targetZ - startZ; - - return dx * dx + dy * dy + dz * dz; - } - - /** - * Возвращает квадрат расстояния от точки до отрезка. - * - * @param startX начальная координата отрезка. - * @param startY начальная координата отрезка. - * @param endX конечная координата отрезка. - * @param endY конечная координата отрезка. - * @param targetX координата точки. - * @param targetY координата точки. - * @return квадрат расстояния от точки до отрезка. - */ - public static float getSquareDistanceToLine(final float startX, final float startY, float endX, - float endY, float targetX, float targetY) { - - endX -= startX; - endY -= startY; - - targetX -= startX; - targetY -= startY; - - float dotprod = targetX * endX + targetY * endY; - - float projlenSq; - - if (dotprod <= 0.0F) { - projlenSq = 0.0F; - } else { - - targetX = endX - targetX; - targetY = endY - targetY; - - dotprod = targetX * endX + targetY * endY; - - if (dotprod <= 0.0F) { - projlenSq = 0.0F; - } else { - projlenSq = dotprod * dotprod / (endX * endX + endY * endY); - } - } - - float lenSq = targetX * targetX + targetY * targetY - projlenSq; - - if (lenSq < 0F) { - lenSq = 0F; - } - - return lenSq; - } - - /** - * Возвращает квадрат расстояния от точки до отрезка. - * - * @param startX начальная координата отрезка. - * @param startY начальная координата отрезка. - * @param startZ начальная координата отрезка. - * @param endX конечная координата отрезка. - * @param endY конечная координата отрезка. - * @param endZ конечная координата отрезка. - * @param targetX координата точки. - * @param targetY координата точки. - * @param targetZ координата точки. - * @return квадрат расстояния от точки до отрезка. - */ - public static float getSquareDistanceToLine(final float startX, final float startY, final float startZ, - final float endX, final float endY, final float endZ, - final float targetX, final float targetY, final float targetZ) { - - final float lineX = endX - startX; - final float lineY = endY - startY; - final float lineZ = endZ - startZ; - - float pointX = targetX - startX; - float pointY = targetY - startY; - float pointZ = targetZ - startZ; - - final float c1 = scalar(pointX, pointY, pointZ, lineX, lineY, lineZ); - - if (c1 < 0F) { - return squareLength(targetX, targetY, targetZ, startX, startY, startZ); - } - - final float c2 = scalar(lineX, lineY, lineZ, lineX, lineY, lineZ); - - if (c2 <= c1) { - return squareLength(targetX, targetY, targetZ, endX, endY, endZ); - } - - final float b = c1 / c2; - - pointX = startX + lineX * b; - pointY = startY + lineY * b; - pointZ = startZ + lineZ * b; - - return squareLength(targetX, targetY, targetZ, pointX, pointY, pointZ); - } - - /** - * Производит скалярное произведение двух точек. - * - * @param x1 координата первой точки. - * @param y1 координата первой точки. - * @param z1 координата первой точки. - * @param x2 координата второй точки. - * @param y2 координата второй точки. - * @param z2 координата второй точки. - * @return произведение двух точек. - */ - public static float scalar(final float x1, final float y1, final float z1, final float x2, final float y2, final float z2) { - return x1 * x2 + y1 * y2 + z1 * z2; - } - - /** - * Находит квадрат длинны между двумя точками. - * - * @param x1 координата первой точки. - * @param y1 координата первой точки. - * @param z1 координата первой точки. - * @param x2 координата второй точки. - * @param y2 координата второй точки. - * @param z2 координата второй точки. - * @return квадрат длинны между точками. - */ - public static float squareLength(final float x1, final float y1, final float z1, final float x2, final float y2, final float z2) { - - final float dx = x1 - x2; - final float dy = y1 - y2; - final float dz = z1 - z2; - - return dx * dx + dy * dy + dz * dz; - } -} +package javasabr.rlib.common.geom.util; + +/** + * Набор геометрически методов. + * + * @author JavaSaBr + */ +public final class GeometryUtils { + + /** + * Рассчет расстояния между 2мя точками. + * + * @param startX координата первой точки. + * @param startY координата первой точки. + * @param startZ координата первой точки. + * @param targetX координата второй точки. + * @param targetY координата второй точки. + * @param targetZ координата второй точки. + * @return расстояние между точками. + */ + public static float getDistance(final float startX, final float startY, final float startZ, + final float targetX, final float targetY, final float targetZ) { + return (float) Math.sqrt(getSquareDistance(startX, startY, startZ, targetX, targetY, targetZ)); + } + + /** + * Возвращает расстояние от точки до отрезка. + * + * @param startX начальная координата отрезка. + * @param startY начальная координата отрезка. + * @param endX конечная координата отрезка. + * @param endY конечная координата отрезка. + * @param targetX координата точки. + * @param targetY координата точки. + * @return расстояние от точки до отрезка. + */ + public static float getDistanceToLine(final float startX, final float startY, final float endX, + final float endY, final float targetX, final float targetY) { + return (float) Math.sqrt(getSquareDistanceToLine(startX, startY, endX, endY, targetX, targetY)); + } + + /** + * Возвращает расстояние от точки до отрезка. + * + * @param startX начальная координата отрезка. + * @param startY начальная координата отрезка. + * @param startZ начальная координата отрезка. + * @param endX конечная координата отрезка. + * @param endY конечная координата отрезка. + * @param endZ конечная координата отрезка. + * @param targetX координата точки. + * @param targetY координата точки. + * @param targetZ координата точки. + * @return расстояние от точки до отрезка. + */ + public static float getDistanceToLine(final float startX, final float startY, final float startZ, + final float endX, final float endY, final float endZ, final float targetX, + final float targetY, final float targetZ) { + return (float) Math.sqrt(getSquareDistanceToLine(startX, startY, startZ, endX, endY, endZ, targetX, targetY, targetZ)); + } + + /** + * Get squared distance distance between two points. + * + * @param startX the start X coordinate. + * @param startY the start Y coordinate. + * @param startZ the start Z coordinate. + * @param targetX the end X coordinate. + * @param targetY the end Y coordinate. + * @param targetZ the end Z coordinate. + * @return the squared distance. + */ + public static float getSquareDistance( + float startX, + float startY, + float startZ, + float targetX, + float targetY, + float targetZ + ) { + + float dx = targetX - startX; + float dy = targetY - startY; + float dz = targetZ - startZ; + + return dx * dx + dy * dy + dz * dz; + } + + /** + * Возвращает квадрат расстояния от точки до отрезка. + * + * @param startX начальная координата отрезка. + * @param startY начальная координата отрезка. + * @param endX конечная координата отрезка. + * @param endY конечная координата отрезка. + * @param targetX координата точки. + * @param targetY координата точки. + * @return квадрат расстояния от точки до отрезка. + */ + public static float getSquareDistanceToLine(final float startX, final float startY, float endX, + float endY, float targetX, float targetY) { + + endX -= startX; + endY -= startY; + + targetX -= startX; + targetY -= startY; + + float dotprod = targetX * endX + targetY * endY; + + float projlenSq; + + if (dotprod <= 0.0F) { + projlenSq = 0.0F; + } else { + + targetX = endX - targetX; + targetY = endY - targetY; + + dotprod = targetX * endX + targetY * endY; + + if (dotprod <= 0.0F) { + projlenSq = 0.0F; + } else { + projlenSq = dotprod * dotprod / (endX * endX + endY * endY); + } + } + + float lenSq = targetX * targetX + targetY * targetY - projlenSq; + + if (lenSq < 0F) { + lenSq = 0F; + } + + return lenSq; + } + + /** + * Возвращает квадрат расстояния от точки до отрезка. + * + * @param startX начальная координата отрезка. + * @param startY начальная координата отрезка. + * @param startZ начальная координата отрезка. + * @param endX конечная координата отрезка. + * @param endY конечная координата отрезка. + * @param endZ конечная координата отрезка. + * @param targetX координата точки. + * @param targetY координата точки. + * @param targetZ координата точки. + * @return квадрат расстояния от точки до отрезка. + */ + public static float getSquareDistanceToLine(final float startX, final float startY, final float startZ, + final float endX, final float endY, final float endZ, + final float targetX, final float targetY, final float targetZ) { + + final float lineX = endX - startX; + final float lineY = endY - startY; + final float lineZ = endZ - startZ; + + float pointX = targetX - startX; + float pointY = targetY - startY; + float pointZ = targetZ - startZ; + + final float c1 = scalar(pointX, pointY, pointZ, lineX, lineY, lineZ); + + if (c1 < 0F) { + return squareLength(targetX, targetY, targetZ, startX, startY, startZ); + } + + final float c2 = scalar(lineX, lineY, lineZ, lineX, lineY, lineZ); + + if (c2 <= c1) { + return squareLength(targetX, targetY, targetZ, endX, endY, endZ); + } + + final float b = c1 / c2; + + pointX = startX + lineX * b; + pointY = startY + lineY * b; + pointZ = startZ + lineZ * b; + + return squareLength(targetX, targetY, targetZ, pointX, pointY, pointZ); + } + + /** + * Производит скалярное произведение двух точек. + * + * @param x1 координата первой точки. + * @param y1 координата первой точки. + * @param z1 координата первой точки. + * @param x2 координата второй точки. + * @param y2 координата второй точки. + * @param z2 координата второй точки. + * @return произведение двух точек. + */ + public static float scalar(final float x1, final float y1, final float z1, final float x2, final float y2, final float z2) { + return x1 * x2 + y1 * y2 + z1 * z2; + } + + /** + * Находит квадрат длинны между двумя точками. + * + * @param x1 координата первой точки. + * @param y1 координата первой точки. + * @param z1 координата первой точки. + * @param x2 координата второй точки. + * @param y2 координата второй точки. + * @param z2 координата второй точки. + * @return квадрат длинны между точками. + */ + public static float squareLength(final float x1, final float y1, final float z1, final float x2, final float y2, final float z2) { + + final float dx = x1 - x2; + final float dy = y1 - y2; + final float dz = z1 - z2; + + return dx * dx + dy * dy + dz * dz; + } +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/graphics/color/ColorRGBA.java b/rlib-common/src/main/java/javasabr/rlib/common/graphics/color/ColorRGBA.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/graphics/color/ColorRGBA.java rename to rlib-common/src/main/java/javasabr/rlib/common/graphics/color/ColorRGBA.java index dea15524..3b386c55 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/graphics/color/ColorRGBA.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/graphics/color/ColorRGBA.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.graphics.color; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.graphics.color; import java.io.Serializable; +import org.jetbrains.annotations.NotNull; /** * THe implementation of a color class. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/io/ReusableStream.java b/rlib-common/src/main/java/javasabr/rlib/common/io/ReusableStream.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/io/ReusableStream.java rename to rlib-common/src/main/java/javasabr/rlib/common/io/ReusableStream.java index 0f870f6b..ff6254ca 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/io/ReusableStream.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/io/ReusableStream.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.io; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.io; import java.io.IOException; +import org.jetbrains.annotations.NotNull; /** * The interface to implement a reusable streams. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/io/impl/RedirectImageOutputStream.java b/rlib-common/src/main/java/javasabr/rlib/common/io/impl/RedirectImageOutputStream.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/io/impl/RedirectImageOutputStream.java rename to rlib-common/src/main/java/javasabr/rlib/common/io/impl/RedirectImageOutputStream.java index 12944c93..eb60782d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/io/impl/RedirectImageOutputStream.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/io/impl/RedirectImageOutputStream.java @@ -1,12 +1,10 @@ -package com.ss.rlib.common.io.impl; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.io.impl; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; - import javax.imageio.stream.ImageOutputStreamImpl; +import org.jetbrains.annotations.NotNull; /** * The implementation of a redirector image input stream. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/io/impl/ReuseBytesInputStream.java b/rlib-common/src/main/java/javasabr/rlib/common/io/impl/ReuseBytesInputStream.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/io/impl/ReuseBytesInputStream.java rename to rlib-common/src/main/java/javasabr/rlib/common/io/impl/ReuseBytesInputStream.java index 0570f08a..0ee1015d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/io/impl/ReuseBytesInputStream.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/io/impl/ReuseBytesInputStream.java @@ -1,11 +1,9 @@ -package com.ss.rlib.common.io.impl; - -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.io.ReusableStream; -import com.ss.rlib.common.util.ArrayUtils; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.io.impl; import java.io.InputStream; +import javasabr.rlib.common.io.ReusableStream; +import javasabr.rlib.common.util.ArrayUtils; +import org.jetbrains.annotations.NotNull; /** * The implementation of reusable input stream. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/io/impl/ReuseBytesOutputStream.java b/rlib-common/src/main/java/javasabr/rlib/common/io/impl/ReuseBytesOutputStream.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/io/impl/ReuseBytesOutputStream.java rename to rlib-common/src/main/java/javasabr/rlib/common/io/impl/ReuseBytesOutputStream.java index 99571a5a..a7df85fa 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/io/impl/ReuseBytesOutputStream.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/io/impl/ReuseBytesOutputStream.java @@ -1,11 +1,10 @@ -package com.ss.rlib.common.io.impl; - -import com.ss.rlib.common.io.ReusableStream; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.io.impl; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.Arrays; +import javasabr.rlib.common.io.ReusableStream; +import org.jetbrains.annotations.NotNull; /** * The implementation of reusable output stream. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/manager/InitializeManager.java b/rlib-common/src/main/java/javasabr/rlib/common/manager/InitializeManager.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/manager/InitializeManager.java rename to rlib-common/src/main/java/javasabr/rlib/common/manager/InitializeManager.java index 71a06a93..db2f94b1 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/manager/InitializeManager.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/manager/InitializeManager.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.manager; - -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.manager; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayDeque; import java.util.Deque; import java.util.Iterator; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; /** * The manager to initialize singletons in some order. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/MemoryMonitoring.java b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/MemoryMonitoring.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/monitoring/MemoryMonitoring.java rename to rlib-common/src/main/java/javasabr/rlib/common/monitoring/MemoryMonitoring.java index 2dd5d505..0d3ff62c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/MemoryMonitoring.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/MemoryMonitoring.java @@ -1,13 +1,12 @@ -package com.ss.rlib.common.monitoring; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.monitoring; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import java.lang.management.MemoryPoolMXBean; import java.lang.management.MemoryUsage; import java.util.List; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class to monitor memory usage. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/MonitoringManager.java b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/MonitoringManager.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/monitoring/MonitoringManager.java rename to rlib-common/src/main/java/javasabr/rlib/common/monitoring/MonitoringManager.java index 3c8c8025..6cace892 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/MonitoringManager.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/MonitoringManager.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.monitoring; +package javasabr.rlib.common.monitoring; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/RuntimeMonitoring.java b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/RuntimeMonitoring.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/monitoring/RuntimeMonitoring.java rename to rlib-common/src/main/java/javasabr/rlib/common/monitoring/RuntimeMonitoring.java index 44732565..24bee274 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/RuntimeMonitoring.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/RuntimeMonitoring.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.monitoring; +package javasabr.rlib.common.monitoring; import static java.lang.ThreadLocal.withInitial; -import org.jetbrains.annotations.NotNull; - import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.lang.management.RuntimeMXBean; import java.text.SimpleDateFormat; import java.util.Date; +import org.jetbrains.annotations.NotNull; /** * The class to monitor a runtime state of a java process. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/ThreadMonitoring.java b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/ThreadMonitoring.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/monitoring/ThreadMonitoring.java rename to rlib-common/src/main/java/javasabr/rlib/common/monitoring/ThreadMonitoring.java index 1cedbf79..b62e28c2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/monitoring/ThreadMonitoring.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/monitoring/ThreadMonitoring.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.monitoring; +package javasabr.rlib.common.monitoring; /** * The type Thread monitoring. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/ConfigurablePluginSystem.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/ConfigurablePluginSystem.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/ConfigurablePluginSystem.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/ConfigurablePluginSystem.java index 469afc76..1999270f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/ConfigurablePluginSystem.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/ConfigurablePluginSystem.java @@ -1,11 +1,10 @@ -package com.ss.rlib.common.plugin; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.plugin; import java.nio.file.Path; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The interface to implement configurable plugin system. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/Plugin.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/Plugin.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/Plugin.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/Plugin.java index 7f2c190a..c51298f4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/Plugin.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/Plugin.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.plugin; +package javasabr.rlib.common.plugin; -import com.ss.rlib.common.plugin.annotation.PluginDescription; +import javasabr.rlib.common.plugin.annotation.PluginDescription; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/PluginContainer.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/PluginContainer.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/PluginContainer.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/PluginContainer.java index 4e8415dd..db63fced 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/PluginContainer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/PluginContainer.java @@ -1,11 +1,10 @@ -package com.ss.rlib.common.plugin; - -import com.ss.rlib.common.classpath.ClassPathScanner; -import com.ss.rlib.common.plugin.annotation.PluginDescription; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.plugin; import java.net.URLClassLoader; import java.nio.file.Path; +import javasabr.rlib.common.classpath.ClassPathScanner; +import javasabr.rlib.common.plugin.annotation.PluginDescription; +import org.jetbrains.annotations.NotNull; /** * The implementation of a plugin container. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/PluginSystem.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/PluginSystem.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/PluginSystem.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/PluginSystem.java index 903a5d3c..57d3658b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/PluginSystem.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/PluginSystem.java @@ -1,11 +1,10 @@ -package com.ss.rlib.common.plugin; +package javasabr.rlib.common.plugin; -import com.ss.rlib.common.util.array.Array; +import java.util.Optional; +import javasabr.rlib.common.util.array.Array; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; - /** * The interface to implement a plugin system. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/Version.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/Version.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/Version.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/Version.java index 7daa4c8a..1459e4e8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/Version.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/Version.java @@ -1,10 +1,10 @@ -package com.ss.rlib.common.plugin; +package javasabr.rlib.common.plugin; import static java.lang.Math.min; -import com.ss.rlib.common.util.ArrayUtils; -import org.jetbrains.annotations.NotNull; import java.util.stream.Stream; +import javasabr.rlib.common.util.ArrayUtils; +import org.jetbrains.annotations.NotNull; /** * The class to present a version. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/annotation/PluginDescription.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/annotation/PluginDescription.java similarity index 81% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/annotation/PluginDescription.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/annotation/PluginDescription.java index a86935bf..cd98eef5 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/annotation/PluginDescription.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/annotation/PluginDescription.java @@ -1,9 +1,12 @@ -package com.ss.rlib.common.plugin.annotation; +package javasabr.rlib.common.plugin.annotation; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.jetbrains.annotations.NotNull; -import java.lang.annotation.*; - /** * The annotation to describe a plugin. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/InitializePluginException.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/InitializePluginException.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/InitializePluginException.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/InitializePluginException.java index 1875a040..6c68360a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/InitializePluginException.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/InitializePluginException.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.plugin.exception; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.plugin.exception; import java.nio.file.Path; +import org.jetbrains.annotations.NotNull; /** * The exception about problems with initializing plugins. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/PluginException.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/PluginException.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/PluginException.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/PluginException.java index 9c792a77..7784f4eb 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/PluginException.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/PluginException.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.plugin.exception; +package javasabr.rlib.common.plugin.exception; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/PreloadPluginException.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/PreloadPluginException.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/PreloadPluginException.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/PreloadPluginException.java index 62dc0022..5f7e465f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/exception/PreloadPluginException.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/exception/PreloadPluginException.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.plugin.exception; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.plugin.exception; import java.nio.file.Path; +import org.jetbrains.annotations.NotNull; /** * The exception about problems with pre-loading plugins. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/extension/ExtensionPoint.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/extension/ExtensionPoint.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/extension/ExtensionPoint.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/extension/ExtensionPoint.java index 3048b1fa..4dcedaa9 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/extension/ExtensionPoint.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/extension/ExtensionPoint.java @@ -1,11 +1,12 @@ -package com.ss.rlib.common.plugin.extension; - -import com.ss.rlib.common.function.TriplePredicate; -import com.ss.rlib.common.util.ArrayUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.*; +package javasabr.rlib.common.plugin.extension; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Spliterator; +import java.util.Spliterators; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import java.util.function.BiPredicate; @@ -13,6 +14,10 @@ import java.util.function.Predicate; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import javasabr.rlib.common.function.TriplePredicate; +import javasabr.rlib.common.util.ArrayUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class to present an extension point. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/extension/ExtensionPointManager.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/extension/ExtensionPointManager.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/extension/ExtensionPointManager.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/extension/ExtensionPointManager.java index 2e6a6b6f..4e06a1ef 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/extension/ExtensionPointManager.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/extension/ExtensionPointManager.java @@ -1,11 +1,11 @@ -package com.ss.rlib.common.plugin.extension; - -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.dictionary.ConcurrentObjectDictionary; -import com.ss.rlib.common.util.dictionary.DictionaryFactory; -import com.ss.rlib.common.util.dictionary.ObjectDictionary; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; +package javasabr.rlib.common.plugin.extension; + +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.dictionary.ConcurrentObjectDictionary; +import javasabr.rlib.common.util.dictionary.DictionaryFactory; +import javasabr.rlib.common.util.dictionary.ObjectDictionary; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/BasePlugin.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/BasePlugin.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/BasePlugin.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/BasePlugin.java index e450d5a9..0e716ddc 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/BasePlugin.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/BasePlugin.java @@ -1,9 +1,9 @@ -package com.ss.rlib.common.plugin.impl; +package javasabr.rlib.common.plugin.impl; -import com.ss.rlib.common.plugin.Plugin; -import com.ss.rlib.common.plugin.PluginContainer; -import com.ss.rlib.common.plugin.PluginSystem; -import com.ss.rlib.common.plugin.Version; +import javasabr.rlib.common.plugin.Plugin; +import javasabr.rlib.common.plugin.PluginContainer; +import javasabr.rlib.common.plugin.PluginSystem; +import javasabr.rlib.common.plugin.Version; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/BasePluginSystem.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/BasePluginSystem.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/BasePluginSystem.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/BasePluginSystem.java index 3d6f26e8..2f3becad 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/BasePluginSystem.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/BasePluginSystem.java @@ -1,25 +1,10 @@ -package com.ss.rlib.common.plugin.impl; +package javasabr.rlib.common.plugin.impl; -import static com.ss.rlib.common.util.ObjectUtils.notNull; -import static com.ss.rlib.common.util.array.ArrayCollectors.toArray; -import static com.ss.rlib.common.util.dictionary.DictionaryCollectors.toObjectDictionary; import static java.lang.StackWalker.Option.RETAIN_CLASS_REFERENCE; import static java.util.concurrent.CompletableFuture.supplyAsync; -import com.ss.rlib.common.classpath.ClassPathScannerFactory; -import com.ss.rlib.common.plugin.*; -import com.ss.rlib.common.plugin.annotation.PluginDescription; -import com.ss.rlib.common.plugin.exception.InitializePluginException; -import com.ss.rlib.common.plugin.exception.PluginException; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.FileUtils; -import com.ss.rlib.common.util.Utils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.dictionary.ObjectDictionary; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import static javasabr.rlib.common.util.ObjectUtils.notNull; +import static javasabr.rlib.common.util.array.ArrayCollectors.toArray; +import static javasabr.rlib.common.util.dictionary.DictionaryCollectors.toObjectDictionary; import java.net.URI; import java.net.URL; @@ -33,6 +18,25 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import javasabr.rlib.common.classpath.ClassPathScannerFactory; +import javasabr.rlib.common.plugin.ConfigurablePluginSystem; +import javasabr.rlib.common.plugin.Plugin; +import javasabr.rlib.common.plugin.PluginContainer; +import javasabr.rlib.common.plugin.PluginSystem; +import javasabr.rlib.common.plugin.Version; +import javasabr.rlib.common.plugin.annotation.PluginDescription; +import javasabr.rlib.common.plugin.exception.InitializePluginException; +import javasabr.rlib.common.plugin.exception.PluginException; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.FileUtils; +import javasabr.rlib.common.util.Utils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.dictionary.ObjectDictionary; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of the {@link PluginSystem}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/PluginSystemFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/PluginSystemFactory.java similarity index 81% rename from rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/PluginSystemFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/PluginSystemFactory.java index 225ee771..d9ffd30c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/plugin/impl/PluginSystemFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/plugin/impl/PluginSystemFactory.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.plugin.impl; +package javasabr.rlib.common.plugin.impl; -import com.ss.rlib.common.plugin.ConfigurablePluginSystem; +import javasabr.rlib.common.plugin.ConfigurablePluginSystem; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ArrayUtils.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ArrayUtils.java index 52898285..799bb234 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ArrayUtils.java @@ -1,15 +1,30 @@ -package com.ss.rlib.common.util; - -import com.ss.rlib.common.function.*; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.IntegerArray; -import com.ss.rlib.common.util.array.LongArray; +package javasabr.rlib.common.util; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Objects; +import java.util.function.BiConsumer; +import java.util.function.BiPredicate; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.IntFunction; +import java.util.function.Predicate; +import java.util.function.Supplier; +import javasabr.rlib.common.function.CharSupplier; +import javasabr.rlib.common.function.DoubleObjectConsumer; +import javasabr.rlib.common.function.IntObjectConsumer; +import javasabr.rlib.common.function.ObjectIntPredicate; +import javasabr.rlib.common.function.ObjectLongPredicate; +import javasabr.rlib.common.function.TripleConsumer; +import javasabr.rlib.common.function.TripleFunction; +import javasabr.rlib.common.function.TriplePredicate; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.IntegerArray; +import javasabr.rlib.common.util.array.LongArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; -import java.util.function.*; - /** * The utility class. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/AsyncUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/AsyncUtils.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/AsyncUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/AsyncUtils.java index 19708780..f7cee55c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/AsyncUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/AsyncUtils.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; +import java.util.concurrent.CompletionException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.concurrent.CompletionException; - /** * @author JavaSaBr */ diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/BufferUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/BufferUtils.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/BufferUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/BufferUtils.java index 295c087f..6c3a1af1 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/BufferUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/BufferUtils.java @@ -1,7 +1,4 @@ -package com.ss.rlib.common.util; - -import lombok.experimental.UtilityClass; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util; import java.io.IOException; import java.io.UncheckedIOException; @@ -12,6 +9,8 @@ import java.nio.file.StandardOpenOption; import java.util.EnumSet; import java.util.function.Consumer; +import lombok.experimental.UtilityClass; +import org.jetbrains.annotations.NotNull; /** * The utility class. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ClassUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ClassUtils.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ClassUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ClassUtils.java index f0f8f973..abf7b72c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ClassUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ClassUtils.java @@ -1,13 +1,13 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; import static java.lang.Class.forName; -import com.ss.rlib.logger.api.LoggerManager; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class with utility methods. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/Copyable.java b/rlib-common/src/main/java/javasabr/rlib/common/util/Copyable.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/util/Copyable.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/Copyable.java index 0c7f6562..0817426d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/Copyable.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/Copyable.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; /** * The interface for implementing the copy method of this object. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/CycleBuffer.java b/rlib-common/src/main/java/javasabr/rlib/common/util/CycleBuffer.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/CycleBuffer.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/CycleBuffer.java index d408ead0..979f464a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/CycleBuffer.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/CycleBuffer.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util; import java.util.function.Consumer; import java.util.function.Supplier; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The implementation of cycle buffer of some objects. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/DateUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/DateUtils.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/DateUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/DateUtils.java index 9e9131e2..0a5c8ec1 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/DateUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/DateUtils.java @@ -1,8 +1,6 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.time.Instant; import java.time.LocalDate; @@ -10,6 +8,8 @@ import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class with utility methods to work with dates and times. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ExtMath.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ExtMath.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ExtMath.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ExtMath.java index 419717a4..18d00505 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ExtMath.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ExtMath.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; -import com.ss.rlib.common.geom.Vector3f; +import javasabr.rlib.common.geom.Vector3f; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/FileUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/FileUtils.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/FileUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/FileUtils.java index fe42bc39..58882268 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/FileUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/FileUtils.java @@ -1,19 +1,25 @@ -package com.ss.rlib.common.util; - -import static com.ss.rlib.common.util.ObjectUtils.notNull; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayComparator; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.UnsafeArray; -import com.ss.rlib.logger.api.LoggerManager; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util; + +import static javasabr.rlib.common.util.ObjectUtils.notNull; -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UncheckedIOException; import java.net.URI; import java.net.URL; import java.nio.CharBuffer; -import java.nio.file.*; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.FileVisitor; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.StandardCopyOption; +import java.nio.file.WatchService; import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.FileAttribute; import java.nio.file.attribute.FileTime; @@ -26,6 +32,13 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import java.util.zip.ZipInputStream; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayComparator; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.UnsafeArray; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The utility class. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/HasName.java b/rlib-common/src/main/java/javasabr/rlib/common/util/HasName.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/HasName.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/HasName.java index 5d36bae4..936f977d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/HasName.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/HasName.java @@ -1,19 +1,19 @@ -package com.ss.rlib.common.util; - -import org.jetbrains.annotations.NotNull; - -/** - * The interface to mark an object that it has a name. - * - * @author JavaSaBr - */ -public interface HasName { - - /** - * Gets name. - * - * @return the name of this object. - */ - @NotNull - String getName(); -} +package javasabr.rlib.common.util; + +import org.jetbrains.annotations.NotNull; + +/** + * The interface to mark an object that it has a name. + * + * @author JavaSaBr + */ +public interface HasName { + + /** + * Gets name. + * + * @return the name of this object. + */ + @NotNull + String getName(); +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/IOUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/IOUtils.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/IOUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/IOUtils.java index 0a28b015..e069538a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/IOUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/IOUtils.java @@ -1,13 +1,19 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; import static java.lang.ThreadLocal.withInitial; -import com.ss.rlib.common.function.SafeSupplier; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.io.*; +import java.io.Closeable; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.Reader; +import java.io.UncheckedIOException; import java.nio.CharBuffer; import java.nio.charset.StandardCharsets; +import javasabr.rlib.common.function.SafeSupplier; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class with utility methods. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/NumberUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/NumberUtils.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/NumberUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/NumberUtils.java index b9a6f9b1..335bbfb2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/NumberUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/NumberUtils.java @@ -1,409 +1,408 @@ -package com.ss.rlib.common.util; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Optional; -import java.util.function.Function; - -/** - * The utility class. - * - * @author JavaSaBr - */ -public final class NumberUtils { - - /** - * Get a short value from a byte array. - * - * @param bytes the byte array. - * @param offset the offset. - * @return the short value. - */ - public static short getShort(@NotNull byte[] bytes, int offset) { - return (short) (bytes[offset + 1] << 8 | bytes[offset] & 0xff); - } - - /** - * Return true if a string is not null and can be converted to a long. - * - * @param string the string to convert. - * @return if the string is not null and can be converted to a long. - * @since 9.3.0 - */ - public static boolean isLong(@Nullable String string) { - - if (string == null) { - return false; - } else { - try { - Long.parseLong(string); - return true; - } catch (NumberFormatException e) { - return false; - } - } - } - - /** - * Convert a string to int object or null if this string is null or not a number. - * - * @param string the string to convert. - * @return the int object or null. - * @since 9.4.0 - */ - public static @Nullable Integer safeToInt(@Nullable String string) { - - if (string == null) { - return null; - } else { - try { - return Integer.valueOf(string); - } catch (NumberFormatException e) { - return null; - } - } - } - - /** - * Convert a string to long object or null if this string is null or not a number. - * - * @param string the string to convert. - * @return the long object or null. - * @since 9.3.0 - */ - public static @Nullable Long safeToLong(@Nullable String string) { - - if (string == null) { - return null; - } else { - try { - return Long.valueOf(string); - } catch (NumberFormatException e) { - return null; - } - } - } - - /** - * Convert a string to long object. - * - * @param string the string to convert. - * @return the optional of long object. - * @since 9.3.0 - */ - public static @NotNull Optional toOptionalLong(@Nullable String string) { - - if (string == null) { - return Optional.empty(); - } else { - try { - return Optional.of(Long.valueOf(string)); - } catch (NumberFormatException e) { - return Optional.empty(); - } - } - } - - /** - * Set a bit in a number by a pos to 1. - * - * @param value the byte. - * @param pos the bit position. - * @return the update number. - * @since 9.4.0 - */ - public static int setBit(int value, int pos) { - return value | (1 << pos); - } - - /** - * Set a bit in a number by a pos to 0. - * - * @param value the byte. - * @param pos the bit position. - * @return the update number. - * @since 9.4.0 - */ - public static int unsetBit(int value, int pos) { - return value & ~(1 << pos); - } - - /** - * Return true if bit by pos in a byte is 1. - * - * @param value the byte. - * @param pos the bit position. - * @return true if the bit is 1. - * @since 9.4.0 - */ - public static boolean isSetBit(int value, int pos) { - return (value & (1L << pos)) != 0; - } - - /** - * Return true if bit by pos in a byte is 0. - * - * @param value the byte. - * @param pos the bit position. - * @return true if the bit is 0. - * @since 9.4.0 - */ - public static boolean isNotSetBit(int value, int pos) { - return (value & (1L << pos)) == 0; - } - - /** - * Set last high 4 bits to a byte. - * - * @param value the byte value. - * @return the result value with updating last high 4 bits. - * @since 9.4.0 - */ - public static int setHighByteBits(int value, int highBits) { - return value | highBits << 4; - } - - /** - * Get last high 4 bits from a byte. - * - * @param value the byte value. - * @return the value of last 4 high bits. - * @since 9.4.0 - */ - public static byte getHighByteBits(int value) { - return (byte) (value >> 4); - } - - /** - * Set first low 4 bits to a byte. - * - * @param value the byte value. - * @return the result value with updating first low 4 bits. - * @since 9.4.0 - */ - public static int setLowByteBits(int value, int lowBits) { - return value | lowBits & 0x0F; - } - - /** - * Get first low 4 bits from a byte. - * - * @param value the byte value. - * @return the value of last 4 low bits. - * @since 9.4.0 - */ - public static byte getLowByteBits(int value) { - return (byte) (value & 0x0F); - } - - /** - * Validate a number and throw an exception when the number is not valid. - * - * @param value the value. - * @param min the min number. - * @param max the max number. - * @return the passed number. - * @since 9.5.0 - */ - public static int validate(int value, int min, int max) { - return validate(value, min, max, IllegalArgumentException::new); - } - - /** - * Validate a number and throw an exception when the number is not valid. - * - * @param value the value. - * @param min the min number. - * @param max the max number. - * @param exceptionFactory the exception factory. - * @return the passed number. - * @since 9.5.0 - */ - public static int validate( - int value, - int min, - int max, - @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory - ) { - if (value < min || value > max) { - throw exceptionFactory.apply("Invalid value: " + value + " when should be " + min + " < v < " + max); - } else { - return value; - } - } - - /** - * Validate a number and throw an exception when the number is not valid. - * - * @param value the validated value. - * @param min the min number. - * @param max the max number. - * @return the passed number. - * @since 9.5.0 - */ - public static long validate(long value, long min, long max) { - return validate(value, min, max, IllegalArgumentException::new); - } - - /** - * Validate a number and throw an exception when the number is not valid. - * - * @param value the validated value. - * @param min the min number. - * @param max the max number. - * @param exceptionFactory the exception factory. - * @return the passed number. - * @since 9.5.0 - */ - public static long validate( - long value, - long min, - long max, - @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory - ) { - if (value < min || value > max) { - throw exceptionFactory.apply("Invalid value: " + value + " when should be " + min + " < v < " + max); - } else { - return value; - } - } - - /** - * Convert a number to boolean which should be only 0 or 1 or throw an exception. - * - * @param value the validated value. - * @return the validated value. - */ - public static boolean toBoolean(int value) { - return toBoolean(value, IllegalArgumentException::new); - } - - /** - * Convert a number to boolean which should be only 0 or 1 or throw an exception. - * - * @param value the validated value. - * @return the validated value. - */ - public static boolean toBoolean(long value) { - return toBoolean(value, IllegalArgumentException::new); - } - - /** - * Convert a number to boolean which should be only 0 or 1 or throw an exception. - * - * @param value the validated value. - * @param exceptionFactory the exception factory. - * @return the validated value. - */ - public static boolean toBoolean( - int value, - @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory - ) { - if (value == 0 || value == 1) { - return value == 1; - } else { - throw exceptionFactory.apply("Invalid value: " + value + " when should be only 0 or 1"); - } - } - - /** - * Convert a number to boolean which should be only 0 or 1 or throw an exception. - * - * @param value the validated value. - * @param exceptionFactory the exception factory. - * @return the validated value. - */ - public static boolean toBoolean( - long value, - @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory - ) { - if (value == 0 || value == 1) { - return value == 1; - } else { - throw exceptionFactory.apply("Invalid value: " + value + " when should be only 0 or 1"); - } - } - - /** - * Returns {@code true} if the numbers are equal to each other - * and {@code false} otherwise. - * - * @param first the first number. - * @param second the second number to be compared with {@code first} for equality. - * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. - * @since 9.7.0 - */ - public static boolean equals(byte first, byte second) { - return first == second; - } - - /** - * Returns {@code true} if the numbers are equal to each other - * and {@code false} otherwise. - * - * @param first the first number. - * @param second the second number to be compared with {@code first} for equality. - * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. - * @since 9.7.0 - */ - public static boolean equals(short first, short second) { - return first == second; - } - - /** - * Returns {@code true} if the numbers are equal to each other - * and {@code false} otherwise. - * - * @param first the first number. - * @param second the second number to be compared with {@code first} for equality. - * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. - * @since 9.7.0 - */ - public static boolean equals(int first, int second) { - return first == second; - } - - /** - * Returns {@code true} if the numbers are equal to each other - * and {@code false} otherwise. - * - * @param first the first number. - * @param second the second number to be compared with {@code first} for equality. - * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. - * @since 9.7.0 - */ - public static boolean equals(long first, long second) { - return first == second; - } - - /** - * Returns {@code true} if the numbers are equal to each other - * and {@code false} otherwise. - * - * @param first the first number. - * @param second the second number to be compared with {@code first} for equality. - * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. - * @since 9.7.0 - */ - public static boolean equals(float first, float second) { - return first == second; - } - - /** - * Returns {@code true} if the numbers are equal to each other - * and {@code false} otherwise. - * - * @param first the first number. - * @param second the second number to be compared with {@code first} for equality. - * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. - * @since 9.7.0 - */ - public static boolean equals(double first, double second) { - return first == second; - } - - private NumberUtils() { - throw new IllegalArgumentException(); - } -} +package javasabr.rlib.common.util; + +import java.util.Optional; +import java.util.function.Function; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * The utility class. + * + * @author JavaSaBr + */ +public final class NumberUtils { + + /** + * Get a short value from a byte array. + * + * @param bytes the byte array. + * @param offset the offset. + * @return the short value. + */ + public static short getShort(@NotNull byte[] bytes, int offset) { + return (short) (bytes[offset + 1] << 8 | bytes[offset] & 0xff); + } + + /** + * Return true if a string is not null and can be converted to a long. + * + * @param string the string to convert. + * @return if the string is not null and can be converted to a long. + * @since 9.3.0 + */ + public static boolean isLong(@Nullable String string) { + + if (string == null) { + return false; + } else { + try { + Long.parseLong(string); + return true; + } catch (NumberFormatException e) { + return false; + } + } + } + + /** + * Convert a string to int object or null if this string is null or not a number. + * + * @param string the string to convert. + * @return the int object or null. + * @since 9.4.0 + */ + public static @Nullable Integer safeToInt(@Nullable String string) { + + if (string == null) { + return null; + } else { + try { + return Integer.valueOf(string); + } catch (NumberFormatException e) { + return null; + } + } + } + + /** + * Convert a string to long object or null if this string is null or not a number. + * + * @param string the string to convert. + * @return the long object or null. + * @since 9.3.0 + */ + public static @Nullable Long safeToLong(@Nullable String string) { + + if (string == null) { + return null; + } else { + try { + return Long.valueOf(string); + } catch (NumberFormatException e) { + return null; + } + } + } + + /** + * Convert a string to long object. + * + * @param string the string to convert. + * @return the optional of long object. + * @since 9.3.0 + */ + public static @NotNull Optional toOptionalLong(@Nullable String string) { + + if (string == null) { + return Optional.empty(); + } else { + try { + return Optional.of(Long.valueOf(string)); + } catch (NumberFormatException e) { + return Optional.empty(); + } + } + } + + /** + * Set a bit in a number by a pos to 1. + * + * @param value the byte. + * @param pos the bit position. + * @return the update number. + * @since 9.4.0 + */ + public static int setBit(int value, int pos) { + return value | (1 << pos); + } + + /** + * Set a bit in a number by a pos to 0. + * + * @param value the byte. + * @param pos the bit position. + * @return the update number. + * @since 9.4.0 + */ + public static int unsetBit(int value, int pos) { + return value & ~(1 << pos); + } + + /** + * Return true if bit by pos in a byte is 1. + * + * @param value the byte. + * @param pos the bit position. + * @return true if the bit is 1. + * @since 9.4.0 + */ + public static boolean isSetBit(int value, int pos) { + return (value & (1L << pos)) != 0; + } + + /** + * Return true if bit by pos in a byte is 0. + * + * @param value the byte. + * @param pos the bit position. + * @return true if the bit is 0. + * @since 9.4.0 + */ + public static boolean isNotSetBit(int value, int pos) { + return (value & (1L << pos)) == 0; + } + + /** + * Set last high 4 bits to a byte. + * + * @param value the byte value. + * @return the result value with updating last high 4 bits. + * @since 9.4.0 + */ + public static int setHighByteBits(int value, int highBits) { + return value | highBits << 4; + } + + /** + * Get last high 4 bits from a byte. + * + * @param value the byte value. + * @return the value of last 4 high bits. + * @since 9.4.0 + */ + public static byte getHighByteBits(int value) { + return (byte) (value >> 4); + } + + /** + * Set first low 4 bits to a byte. + * + * @param value the byte value. + * @return the result value with updating first low 4 bits. + * @since 9.4.0 + */ + public static int setLowByteBits(int value, int lowBits) { + return value | lowBits & 0x0F; + } + + /** + * Get first low 4 bits from a byte. + * + * @param value the byte value. + * @return the value of last 4 low bits. + * @since 9.4.0 + */ + public static byte getLowByteBits(int value) { + return (byte) (value & 0x0F); + } + + /** + * Validate a number and throw an exception when the number is not valid. + * + * @param value the value. + * @param min the min number. + * @param max the max number. + * @return the passed number. + * @since 9.5.0 + */ + public static int validate(int value, int min, int max) { + return validate(value, min, max, IllegalArgumentException::new); + } + + /** + * Validate a number and throw an exception when the number is not valid. + * + * @param value the value. + * @param min the min number. + * @param max the max number. + * @param exceptionFactory the exception factory. + * @return the passed number. + * @since 9.5.0 + */ + public static int validate( + int value, + int min, + int max, + @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory + ) { + if (value < min || value > max) { + throw exceptionFactory.apply("Invalid value: " + value + " when should be " + min + " < v < " + max); + } else { + return value; + } + } + + /** + * Validate a number and throw an exception when the number is not valid. + * + * @param value the validated value. + * @param min the min number. + * @param max the max number. + * @return the passed number. + * @since 9.5.0 + */ + public static long validate(long value, long min, long max) { + return validate(value, min, max, IllegalArgumentException::new); + } + + /** + * Validate a number and throw an exception when the number is not valid. + * + * @param value the validated value. + * @param min the min number. + * @param max the max number. + * @param exceptionFactory the exception factory. + * @return the passed number. + * @since 9.5.0 + */ + public static long validate( + long value, + long min, + long max, + @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory + ) { + if (value < min || value > max) { + throw exceptionFactory.apply("Invalid value: " + value + " when should be " + min + " < v < " + max); + } else { + return value; + } + } + + /** + * Convert a number to boolean which should be only 0 or 1 or throw an exception. + * + * @param value the validated value. + * @return the validated value. + */ + public static boolean toBoolean(int value) { + return toBoolean(value, IllegalArgumentException::new); + } + + /** + * Convert a number to boolean which should be only 0 or 1 or throw an exception. + * + * @param value the validated value. + * @return the validated value. + */ + public static boolean toBoolean(long value) { + return toBoolean(value, IllegalArgumentException::new); + } + + /** + * Convert a number to boolean which should be only 0 or 1 or throw an exception. + * + * @param value the validated value. + * @param exceptionFactory the exception factory. + * @return the validated value. + */ + public static boolean toBoolean( + int value, + @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory + ) { + if (value == 0 || value == 1) { + return value == 1; + } else { + throw exceptionFactory.apply("Invalid value: " + value + " when should be only 0 or 1"); + } + } + + /** + * Convert a number to boolean which should be only 0 or 1 or throw an exception. + * + * @param value the validated value. + * @param exceptionFactory the exception factory. + * @return the validated value. + */ + public static boolean toBoolean( + long value, + @NotNull Function<@NotNull String, @NotNull RuntimeException> exceptionFactory + ) { + if (value == 0 || value == 1) { + return value == 1; + } else { + throw exceptionFactory.apply("Invalid value: " + value + " when should be only 0 or 1"); + } + } + + /** + * Returns {@code true} if the numbers are equal to each other + * and {@code false} otherwise. + * + * @param first the first number. + * @param second the second number to be compared with {@code first} for equality. + * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. + * @since 9.7.0 + */ + public static boolean equals(byte first, byte second) { + return first == second; + } + + /** + * Returns {@code true} if the numbers are equal to each other + * and {@code false} otherwise. + * + * @param first the first number. + * @param second the second number to be compared with {@code first} for equality. + * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. + * @since 9.7.0 + */ + public static boolean equals(short first, short second) { + return first == second; + } + + /** + * Returns {@code true} if the numbers are equal to each other + * and {@code false} otherwise. + * + * @param first the first number. + * @param second the second number to be compared with {@code first} for equality. + * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. + * @since 9.7.0 + */ + public static boolean equals(int first, int second) { + return first == second; + } + + /** + * Returns {@code true} if the numbers are equal to each other + * and {@code false} otherwise. + * + * @param first the first number. + * @param second the second number to be compared with {@code first} for equality. + * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. + * @since 9.7.0 + */ + public static boolean equals(long first, long second) { + return first == second; + } + + /** + * Returns {@code true} if the numbers are equal to each other + * and {@code false} otherwise. + * + * @param first the first number. + * @param second the second number to be compared with {@code first} for equality. + * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. + * @since 9.7.0 + */ + public static boolean equals(float first, float second) { + return first == second; + } + + /** + * Returns {@code true} if the numbers are equal to each other + * and {@code false} otherwise. + * + * @param first the first number. + * @param second the second number to be compared with {@code first} for equality. + * @return {@code true} if the arguments are equal to each other and {@code false} otherwise. + * @since 9.7.0 + */ + public static boolean equals(double first, double second) { + return first == second; + } + + private NumberUtils() { + throw new IllegalArgumentException(); + } +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ObjectUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ObjectUtils.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ObjectUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ObjectUtils.java index 8ba54576..042a9c00 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ObjectUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ObjectUtils.java @@ -1,13 +1,12 @@ -package com.ss.rlib.common.util; - -import com.ss.rlib.common.util.pools.Reusable; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util; import java.util.Objects; import java.util.function.Function; import java.util.function.LongFunction; import java.util.function.Supplier; +import javasabr.rlib.common.util.pools.Reusable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class with utility methods. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/PropertyLoader.java b/rlib-common/src/main/java/javasabr/rlib/common/util/PropertyLoader.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/PropertyLoader.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/PropertyLoader.java index 5b233558..1a74d5fc 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/PropertyLoader.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/PropertyLoader.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; import java.io.IOException; import java.io.InputStream; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ReflectionUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ReflectionUtils.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ReflectionUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ReflectionUtils.java index 1323efef..ac2357e6 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ReflectionUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ReflectionUtils.java @@ -1,417 +1,417 @@ -package com.ss.rlib.common.util; - -import static com.ss.rlib.common.util.ArrayUtils.contains; -import com.ss.rlib.common.util.array.Array; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -/** - * The class with utility reflection methods. - * - * @author JavaSaBr - */ -public final class ReflectionUtils { - - /** - * Get all fields of the class. - * - * @param container the field container. - * @param startClass the class. - * @param lastClass the last class. - * @param declared the flag to get private fields as well. - * @param exceptions exception fields. - */ - public static void addAllFields( - @NotNull Array container, - @NotNull Class startClass, - @NotNull Class lastClass, - boolean declared, - @NotNull String... exceptions - ) { - - var next = startClass; - - while (next != null && next != lastClass) { - - var fields = declared ? next.getDeclaredFields() : next.getFields(); - - next = next.getSuperclass(); - - if (fields.length < 1) { - continue; - } - - if (exceptions.length < 1) { - container.addAll(fields); - } else { - ArrayUtils.forEach(fields, toCheck -> !contains(exceptions, toCheck.getName()), container::add); - } - } - } - - /** - * Get all fields of a class. - * - * @param cs the class. - * @param exceptions exception fields. - * @return the all declared fields. - * @since 9.9.0 - */ - public static @NotNull Array getAllDeclaredFields(@NotNull Class cs, @NotNull String... exceptions) { - var container = Array.ofType(Field.class); - addAllFields(container, cs, Object.class, true, exceptions); - return container; - } - - /** - * Get all fields of the class. - * - * @param cs the class. - * @param last the last class. - * @param declared the flag of getting private fields. - * @param exceptions exception fields. - * @return the all fields - */ - public static @NotNull Array getAllFields( - @NotNull Class cs, - @NotNull Class last, - boolean declared, - @NotNull String... exceptions - ) { - var container = Array.ofType(Field.class); - addAllFields(container, cs, last, declared, exceptions); - return container; - } - - /** - * Get a field by the name from the type. - * - * @param type the type. - * @param fieldName the field name. - * @return the field. - */ - public static @NotNull Field getField(@NotNull Class type, @NotNull String fieldName) { - try { - return type.getDeclaredField(fieldName); - } catch (NoSuchFieldException | SecurityException | IllegalArgumentException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a field by the name from the type of the object. - * - * @param object the object. - * @param fieldName the field name. - * @return the field. - */ - public static @NotNull Field getField(@NotNull Object object, @NotNull String fieldName) { - return getField(object.getClass(), fieldName); - } - - /** - * Get a field by the name with full access from the type. - * - * @param type the type. - * @param fieldName the field name. - * @return the field. - */ - public static @NotNull Field getUnsafeField(@NotNull Class type, @NotNull String fieldName) { - try { - Field field = getField(type, fieldName); - field.setAccessible(true); - return field; - } catch (SecurityException | IllegalArgumentException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a field by the name with full access. - * - * @param object the object. - * @param fieldName the field name. - * @return the field. - */ - public static @NotNull Field getUnsafeField(@NotNull Object object, @NotNull String fieldName) { - return getUnsafeField(object.getClass(), fieldName); - } - - /** - * Get a field value by the field name. - * - * @param the result value's type. - * @param object the object. - * @param fieldName the field name. - * @return the value. - */ - public static @Nullable T getFiledValue(@NotNull Object object, @NotNull String fieldName) { - try { - Field field = getField(object, fieldName); - return ClassUtils.unsafeCast(field.get(object)); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a field value by the field name with full access. - * - * @param the result value's type. - * @param object the object. - * @param fieldName the field name. - * @return the value. - */ - public static @Nullable T getUnsafeFieldValue(@NotNull final Object object, @NotNull final String fieldName) { - try { - final Field field = getUnsafeField(object, fieldName); - return ClassUtils.unsafeCast(field.get(object)); - } catch (final SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a field value. - * - * @param the result value's type. - * @param object the object. - * @param field the field. - * @return the value. - */ - public static @Nullable T getFieldValue(@NotNull Object object, @NotNull Field field) { - try { - return ClassUtils.unsafeCast(field.get(object)); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Set a field value. - * - * @param object the object. - * @param fieldName the field name. - * @param value the value. - */ - public static void setFieldValue(@NotNull Object object, @NotNull String fieldName, @NotNull Object value) { - try { - Field field = getField(object, fieldName); - field.set(object, value); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Set a field value using full access. - * - * @param object the object. - * @param fieldName the field name. - * @param value the value. - */ - public static void setUnsafeFieldValue(@NotNull Object object, @NotNull String fieldName, @NotNull Object value) { - try { - Field field = getUnsafeField(object, fieldName); - field.set(object, value); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Set a field value. - * - * @param object the object. - * @param field the field. - * @param value the value. - */ - public static void setFieldValue(@NotNull Object object, @NotNull Field field, @NotNull Object value) { - try { - field.set(object, value); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a static field. - * - * @param type the class. - * @param fieldName the field name. - * @return the static field. - */ - public static @NotNull Field getStaticField(@NotNull Class type, @NotNull String fieldName) { - try { - return type.getDeclaredField(fieldName); - } catch (NoSuchFieldException | SecurityException | IllegalArgumentException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a static field using full access. - * - * @param type the class. - * @param fieldName the field name. - * @return the static field. - */ - public static @NotNull Field getUnsafeStaticField(@NotNull Class type, @NotNull String fieldName) { - try { - Field field = getStaticField(type, fieldName); - field.setAccessible(true); - return field; - } catch (SecurityException | IllegalArgumentException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a static field value. - * - * @param the type parameter - * @param type the class. - * @param fieldName the field name. - * @return the value. - */ - public static @Nullable T getStaticFieldValue(@NotNull Class type, @NotNull String fieldName) { - try { - Field field = getStaticField(type, fieldName); - return ClassUtils.unsafeCast(field.get(null)); - } catch (final SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a static field value using full access. - * - * @param the type parameter - * @param type the class. - * @param fieldName the field name. - * @return the value. - */ - public static @Nullable T getUnsafeStaticFieldValue(@NotNull Class type, @NotNull String fieldName) { - try { - Field field = getUnsafeStaticField(type, fieldName); - return ClassUtils.unsafeCast(field.get(null)); - } catch (final SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a static field value. - * - * @param the type parameter - * @param field the field. - * @return the value. - */ - public static @Nullable T getStaticFieldValue(@NotNull Field field) { - try { - return ClassUtils.unsafeCast(field.get(null)); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Set a static field value. - * - * @param type the class. - * @param fieldName the field name. - * @param value the new value. - */ - public static void setStaticFieldValue(@NotNull Class type, @NotNull String fieldName, @NotNull Object value) { - try { - Field field = getStaticField(type, fieldName); - field.set(null, value); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Set a static field value. - * - * @param type the class. - * @param fieldName thr field name. - * @param value the new value. - */ - public static void setUnsafeStaticFieldValue(@NotNull Class type, @NotNull String fieldName, @NotNull Object value) { - try { - Field field = getUnsafeStaticField(type, fieldName); - field.set(null, value); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Change a static field value. - * - * @param field the field. - * @param value the new value. - */ - public static void setStaticFieldValue(@NotNull Field field, @NotNull Object value) { - try { - field.set(null, value); - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - /** - * Get a method of the type by the method name and arg types. - * - * @param type the type. - * @param methodName the method name. - * @param argTypes the arg types. - * @return the found method. - */ - public static @NotNull Method getMethod(@NotNull Class type, @NotNull String methodName, Class... argTypes) { - try { - return type.getDeclaredMethod(methodName, argTypes); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } - } - - /** - * Call a void method of the object by the name. - * - * @param object the object. - * @param methodName the method name. - */ - public static void callVoidMethod(@NotNull Object object, @NotNull String methodName) { - try { - getMethod(object.getClass(), methodName).invoke(object); - } catch (IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException(e); - } - } - - /** - * Call a void method of the object by the name using full access. - * - * @param object the object. - * @param methodName the method name. - */ - public static void callUnsafeVoidMethod(@NotNull Object object, @NotNull String methodName) { - try { - Method method = getMethod(object.getClass(), methodName); - method.setAccessible(true); - method.invoke(object); - } catch (IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException(e); - } - } - - private ReflectionUtils() { - throw new IllegalArgumentException(); - } -} +package javasabr.rlib.common.util; + +import static javasabr.rlib.common.util.ArrayUtils.contains; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import javasabr.rlib.common.util.array.Array; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * The class with utility reflection methods. + * + * @author JavaSaBr + */ +public final class ReflectionUtils { + + /** + * Get all fields of the class. + * + * @param container the field container. + * @param startClass the class. + * @param lastClass the last class. + * @param declared the flag to get private fields as well. + * @param exceptions exception fields. + */ + public static void addAllFields( + @NotNull Array container, + @NotNull Class startClass, + @NotNull Class lastClass, + boolean declared, + @NotNull String... exceptions + ) { + + var next = startClass; + + while (next != null && next != lastClass) { + + var fields = declared ? next.getDeclaredFields() : next.getFields(); + + next = next.getSuperclass(); + + if (fields.length < 1) { + continue; + } + + if (exceptions.length < 1) { + container.addAll(fields); + } else { + ArrayUtils.forEach(fields, toCheck -> !contains(exceptions, toCheck.getName()), container::add); + } + } + } + + /** + * Get all fields of a class. + * + * @param cs the class. + * @param exceptions exception fields. + * @return the all declared fields. + * @since 9.9.0 + */ + public static @NotNull Array getAllDeclaredFields(@NotNull Class cs, @NotNull String... exceptions) { + var container = Array.ofType(Field.class); + addAllFields(container, cs, Object.class, true, exceptions); + return container; + } + + /** + * Get all fields of the class. + * + * @param cs the class. + * @param last the last class. + * @param declared the flag of getting private fields. + * @param exceptions exception fields. + * @return the all fields + */ + public static @NotNull Array getAllFields( + @NotNull Class cs, + @NotNull Class last, + boolean declared, + @NotNull String... exceptions + ) { + var container = Array.ofType(Field.class); + addAllFields(container, cs, last, declared, exceptions); + return container; + } + + /** + * Get a field by the name from the type. + * + * @param type the type. + * @param fieldName the field name. + * @return the field. + */ + public static @NotNull Field getField(@NotNull Class type, @NotNull String fieldName) { + try { + return type.getDeclaredField(fieldName); + } catch (NoSuchFieldException | SecurityException | IllegalArgumentException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a field by the name from the type of the object. + * + * @param object the object. + * @param fieldName the field name. + * @return the field. + */ + public static @NotNull Field getField(@NotNull Object object, @NotNull String fieldName) { + return getField(object.getClass(), fieldName); + } + + /** + * Get a field by the name with full access from the type. + * + * @param type the type. + * @param fieldName the field name. + * @return the field. + */ + public static @NotNull Field getUnsafeField(@NotNull Class type, @NotNull String fieldName) { + try { + Field field = getField(type, fieldName); + field.setAccessible(true); + return field; + } catch (SecurityException | IllegalArgumentException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a field by the name with full access. + * + * @param object the object. + * @param fieldName the field name. + * @return the field. + */ + public static @NotNull Field getUnsafeField(@NotNull Object object, @NotNull String fieldName) { + return getUnsafeField(object.getClass(), fieldName); + } + + /** + * Get a field value by the field name. + * + * @param the result value's type. + * @param object the object. + * @param fieldName the field name. + * @return the value. + */ + public static @Nullable T getFiledValue(@NotNull Object object, @NotNull String fieldName) { + try { + Field field = getField(object, fieldName); + return ClassUtils.unsafeCast(field.get(object)); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a field value by the field name with full access. + * + * @param the result value's type. + * @param object the object. + * @param fieldName the field name. + * @return the value. + */ + public static @Nullable T getUnsafeFieldValue(@NotNull final Object object, @NotNull final String fieldName) { + try { + final Field field = getUnsafeField(object, fieldName); + return ClassUtils.unsafeCast(field.get(object)); + } catch (final SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a field value. + * + * @param the result value's type. + * @param object the object. + * @param field the field. + * @return the value. + */ + public static @Nullable T getFieldValue(@NotNull Object object, @NotNull Field field) { + try { + return ClassUtils.unsafeCast(field.get(object)); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Set a field value. + * + * @param object the object. + * @param fieldName the field name. + * @param value the value. + */ + public static void setFieldValue(@NotNull Object object, @NotNull String fieldName, @NotNull Object value) { + try { + Field field = getField(object, fieldName); + field.set(object, value); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Set a field value using full access. + * + * @param object the object. + * @param fieldName the field name. + * @param value the value. + */ + public static void setUnsafeFieldValue(@NotNull Object object, @NotNull String fieldName, @NotNull Object value) { + try { + Field field = getUnsafeField(object, fieldName); + field.set(object, value); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Set a field value. + * + * @param object the object. + * @param field the field. + * @param value the value. + */ + public static void setFieldValue(@NotNull Object object, @NotNull Field field, @NotNull Object value) { + try { + field.set(object, value); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a static field. + * + * @param type the class. + * @param fieldName the field name. + * @return the static field. + */ + public static @NotNull Field getStaticField(@NotNull Class type, @NotNull String fieldName) { + try { + return type.getDeclaredField(fieldName); + } catch (NoSuchFieldException | SecurityException | IllegalArgumentException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a static field using full access. + * + * @param type the class. + * @param fieldName the field name. + * @return the static field. + */ + public static @NotNull Field getUnsafeStaticField(@NotNull Class type, @NotNull String fieldName) { + try { + Field field = getStaticField(type, fieldName); + field.setAccessible(true); + return field; + } catch (SecurityException | IllegalArgumentException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a static field value. + * + * @param the type parameter + * @param type the class. + * @param fieldName the field name. + * @return the value. + */ + public static @Nullable T getStaticFieldValue(@NotNull Class type, @NotNull String fieldName) { + try { + Field field = getStaticField(type, fieldName); + return ClassUtils.unsafeCast(field.get(null)); + } catch (final SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a static field value using full access. + * + * @param the type parameter + * @param type the class. + * @param fieldName the field name. + * @return the value. + */ + public static @Nullable T getUnsafeStaticFieldValue(@NotNull Class type, @NotNull String fieldName) { + try { + Field field = getUnsafeStaticField(type, fieldName); + return ClassUtils.unsafeCast(field.get(null)); + } catch (final SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a static field value. + * + * @param the type parameter + * @param field the field. + * @return the value. + */ + public static @Nullable T getStaticFieldValue(@NotNull Field field) { + try { + return ClassUtils.unsafeCast(field.get(null)); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Set a static field value. + * + * @param type the class. + * @param fieldName the field name. + * @param value the new value. + */ + public static void setStaticFieldValue(@NotNull Class type, @NotNull String fieldName, @NotNull Object value) { + try { + Field field = getStaticField(type, fieldName); + field.set(null, value); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Set a static field value. + * + * @param type the class. + * @param fieldName thr field name. + * @param value the new value. + */ + public static void setUnsafeStaticFieldValue(@NotNull Class type, @NotNull String fieldName, @NotNull Object value) { + try { + Field field = getUnsafeStaticField(type, fieldName); + field.set(null, value); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Change a static field value. + * + * @param field the field. + * @param value the new value. + */ + public static void setStaticFieldValue(@NotNull Field field, @NotNull Object value) { + try { + field.set(null, value); + } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + /** + * Get a method of the type by the method name and arg types. + * + * @param type the type. + * @param methodName the method name. + * @param argTypes the arg types. + * @return the found method. + */ + public static @NotNull Method getMethod(@NotNull Class type, @NotNull String methodName, Class... argTypes) { + try { + return type.getDeclaredMethod(methodName, argTypes); + } catch (NoSuchMethodException e) { + throw new RuntimeException(e); + } + } + + /** + * Call a void method of the object by the name. + * + * @param object the object. + * @param methodName the method name. + */ + public static void callVoidMethod(@NotNull Object object, @NotNull String methodName) { + try { + getMethod(object.getClass(), methodName).invoke(object); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new RuntimeException(e); + } + } + + /** + * Call a void method of the object by the name using full access. + * + * @param object the object. + * @param methodName the method name. + */ + public static void callUnsafeVoidMethod(@NotNull Object object, @NotNull String methodName) { + try { + Method method = getMethod(object.getClass(), methodName); + method.setAccessible(true); + method.invoke(object); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new RuntimeException(e); + } + } + + private ReflectionUtils() { + throw new IllegalArgumentException(); + } +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/Reloadable.java b/rlib-common/src/main/java/javasabr/rlib/common/util/Reloadable.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/util/Reloadable.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/Reloadable.java index 18f9594f..aefc53d6 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/Reloadable.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/Reloadable.java @@ -1,19 +1,19 @@ -package com.ss.rlib.common.util; - -import org.jetbrains.annotations.NotNull; - -/** - * The interface for implementing the method for reloading the object to new version of the object. - * - * @param the type parameter - * @author JavaSaBr - */ -public interface Reloadable { - - /** - * Reload this object to version of the object. - * - * @param updated the updated object. - */ - void reload(@NotNull E updated); -} +package javasabr.rlib.common.util; + +import org.jetbrains.annotations.NotNull; + +/** + * The interface for implementing the method for reloading the object to new version of the object. + * + * @param the type parameter + * @author JavaSaBr + */ +public interface Reloadable { + + /** + * Reload this object to version of the object. + * + * @param updated the updated object. + */ + void reload(@NotNull E updated); +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/StringUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/StringUtils.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/util/StringUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/StringUtils.java index c23c9a03..4166d1cd 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/StringUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/StringUtils.java @@ -1,7 +1,4 @@ -package com.ss.rlib.common.util; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util; import java.io.PrintWriter; import java.io.StringWriter; @@ -10,6 +7,8 @@ import java.security.NoSuchAlgorithmException; import java.util.concurrent.ThreadLocalRandom; import java.util.regex.Pattern; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The class with utility methods for working with strings. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/Utils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/Utils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java index ce9ca437..0deb7a99 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/Utils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/Utils.java @@ -1,9 +1,4 @@ -package com.ss.rlib.common.util; - -import com.ss.rlib.common.function.*; -import com.ss.rlib.logger.api.LoggerManager; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util; import java.io.File; import java.io.IOException; @@ -12,6 +7,17 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +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; +import javasabr.rlib.common.function.SafeRunnable; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The utility class. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/VarTable.java b/rlib-common/src/main/java/javasabr/rlib/common/util/VarTable.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/util/VarTable.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/VarTable.java index 3d4ddc5b..157bf47c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/VarTable.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/VarTable.java @@ -1,11 +1,12 @@ -package com.ss.rlib.common.util; +package javasabr.rlib.common.util; -import static com.ss.rlib.common.util.ObjectUtils.notNull; import static java.lang.Float.parseFloat; -import com.ss.rlib.common.geom.Quaternion4f; -import com.ss.rlib.common.geom.Vector3f; -import com.ss.rlib.common.util.dictionary.DictionaryFactory; -import com.ss.rlib.common.util.dictionary.ObjectDictionary; +import static javasabr.rlib.common.util.ObjectUtils.notNull; + +import javasabr.rlib.common.geom.Quaternion4f; +import javasabr.rlib.common.geom.Vector3f; +import javasabr.rlib.common.util.dictionary.DictionaryFactory; +import javasabr.rlib.common.util.dictionary.ObjectDictionary; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/Array.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/Array.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/Array.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/Array.java index b6aa035f..bcd1575b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/Array.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/Array.java @@ -1,21 +1,39 @@ -package com.ss.rlib.common.util.array; - -import static com.ss.rlib.common.util.ClassUtils.unsafeCast; -import static com.ss.rlib.common.util.ClassUtils.unsafeNNCast; -import com.ss.rlib.common.function.*; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.impl.DefaultArrayIterator; -import com.ss.rlib.common.util.pools.Reusable; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.array; + +import static javasabr.rlib.common.util.ClassUtils.unsafeCast; +import static javasabr.rlib.common.util.ClassUtils.unsafeNNCast; import java.io.Serializable; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Objects; +import java.util.Optional; +import java.util.RandomAccess; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; +import javasabr.rlib.common.function.BiIntPredicate; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullBiPredicate; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NotNullFloatBiObjectConsumer; +import javasabr.rlib.common.function.NotNullFunction; +import javasabr.rlib.common.function.NotNullFunctionInt; +import javasabr.rlib.common.function.NotNullIntBiObjectConsumer; +import javasabr.rlib.common.function.NotNullIntObjectPredicate; +import javasabr.rlib.common.function.NotNullLongBiObjectConsumer; +import javasabr.rlib.common.function.NotNullLongObjectPredicate; +import javasabr.rlib.common.function.NotNullPredicate; +import javasabr.rlib.common.function.NotNullSupplier; +import javasabr.rlib.common.function.NotNullTripleConsumer; +import javasabr.rlib.common.function.NotNullTriplePredicate; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.impl.DefaultArrayIterator; +import javasabr.rlib.common.util.pools.Reusable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Interface to implement dynamic arrays. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayCollectors.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayCollectors.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayCollectors.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayCollectors.java index 26d2a64d..b7013ea4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayCollectors.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayCollectors.java @@ -1,7 +1,6 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; import static java.util.Collections.unmodifiableSet; -import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.EnumSet; @@ -11,6 +10,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; +import org.jetbrains.annotations.NotNull; /** * The array collectors factory. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayComparator.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayComparator.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayComparator.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayComparator.java index a83dce81..ca40020f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayComparator.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayComparator.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; +import java.util.Comparator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Comparator; - /** * The interface to implement a comparator for {@link Array}. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayFactory.java similarity index 80% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayFactory.java index 215de1fb..cf197154 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayFactory.java @@ -1,8 +1,21 @@ -package com.ss.rlib.common.util.array; - -import static com.ss.rlib.common.util.ClassUtils.unsafeNNCast; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.impl.*; +package javasabr.rlib.common.util.array; + +import static javasabr.rlib.common.util.ClassUtils.unsafeNNCast; + +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.impl.ConcurrentAtomicARSWLockArray; +import javasabr.rlib.common.util.array.impl.ConcurrentReentrantRWLockArray; +import javasabr.rlib.common.util.array.impl.ConcurrentReentrantRWLockArraySet; +import javasabr.rlib.common.util.array.impl.ConcurrentStampedLockArray; +import javasabr.rlib.common.util.array.impl.ConcurrentStampedLockArraySet; +import javasabr.rlib.common.util.array.impl.CopyOnModifyArray; +import javasabr.rlib.common.util.array.impl.DefaultIntegerArray; +import javasabr.rlib.common.util.array.impl.FastArray; +import javasabr.rlib.common.util.array.impl.FastArraySet; +import javasabr.rlib.common.util.array.impl.FastLongArray; +import javasabr.rlib.common.util.array.impl.ReadOnlyFastArray; +import javasabr.rlib.common.util.array.impl.SortedFastArray; +import javasabr.rlib.common.util.array.impl.SynchronizedArray; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayIterator.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayIterator.java similarity index 91% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayIterator.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayIterator.java index 921f0874..5e36231d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ArrayIterator.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ArrayIterator.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; import java.util.Iterator; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ConcurrentArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ConcurrentArray.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/ConcurrentArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/ConcurrentArray.java index ca9c0138..bdad106b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ConcurrentArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ConcurrentArray.java @@ -1,12 +1,24 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; -import com.ss.rlib.common.function.*; -import com.ss.rlib.common.util.ClassUtils; +import java.util.function.Function; +import javasabr.rlib.common.function.BiIntPredicate; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullBiPredicate; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NotNullFunction; +import javasabr.rlib.common.function.NotNullFunctionInt; +import javasabr.rlib.common.function.NotNullIntBiObjectConsumer; +import javasabr.rlib.common.function.NotNullIntObjectPredicate; +import javasabr.rlib.common.function.NotNullNullableBiFunction; +import javasabr.rlib.common.function.NotNullNullableFunction; +import javasabr.rlib.common.function.NotNullNullableTripleFunction; +import javasabr.rlib.common.function.NotNullPredicate; +import javasabr.rlib.common.function.NotNullSupplier; +import javasabr.rlib.common.function.NotNullTripleConsumer; +import javasabr.rlib.common.util.ClassUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.function.Function; - /** * The interface with methods to manage thread-safe access with arrays. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ConcurrentIntegerArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ConcurrentIntegerArray.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/ConcurrentIntegerArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/ConcurrentIntegerArray.java index 49e25d2d..87cabc23 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ConcurrentIntegerArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ConcurrentIntegerArray.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; public interface ConcurrentIntegerArray { diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/IntegerArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/IntegerArray.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/IntegerArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/IntegerArray.java index 730bf7dd..921e1839 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/IntegerArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/IntegerArray.java @@ -1,13 +1,12 @@ -package com.ss.rlib.common.util.array; - -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.impl.ReadOnlyIntegerArray; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.array; import java.util.Arrays; import java.util.function.Consumer; import java.util.function.IntConsumer; import java.util.stream.IntStream; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.impl.ReadOnlyIntegerArray; +import org.jetbrains.annotations.NotNull; /** * The interface of dynamic integer array. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/LongArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/LongArray.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/LongArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/LongArray.java index 5a684a48..b4dc80b4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/LongArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/LongArray.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ArrayUtils; /** * The interface Long array. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/MutableIntegerArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/MutableIntegerArray.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/MutableIntegerArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/MutableIntegerArray.java index 5d54b8f2..1101f5c9 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/MutableIntegerArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/MutableIntegerArray.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ReadOnlyArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ReadOnlyArray.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/ReadOnlyArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/ReadOnlyArray.java index 012b1f43..1e1ba3b9 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/ReadOnlyArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/ReadOnlyArray.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.array; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.array; import java.util.Collection; import java.util.function.Function; import java.util.function.Predicate; +import org.jetbrains.annotations.NotNull; /** * The interface to mark an array as read only array. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/UnsafeArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/UnsafeArray.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/UnsafeArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/UnsafeArray.java index 62c4f24e..215dcfe8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/UnsafeArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/UnsafeArray.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.array; +package javasabr.rlib.common.util.array; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/AbstractArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/AbstractArray.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/AbstractArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/AbstractArray.java index c626d77c..40b04c76 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/AbstractArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/AbstractArray.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.Array; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.array.impl; import java.util.Arrays; import java.util.Objects; import java.util.function.Function; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.Array; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of dynamic arrays. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/AbstractConcurrentArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/AbstractConcurrentArray.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/AbstractConcurrentArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/AbstractConcurrentArray.java index 8733bc4f..d20d9e3c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/AbstractConcurrentArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/AbstractConcurrentArray.java @@ -1,17 +1,16 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import static com.ss.rlib.common.util.ArrayUtils.copyOf; import static java.lang.Math.max; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayIterator; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.common.util.array.UnsafeArray; -import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.NoSuchElementException; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayIterator; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.array.UnsafeArray; +import org.jetbrains.annotations.NotNull; /** * The base concurrent implementation of dynamic arrays. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArray.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArray.java index d340c144..b9e60430 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArray.java @@ -1,11 +1,10 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; - /** * The concurrent implementation of the array using {@link LockFactory#newReentrantARSWLock()} for {@link * ConcurrentArray#readLock()}* and {@link ConcurrentArray#writeLock()}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArraySet.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArraySet.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArraySet.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArraySet.java index b67f9d60..7b50e819 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArraySet.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentAtomicARSWLockArraySet.java @@ -1,8 +1,8 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ConcurrentArray; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentReentrantRWLockArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentReentrantRWLockArray.java similarity index 87% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentReentrantRWLockArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentReentrantRWLockArray.java index 0e00493c..3927fd87 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentReentrantRWLockArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentReentrantRWLockArray.java @@ -1,12 +1,10 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.array.impl; import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import org.jetbrains.annotations.NotNull; /** * The concurrent implementation of the array using {@link ReentrantReadWriteLock} for {@link diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentReentrantRWLockArraySet.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentReentrantRWLockArraySet.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentReentrantRWLockArraySet.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentReentrantRWLockArraySet.java index 0cbcdf4f..5b5f2e4d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentReentrantRWLockArraySet.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentReentrantRWLockArraySet.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ConcurrentArray; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.array.impl; import java.util.concurrent.locks.ReentrantReadWriteLock; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ConcurrentArray; +import org.jetbrains.annotations.NotNull; /** * The concurrent implementation of the array without duplications using {@link ReentrantReadWriteLock} for {@link diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentStampedLockArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentStampedLockArray.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentStampedLockArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentStampedLockArray.java index 6162d26a..4e5a1966 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentStampedLockArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentStampedLockArray.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.array.impl; import java.util.concurrent.locks.StampedLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import org.jetbrains.annotations.NotNull; /** * The concurrent implementation of array using {@link StampedLock} for {@link ConcurrentArray#readLock()} and diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentStampedLockArraySet.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentStampedLockArraySet.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentStampedLockArraySet.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentStampedLockArraySet.java index 0a3abc09..13d1605c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ConcurrentStampedLockArraySet.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ConcurrentStampedLockArraySet.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ConcurrentArray; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.array.impl; import java.util.concurrent.locks.StampedLock; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ConcurrentArray; +import org.jetbrains.annotations.NotNull; /** * The concurrent implementation of the array without duplications using {@link StampedLock} for {@link diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/CopyOnModifyArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/CopyOnModifyArray.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/CopyOnModifyArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/CopyOnModifyArray.java index f7775ef6..4517e86b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/CopyOnModifyArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/CopyOnModifyArray.java @@ -1,15 +1,14 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.concurrent.atomic.AtomicReference; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayComparator; -import com.ss.rlib.common.util.array.ArrayFactory; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.array.impl; import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; +import javasabr.rlib.common.concurrent.atomic.AtomicReference; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayComparator; +import javasabr.rlib.common.util.array.ArrayFactory; +import org.jetbrains.annotations.NotNull; /** * The implementation of the array which create a new back-end array for each modification. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/DefaultArrayIterator.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/DefaultArrayIterator.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/DefaultArrayIterator.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/DefaultArrayIterator.java index 3ed14e69..9cbc10f5 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/DefaultArrayIterator.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/DefaultArrayIterator.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayIterator; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayIterator; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/DefaultIntegerArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/DefaultIntegerArray.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/DefaultIntegerArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/DefaultIntegerArray.java index 52180a2d..0db54e25 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/DefaultIntegerArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/DefaultIntegerArray.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.ArrayIterator; -import com.ss.rlib.common.util.array.IntegerArray; -import com.ss.rlib.common.util.array.MutableIntegerArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.array.impl; import java.util.Arrays; import java.util.Objects; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.ArrayIterator; +import javasabr.rlib.common.util.array.IntegerArray; +import javasabr.rlib.common.util.array.MutableIntegerArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Simple implementation of dynamic integer array. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastArray.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastArray.java index 13590083..45369f29 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastArray.java @@ -1,15 +1,14 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import static com.ss.rlib.common.util.ArrayUtils.copyOf; import static java.lang.Math.max; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayIterator; -import com.ss.rlib.common.util.array.UnsafeArray; -import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.NoSuchElementException; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayIterator; +import javasabr.rlib.common.util.array.UnsafeArray; +import org.jetbrains.annotations.NotNull; /** * The fast implementation of the array. This array is not threadsafe. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastArraySet.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastArraySet.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastArraySet.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastArraySet.java index 292ef622..ead1f08b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastArraySet.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastArraySet.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import com.ss.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.Array; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastLongArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastLongArray.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastLongArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastLongArray.java index 26b4719a..a917bf85 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/FastLongArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/FastLongArray.java @@ -1,8 +1,8 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import com.ss.rlib.common.util.array.ArrayIterator; -import com.ss.rlib.common.util.array.LongArray; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.ArrayIterator; +import javasabr.rlib.common.util.array.LongArray; /** * Реализация не потокобезопасного динамического массива примитивов long. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ReadOnlyFastArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ReadOnlyFastArray.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ReadOnlyFastArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ReadOnlyFastArray.java index 9e23761a..028e50c4 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ReadOnlyFastArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ReadOnlyFastArray.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayComparator; -import com.ss.rlib.common.util.array.ReadOnlyArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.array.impl; import java.util.Collection; import java.util.function.Function; import java.util.function.Predicate; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayComparator; +import javasabr.rlib.common.util.array.ReadOnlyArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The read only version of the {@link FastArray}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ReadOnlyIntegerArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ReadOnlyIntegerArray.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ReadOnlyIntegerArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ReadOnlyIntegerArray.java index 818ba36b..47987911 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/ReadOnlyIntegerArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/ReadOnlyIntegerArray.java @@ -1,12 +1,11 @@ -package com.ss.rlib.common.util.array.impl; - -import com.ss.rlib.common.util.array.ArrayIterator; -import com.ss.rlib.common.util.array.IntegerArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.array.impl; import java.util.Arrays; import java.util.Objects; +import javasabr.rlib.common.util.array.ArrayIterator; +import javasabr.rlib.common.util.array.IntegerArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Simple implementation of read only integer array. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/SortedFastArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/SortedFastArray.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/SortedFastArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/SortedFastArray.java index 37bedaec..7ab7a183 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/SortedFastArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/SortedFastArray.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.Array; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; - /** * The sorted implementation of the {@link FastArray}. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/SynchronizedArray.java b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/SynchronizedArray.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/SynchronizedArray.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/SynchronizedArray.java index 41b21ca0..8e75498a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/array/impl/SynchronizedArray.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/array/impl/SynchronizedArray.java @@ -1,16 +1,15 @@ -package com.ss.rlib.common.util.array.impl; +package javasabr.rlib.common.util.array.impl; -import static com.ss.rlib.common.util.ArrayUtils.copyOf; import static java.lang.Math.max; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayIterator; -import com.ss.rlib.common.util.array.UnsafeArray; -import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.NoSuchElementException; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayIterator; +import javasabr.rlib.common.util.array.UnsafeArray; +import org.jetbrains.annotations.NotNull; /** * The implementation of the array with synchronization all methods. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/crypt/SymmetryCrypt.java b/rlib-common/src/main/java/javasabr/rlib/common/util/crypt/SymmetryCrypt.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/util/crypt/SymmetryCrypt.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/crypt/SymmetryCrypt.java index dd231223..5c1e0841 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/crypt/SymmetryCrypt.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/crypt/SymmetryCrypt.java @@ -1,11 +1,15 @@ -package com.ss.rlib.common.util.crypt; +package javasabr.rlib.common.util.crypt; -import org.jetbrains.annotations.NotNull; - -import javax.crypto.*; import java.io.UnsupportedEncodingException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.ShortBufferException; +import org.jetbrains.annotations.NotNull; /** * The symmetry crypt based on RC4. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentIntegerDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentIntegerDictionary.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentIntegerDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentIntegerDictionary.java index df31d72d..bd409cb0 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentIntegerDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentIntegerDictionary.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.ArrayUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentLongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentLongDictionary.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentLongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentLongDictionary.java index 29d9c46c..889f3629 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentLongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentLongDictionary.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.ArrayUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentObjectDictionary.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentObjectDictionary.java index 16d6358b..a20f424f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractConcurrentObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractConcurrentObjectDictionary.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.ArrayUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractDictionary.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractDictionary.java index ece42f55..fa70e014 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractDictionary.java @@ -1,16 +1,14 @@ -package com.ss.rlib.common.util.dictionary; - -import com.ss.rlib.common.function.NotNullFunction; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.pools.PoolFactory; -import com.ss.rlib.common.util.pools.ReusablePool; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.Objects; import java.util.function.Consumer; -import java.util.function.Function; +import javasabr.rlib.common.function.NotNullFunction; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.pools.PoolFactory; +import javasabr.rlib.common.util.pools.ReusablePool; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of the {@link Dictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractIntegerDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractIntegerDictionary.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractIntegerDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractIntegerDictionary.java index 1672292e..bda8d0f2 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractIntegerDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractIntegerDictionary.java @@ -1,17 +1,16 @@ -package com.ss.rlib.common.util.dictionary; - -import com.ss.rlib.common.function.IntBiObjectConsumer; -import com.ss.rlib.common.function.IntObjectConsumer; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.IntegerArray; -import com.ss.rlib.common.util.array.MutableIntegerArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.Iterator; import java.util.function.Function; import java.util.function.IntFunction; import java.util.function.Supplier; +import javasabr.rlib.common.function.IntBiObjectConsumer; +import javasabr.rlib.common.function.IntObjectConsumer; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.IntegerArray; +import javasabr.rlib.common.util.array.MutableIntegerArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of {@link IntegerDictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractLongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractLongDictionary.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractLongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractLongDictionary.java index f03fb076..f5169b46 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractLongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractLongDictionary.java @@ -1,16 +1,15 @@ -package com.ss.rlib.common.util.dictionary; - -import com.ss.rlib.common.function.LongBiObjectConsumer; -import com.ss.rlib.common.function.LongObjectConsumer; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.LongArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.Iterator; import java.util.function.Function; import java.util.function.LongFunction; import java.util.function.Supplier; +import javasabr.rlib.common.function.LongBiObjectConsumer; +import javasabr.rlib.common.function.LongObjectConsumer; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.LongArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of the {@link LongDictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractObjectDictionary.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractObjectDictionary.java index 94115f63..ea178506 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/AbstractObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/AbstractObjectDictionary.java @@ -1,13 +1,17 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.function.*; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.Array; +import java.util.Iterator; +import javasabr.rlib.common.function.FourObjectConsumer; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullBiFunction; +import javasabr.rlib.common.function.NotNullFunction; +import javasabr.rlib.common.function.NotNullSupplier; +import javasabr.rlib.common.function.NotNullTripleConsumer; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.Array; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Iterator; - /** * The base implementation of the {@link ObjectDictionary}. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockIntegerDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockIntegerDictionary.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockIntegerDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockIntegerDictionary.java index 2e3cb9a0..c54cc384 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockIntegerDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockIntegerDictionary.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockLongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockLongDictionary.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockLongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockLongDictionary.java index e882607c..b98e851c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockLongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockLongDictionary.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockObjectDictionary.java similarity index 89% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockObjectDictionary.java index e9cf7a05..ff283920 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentAtomicARSWLockObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentAtomicARSWLockObjectDictionary.java @@ -1,7 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.concurrent.lock.LockFactory; -import com.ss.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentDictionary.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentDictionary.java index 54ec9152..faacd348 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; /** * The interface with methods for supporting threadsafe for the {@link Dictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentIntegerDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentIntegerDictionary.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentIntegerDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentIntegerDictionary.java index 797d3e86..ebc16bf6 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentIntegerDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentIntegerDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentLongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentLongDictionary.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentLongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentLongDictionary.java index 08a71142..f3961140 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentLongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentLongDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentObjectDictionary.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentObjectDictionary.java index caeb717d..12daf556 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentObjectDictionary.java @@ -1,6 +1,10 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.function.*; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NotNullNullableBiFunction; +import javasabr.rlib.common.function.NotNullNullableTripleFunction; +import javasabr.rlib.common.function.NotNullTripleConsumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionary.java similarity index 92% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionary.java index a5600ef6..f36c7d25 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionary.java @@ -1,9 +1,8 @@ -package com.ss.rlib.common.util.dictionary; - -import com.ss.rlib.common.concurrent.lock.LockFactory; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.dictionary; import java.util.concurrent.locks.StampedLock; +import javasabr.rlib.common.concurrent.lock.LockFactory; +import org.jetbrains.annotations.NotNull; /** * The implementation of the {@link ConcurrentObjectDictionary} using {@link diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/Dictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/Dictionary.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/Dictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/Dictionary.java index f86d3763..0984634a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/Dictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/Dictionary.java @@ -1,13 +1,11 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.function.NotNullFunction; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.function.NotNullFunction; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.pools.Reusable; import org.jetbrains.annotations.NotNull; -import java.util.function.Function; - /** * The interface for implementing a key-value dictionary. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryCollectors.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryCollectors.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryCollectors.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryCollectors.java index 8e1678c1..8392703a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryCollectors.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryCollectors.java @@ -1,9 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import static java.util.Collections.unmodifiableSet; import static java.util.stream.Collector.Characteristics; -import com.ss.rlib.common.util.ObjectUtils; -import org.jetbrains.annotations.NotNull; import java.util.EnumSet; import java.util.Set; @@ -12,6 +10,8 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; +import javasabr.rlib.common.util.ObjectUtils; +import org.jetbrains.annotations.NotNull; /** * The collectors to {@link Dictionary} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryFactory.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryFactory.java index fcc591de..a758c67a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryFactory.java @@ -1,9 +1,7 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import org.jetbrains.annotations.NotNull; -import java.util.concurrent.locks.StampedLock; - /** * The factory for creating new {@link Dictionary}. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryUtils.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryUtils.java similarity index 57% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryUtils.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryUtils.java index 3d0813d5..c59abf44 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/DictionaryUtils.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/DictionaryUtils.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; /** * @author JavaSaBr diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/Entry.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/Entry.java similarity index 88% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/Entry.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/Entry.java index 8c3d60e4..9e3e777a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/Entry.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/Entry.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.Reusable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastIntegerDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastIntegerDictionary.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastIntegerDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastIntegerDictionary.java index 23d5d491..8dc40869 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastIntegerDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastIntegerDictionary.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ArrayUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastLongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastLongDictionary.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastLongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastLongDictionary.java index ca194eef..db625f59 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastLongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastLongDictionary.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ArrayUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastObjectDictionary.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastObjectDictionary.java index bb1d5a84..c11919fd 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/FastObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/FastObjectDictionary.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ArrayUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntKey.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntKey.java similarity index 79% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntKey.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntKey.java index c94fd15b..aa7e3d06 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntKey.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntKey.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; /** * The type of the {@link Dictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerDictionary.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerDictionary.java index 42bd31c8..85311548 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerDictionary.java @@ -1,16 +1,15 @@ -package com.ss.rlib.common.util.dictionary; - -import com.ss.rlib.common.function.IntBiObjectConsumer; -import com.ss.rlib.common.function.IntObjectConsumer; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.IntegerArray; -import com.ss.rlib.common.util.array.MutableIntegerArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.function.Function; import java.util.function.IntFunction; import java.util.function.Supplier; +import javasabr.rlib.common.function.IntBiObjectConsumer; +import javasabr.rlib.common.function.IntObjectConsumer; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.IntegerArray; +import javasabr.rlib.common.util.array.MutableIntegerArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The interface to implement a dictionary which uses int as key. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerDictionaryIterator.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerDictionaryIterator.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerDictionaryIterator.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerDictionaryIterator.java index 721d003f..c8196089 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerDictionaryIterator.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerDictionaryIterator.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.dictionary; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.Iterator; import java.util.NoSuchElementException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The iterator to iterate {@link IntegerDictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerEntry.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerEntry.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerEntry.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerEntry.java index 20d4cdb8..5196faaf 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/IntegerEntry.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/IntegerEntry.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; +import java.util.Objects; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - /** * The entry of {@link IntegerDictionary}. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongDictionary.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongDictionary.java index 31bc03fe..b170805d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongDictionary.java @@ -1,16 +1,15 @@ -package com.ss.rlib.common.util.dictionary; - -import com.ss.rlib.common.function.LongBiObjectConsumer; -import com.ss.rlib.common.function.LongObjectConsumer; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.LongArray; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.function.Function; import java.util.function.LongFunction; import java.util.function.Supplier; +import javasabr.rlib.common.function.LongBiObjectConsumer; +import javasabr.rlib.common.function.LongObjectConsumer; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.LongArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The interface to implement a dictionary which uses long as key. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongDictionaryIterator.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongDictionaryIterator.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongDictionaryIterator.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongDictionaryIterator.java index 5cd62d7e..bbb27917 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongDictionaryIterator.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongDictionaryIterator.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.dictionary; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.Iterator; import java.util.NoSuchElementException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The iterator to iterate {@link LongDictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongEntry.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongEntry.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongEntry.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongEntry.java index 30328326..d6543e16 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongEntry.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongEntry.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; +import java.util.Objects; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - /** * The entry of {@link LongDictionary}. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongKey.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongKey.java similarity index 79% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongKey.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongKey.java index 4204aee8..9ba8db10 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/LongKey.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/LongKey.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; /** * The type of the {@link Dictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectDictionary.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectDictionary.java index ed81d246..d8c2e901 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectDictionary.java @@ -1,14 +1,18 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.function.*; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; +import java.util.Optional; +import javasabr.rlib.common.function.FourObjectConsumer; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullBiFunction; +import javasabr.rlib.common.function.NotNullFunction; +import javasabr.rlib.common.function.NotNullSupplier; +import javasabr.rlib.common.function.NotNullTripleConsumer; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; - /** * The interface for implementing a key-value dictionary which using an object key. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectDictionaryIterator.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectDictionaryIterator.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectDictionaryIterator.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectDictionaryIterator.java index a691a3b7..9578cd22 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectDictionaryIterator.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectDictionaryIterator.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.dictionary; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.dictionary; import java.util.Iterator; import java.util.NoSuchElementException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The iterator to iterate {@link ObjectDictionary}. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectEntry.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectEntry.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectEntry.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectEntry.java index f6326cb3..4b519238 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ObjectEntry.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ObjectEntry.java @@ -1,12 +1,11 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; +import java.util.Objects; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Objects; - /** * The entry of {@link ObjectDictionary}. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ReadOnlyFastLongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ReadOnlyFastLongDictionary.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ReadOnlyFastLongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ReadOnlyFastLongDictionary.java index 1ad825ef..a761f03c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ReadOnlyFastLongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ReadOnlyFastLongDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ReadOnlyFastObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ReadOnlyFastObjectDictionary.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ReadOnlyFastObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ReadOnlyFastObjectDictionary.java index 3fb3babe..f2cfd833 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/ReadOnlyFastObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/ReadOnlyFastObjectDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeIntegerDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeIntegerDictionary.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeIntegerDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeIntegerDictionary.java index 9ff48d29..5b148936 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeIntegerDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeIntegerDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeLongDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeLongDictionary.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeLongDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeLongDictionary.java index fa0ca3ae..fde30dc8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeLongDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeLongDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeObjectDictionary.java b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeObjectDictionary.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeObjectDictionary.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeObjectDictionary.java index c6bde613..31db0e51 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/dictionary/UnsafeObjectDictionary.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/dictionary/UnsafeObjectDictionary.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.dictionary; +package javasabr.rlib.common.util.dictionary; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/ConcurrentLinkedList.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/ConcurrentLinkedList.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/ConcurrentLinkedList.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/ConcurrentLinkedList.java index d1a346a1..5bf57b8c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/ConcurrentLinkedList.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/ConcurrentLinkedList.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.linkedlist; +package javasabr.rlib.common.util.linkedlist; /** * The interface to implement concurrent supporting. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/LinkedList.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/LinkedList.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/LinkedList.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/LinkedList.java index 10543af2..057b1818 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/LinkedList.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/LinkedList.java @@ -1,16 +1,19 @@ -package com.ss.rlib.common.util.linkedlist; - -import com.ss.rlib.common.function.LongBiObjectConsumer; -import com.ss.rlib.common.function.TripleConsumer; -import com.ss.rlib.common.function.TriplePredicate; -import com.ss.rlib.common.util.linkedlist.impl.Node; -import com.ss.rlib.common.util.pools.Reusable; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.linkedlist; import java.io.Serializable; import java.util.Deque; -import java.util.function.*; +import java.util.function.BiConsumer; +import java.util.function.BiPredicate; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Predicate; +import javasabr.rlib.common.function.LongBiObjectConsumer; +import javasabr.rlib.common.function.TripleConsumer; +import javasabr.rlib.common.function.TriplePredicate; +import javasabr.rlib.common.util.linkedlist.impl.Node; +import javasabr.rlib.common.util.pools.Reusable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Интерфей с для реализации связанного списка. Главное преймущество, это переиспользование узлов списка и быстрая diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/LinkedListFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/LinkedListFactory.java similarity index 82% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/LinkedListFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/LinkedListFactory.java index 85f020fd..0863877c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/LinkedListFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/LinkedListFactory.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.util.linkedlist; +package javasabr.rlib.common.util.linkedlist; -import com.ss.rlib.common.util.linkedlist.impl.SortedLinkedList; +import javasabr.rlib.common.util.linkedlist.impl.FastLinkedList; +import javasabr.rlib.common.util.linkedlist.impl.SortedLinkedList; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.util.linkedlist.impl.FastLinkedList; - /** * The factory of linked list implementations. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/AbstractLinkedList.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/AbstractLinkedList.java similarity index 96% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/AbstractLinkedList.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/AbstractLinkedList.java index b3b32c54..9a8b62fb 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/AbstractLinkedList.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/AbstractLinkedList.java @@ -1,15 +1,12 @@ -package com.ss.rlib.common.util.linkedlist.impl; - -import com.ss.rlib.common.util.linkedlist.LinkedList; -import com.ss.rlib.common.util.ClassUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.linkedlist.impl; import java.util.Collection; import java.util.NoSuchElementException; import java.util.Objects; - -import com.ss.rlib.common.util.linkedlist.LinkedList; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.linkedlist.LinkedList; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The base implementation of the LinkedList. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/FastLinkedList.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/FastLinkedList.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/FastLinkedList.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/FastLinkedList.java index 0ab2ba00..8215dafe 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/FastLinkedList.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/FastLinkedList.java @@ -1,14 +1,13 @@ -package com.ss.rlib.common.util.linkedlist.impl; - -import com.ss.rlib.common.util.pools.PoolFactory; -import com.ss.rlib.common.util.pools.ReusablePool; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.linkedlist.impl; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Objects; import java.util.function.Function; +import javasabr.rlib.common.util.pools.PoolFactory; +import javasabr.rlib.common.util.pools.ReusablePool; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The non thread-safe implementation of the LinkedList. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/IteratorImpl.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/IteratorImpl.java similarity index 94% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/IteratorImpl.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/IteratorImpl.java index 6eaa4550..b08688a8 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/IteratorImpl.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/IteratorImpl.java @@ -1,14 +1,11 @@ -package com.ss.rlib.common.util.linkedlist.impl; - -import com.ss.rlib.common.util.linkedlist.LinkedList; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.linkedlist.impl; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Objects; - -import com.ss.rlib.common.util.linkedlist.LinkedList; +import javasabr.rlib.common.util.linkedlist.LinkedList; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The implementation of an iterator for the LinkedList. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/Node.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/Node.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/Node.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/Node.java index 85148af1..f3c439b3 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/Node.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/Node.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.util.linkedlist.impl; +package javasabr.rlib.common.util.linkedlist.impl; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.Reusable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/SortedLinkedList.java b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/SortedLinkedList.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/SortedLinkedList.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/SortedLinkedList.java index 35ba1040..f383c0cd 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/linkedlist/impl/SortedLinkedList.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/linkedlist/impl/SortedLinkedList.java @@ -1,8 +1,7 @@ -package com.ss.rlib.common.util.linkedlist.impl; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.common.util.linkedlist.impl; import java.util.Objects; +import org.jetbrains.annotations.NotNull; /** * The implementation of {@link FastLinkedList} with to sort on put an element. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/os/OperatingSystem.java b/rlib-common/src/main/java/javasabr/rlib/common/util/os/OperatingSystem.java similarity index 98% rename from rlib-common/src/main/java/com/ss/rlib/common/util/os/OperatingSystem.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/os/OperatingSystem.java index eefadf10..32758db7 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/os/OperatingSystem.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/os/OperatingSystem.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.os; +package javasabr.rlib.common.util.os; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/os/OperatingSystemResolver.java b/rlib-common/src/main/java/javasabr/rlib/common/util/os/OperatingSystemResolver.java similarity index 99% rename from rlib-common/src/main/java/com/ss/rlib/common/util/os/OperatingSystemResolver.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/os/OperatingSystemResolver.java index 936be8b1..9ab1ef20 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/os/OperatingSystemResolver.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/os/OperatingSystemResolver.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.os; +package javasabr.rlib.common.util.os; import static java.lang.Double.parseDouble; import static java.lang.Integer.parseInt; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/Pool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/Pool.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/Pool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/Pool.java index 260323c4..a0b255d1 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/Pool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/Pool.java @@ -1,13 +1,12 @@ -package com.ss.rlib.common.util.pools; - -import com.ss.rlib.common.function.ObjectLongFunction; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.common.util.pools; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.LongFunction; import java.util.function.Supplier; +import javasabr.rlib.common.function.ObjectLongFunction; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The interface for implementing a pool for storing and reusing any objects. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/PoolFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/PoolFactory.java similarity index 76% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/PoolFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/PoolFactory.java index 24e5b7c9..4e49a5f0 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/PoolFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/PoolFactory.java @@ -1,6 +1,15 @@ -package com.ss.rlib.common.util.pools; +package javasabr.rlib.common.util.pools; -import com.ss.rlib.common.util.pools.impl.*; +import javasabr.rlib.common.concurrent.lock.impl.AtomicReadWriteLock; +import javasabr.rlib.common.concurrent.lock.impl.ReentrantARSWLock; +import javasabr.rlib.common.util.pools.impl.ConcurrentAtomicARSWLockPool; +import javasabr.rlib.common.util.pools.impl.ConcurrentAtomicARSWLockReusablePool; +import javasabr.rlib.common.util.pools.impl.ConcurrentReentrantRWLockPool; +import javasabr.rlib.common.util.pools.impl.ConcurrentStampedLockPool; +import javasabr.rlib.common.util.pools.impl.ConcurrentStampedLockReusablePool; +import javasabr.rlib.common.util.pools.impl.FastPool; +import javasabr.rlib.common.util.pools.impl.FastReusablePool; +import javasabr.rlib.common.util.pools.impl.SynchronizedReusablePool; import org.jetbrains.annotations.NotNull; /** @@ -11,7 +20,7 @@ public final class PoolFactory { /** - * Create a reusable pool based on {@link com.ss.rlib.common.concurrent.lock.impl.AtomicReadWriteLock}. + * Create a reusable pool based on {@link AtomicReadWriteLock}. * * @param type the object's type. * @param the object's type. @@ -37,7 +46,7 @@ public final class PoolFactory { } /** - * Create a reusable pool based on {@link com.ss.rlib.common.concurrent.lock.impl.ReentrantARSWLock}. + * Create a reusable pool based on {@link ReentrantARSWLock}. * * @param type the object's type. * @param the object's type. @@ -74,7 +83,7 @@ public final class PoolFactory { } /** - * Create a pool based on {@link com.ss.rlib.common.concurrent.lock.impl.ReentrantARSWLock}. + * Create a pool based on {@link ReentrantARSWLock}. * * @param type the object's type. * @param the object's type. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/Reusable.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/Reusable.java similarity index 93% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/Reusable.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/Reusable.java index 17c6688f..70b07089 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/Reusable.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/Reusable.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.pools; +package javasabr.rlib.common.util.pools; /** * The interface for implementing reusable objects. You can use reusable objects with {@link diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/ReusablePool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/ReusablePool.java similarity index 83% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/ReusablePool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/ReusablePool.java index e343d209..da36bfa1 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/ReusablePool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/ReusablePool.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.pools; +package javasabr.rlib.common.util.pools; /** * The interface for implementing a pool for only {@link Reusable} objects. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockPool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockPool.java similarity index 67% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockPool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockPool.java index 47fbaf80..555e6a45 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockPool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockPool.java @@ -1,12 +1,11 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; -import com.ss.rlib.common.util.array.impl.ConcurrentAtomicARSWLockArray; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.array.impl.ConcurrentAtomicARSWLockArray; +import javasabr.rlib.common.util.pools.Pool; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.util.pools.Pool; - /** * The threadsafe implementation of the {@link Pool} using like a storage the {@link * ConcurrentAtomicARSWLockArray}*. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockReusablePool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockReusablePool.java similarity index 65% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockReusablePool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockReusablePool.java index 822f969d..4d4017f3 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockReusablePool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentAtomicARSWLockReusablePool.java @@ -1,10 +1,10 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.common.util.array.impl.ConcurrentAtomicARSWLockArray; -import com.ss.rlib.common.util.pools.Reusable; -import com.ss.rlib.common.util.pools.ReusablePool; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.array.impl.ConcurrentAtomicARSWLockArray; +import javasabr.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.ReusablePool; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentPool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentPool.java similarity index 80% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentPool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentPool.java index a17e8b15..e2363c49 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentPool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentPool.java @@ -1,10 +1,8 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.common.util.array.impl.ConcurrentAtomicARSWLockArray; -import com.ss.rlib.common.util.pools.Pool; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.pools.Pool; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentReentrantRWLockPool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentReentrantRWLockPool.java similarity index 65% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentReentrantRWLockPool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentReentrantRWLockPool.java index a5583d58..7d1f3423 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentReentrantRWLockPool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentReentrantRWLockPool.java @@ -1,13 +1,12 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; -import com.ss.rlib.common.util.array.impl.ConcurrentReentrantRWLockArray; -import com.ss.rlib.common.util.pools.ReusablePool; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.array.impl.ConcurrentReentrantRWLockArray; +import javasabr.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.ReusablePool; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.common.util.pools.Reusable; - /** * The threadsafe implementation of the {@link ReusablePool} using like a storage the {@link * ConcurrentReentrantRWLockArray}*. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentReusablePool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentReusablePool.java similarity index 75% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentReusablePool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentReusablePool.java index f90483ef..58d6784a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentReusablePool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentReusablePool.java @@ -1,13 +1,13 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; -import com.ss.rlib.common.util.pools.Pool; -import com.ss.rlib.common.util.pools.Reusable; -import com.ss.rlib.common.util.pools.ReusablePool; +import javasabr.rlib.common.util.pools.Pool; +import javasabr.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.ReusablePool; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * The base concurrent implementation of the {@link Pool} for {@link com.ss.rlib.common.util.pools.Reusable} objects. + * The base concurrent implementation of the {@link Pool} for {@link Reusable} objects. * * @param the object's type. * @author JavaSaBr diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentStampedLockPool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentStampedLockPool.java similarity index 67% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentStampedLockPool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentStampedLockPool.java index 4be05164..64ed84e6 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentStampedLockPool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentStampedLockPool.java @@ -1,9 +1,9 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.common.util.array.impl.ConcurrentStampedLockArray; -import com.ss.rlib.common.util.pools.Pool; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.array.impl.ConcurrentStampedLockArray; +import javasabr.rlib.common.util.pools.Pool; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentStampedLockReusablePool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentStampedLockReusablePool.java similarity index 65% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentStampedLockReusablePool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentStampedLockReusablePool.java index 5ed09658..225ee468 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/ConcurrentStampedLockReusablePool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/ConcurrentStampedLockReusablePool.java @@ -1,13 +1,12 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.array.impl.ConcurrentStampedLockArray; +import javasabr.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.ReusablePool; import org.jetbrains.annotations.NotNull; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.common.util.array.impl.ConcurrentStampedLockArray; -import com.ss.rlib.common.util.pools.Reusable; -import com.ss.rlib.common.util.pools.ReusablePool; - /** * The threadsafe implementation of the {@link ReusablePool} using like a storage the {@link * ConcurrentStampedLockArray}*. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/FastPool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/FastPool.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/FastPool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/FastPool.java index fa5f284a..a40aea42 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/FastPool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/FastPool.java @@ -1,12 +1,10 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.pools.Pool; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.ss.rlib.common.util.pools.Pool; - /** * The fast implementation of the {@link Pool}. It isn't threadsafe. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/FastReusablePool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/FastReusablePool.java similarity index 74% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/FastReusablePool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/FastReusablePool.java index 1e3c5f2b..c53b84df 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/FastReusablePool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/FastReusablePool.java @@ -1,13 +1,10 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; +import javasabr.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.ReusablePool; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.pools.Reusable; -import com.ss.rlib.common.util.pools.ReusablePool; - /** * The fast implementation of the {@link ReusablePool}. It isn't threadsafe. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/SynchronizedReusablePool.java b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/SynchronizedReusablePool.java similarity index 74% rename from rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/SynchronizedReusablePool.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/SynchronizedReusablePool.java index 8a636caf..0c95a36d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/pools/impl/SynchronizedReusablePool.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/pools/impl/SynchronizedReusablePool.java @@ -1,14 +1,10 @@ -package com.ss.rlib.common.util.pools.impl; +package javasabr.rlib.common.util.pools.impl; +import javasabr.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.ReusablePool; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.pools.Reusable; -import com.ss.rlib.common.util.pools.ReusablePool; - /** * The implementation of the {@link ReusablePool} using synchronization for take/put methods. * diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java b/rlib-common/src/main/java/javasabr/rlib/common/util/random/FastRandom.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/random/FastRandom.java index d97f5c79..e4aea224 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/random/FastRandom.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/random/FastRandom.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.random; +package javasabr.rlib.common.util.random; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/random/Random.java b/rlib-common/src/main/java/javasabr/rlib/common/util/random/Random.java similarity index 97% rename from rlib-common/src/main/java/com/ss/rlib/common/util/random/Random.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/random/Random.java index 4a7944b6..366049ea 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/random/Random.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/random/Random.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.random; +package javasabr.rlib.common.util.random; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/random/RandomFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/util/random/RandomFactory.java similarity index 90% rename from rlib-common/src/main/java/com/ss/rlib/common/util/random/RandomFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/random/RandomFactory.java index e5563d8c..793ce87b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/random/RandomFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/random/RandomFactory.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.random; +package javasabr.rlib.common.util.random; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/AbstractReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/AbstractReference.java similarity index 76% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/AbstractReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/AbstractReference.java index 732324dd..8d56da8c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/AbstractReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/AbstractReference.java @@ -1,9 +1,9 @@ -package com.ss.rlib.common.util.ref; - -/** - * The base implementation of the {@link Reference}. - * - * @author JavaSaBr - */ -public abstract class AbstractReference implements Reference { -} +package javasabr.rlib.common.util.ref; + +/** + * The base implementation of the {@link Reference}. + * + * @author JavaSaBr + */ +public abstract class AbstractReference implements Reference { +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ByteReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ByteReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/ByteReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/ByteReference.java index c29e4b06..2a1e0df5 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ByteReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ByteReference.java @@ -1,6 +1,11 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * The reference to byte value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/CharReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/CharReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/CharReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/CharReference.java index e8bad5e5..a8fbe17d 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/CharReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/CharReference.java @@ -1,6 +1,11 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * The reference to char value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/DoubleReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/DoubleReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/DoubleReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/DoubleReference.java index fc6d700a..39b58a1f 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/DoubleReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/DoubleReference.java @@ -1,6 +1,11 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * The reference to double value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/FloatReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/FloatReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/FloatReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/FloatReference.java index 1d6ec02c..b4957e66 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/FloatReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/FloatReference.java @@ -1,6 +1,11 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * The reference to float value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalByteReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalByteReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalByteReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalByteReference.java index 3ecac750..7b350fe7 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalByteReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalByteReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to byte value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalCharReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalCharReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalCharReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalCharReference.java index 7c64ca5c..09067df5 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalCharReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalCharReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to char value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalDoubleReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalDoubleReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalDoubleReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalDoubleReference.java index bee759a1..4dbbfdbb 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalDoubleReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalDoubleReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to double value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalFloatReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalFloatReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalFloatReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalFloatReference.java index a4d69717..a37de740 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalFloatReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalFloatReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to float value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalIntReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalIntReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalIntReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalIntReference.java index 68ad3454..5713ad36 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalIntReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalIntReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to integer value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalLongReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalLongReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalLongReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalLongReference.java index 17ee7f8e..3546a873 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalLongReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalLongReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to long value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalObjectReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalObjectReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalObjectReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalObjectReference.java index f75d19a6..c38932ea 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalObjectReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalObjectReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to object. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalShortReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalShortReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalShortReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalShortReference.java index 1b33c7aa..b2d70c9b 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/GlobalShortReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/GlobalShortReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to short value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/IntReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/IntReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/IntReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/IntReference.java index 8e0e2e11..01a9aa15 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/IntReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/IntReference.java @@ -1,27 +1,32 @@ -package com.ss.rlib.common.util.ref; - -import lombok.*; - -/** - * The reference to integer value. - * - * @author JavaSaBr - */ -@Getter -@Setter -@ToString -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -public class IntReference extends AbstractReference { - - /** - * The value of this reference. - */ - private int value; - - @Override - public void free() { - this.value = 0; - } -} +package javasabr.rlib.common.util.ref; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +/** + * The reference to integer value. + * + * @author JavaSaBr + */ +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class IntReference extends AbstractReference { + + /** + * The value of this reference. + */ + private int value; + + @Override + public void free() { + this.value = 0; + } +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/LongReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/LongReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/LongReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/LongReference.java index 7f3392f9..4e2e8984 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/LongReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/LongReference.java @@ -1,27 +1,32 @@ -package com.ss.rlib.common.util.ref; - -import lombok.*; - -/** - * The reference to long value. - * - * @author JavaSaBr - */ -@Getter -@Setter -@ToString -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -public class LongReference extends AbstractReference { - - /** - * The value of this reference. - */ - private long value; - - @Override - public void free() { - this.value = 0L; - } -} +package javasabr.rlib.common.util.ref; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +/** + * The reference to long value. + * + * @author JavaSaBr + */ +@Getter +@Setter +@ToString +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class LongReference extends AbstractReference { + + /** + * The value of this reference. + */ + private long value; + + @Override + public void free() { + this.value = 0L; + } +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ObjectReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ObjectReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/ObjectReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/ObjectReference.java index 48ebe576..fae14125 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ObjectReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ObjectReference.java @@ -1,6 +1,11 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * The reference to object. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/Reference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/Reference.java similarity index 56% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/Reference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/Reference.java index 355e2564..9bb8752e 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/Reference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/Reference.java @@ -1,11 +1,11 @@ -package com.ss.rlib.common.util.ref; - -import com.ss.rlib.common.util.pools.Reusable; - -/** - * The interface to implement a reference. - * - * @author JavaSaBr - */ -public interface Reference extends Reusable { -} +package javasabr.rlib.common.util.ref; + +import javasabr.rlib.common.util.pools.Reusable; + +/** + * The interface to implement a reference. + * + * @author JavaSaBr + */ +public interface Reference extends Reusable { +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ReferenceFactory.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ReferenceFactory.java similarity index 95% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/ReferenceFactory.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/ReferenceFactory.java index ee059244..d43d2746 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ReferenceFactory.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ReferenceFactory.java @@ -1,365 +1,365 @@ -package com.ss.rlib.common.util.ref; - -import com.ss.rlib.common.util.pools.PoolFactory; -import com.ss.rlib.common.util.pools.ReusablePool; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * @author JavaSaBr - */ -public final class ReferenceFactory { - - private static final ReusablePool GLOBAL_BYTE_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalByteReference.class); - private static final ReusablePool GLOBAL_SHORT_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalShortReference.class); - private static final ReusablePool GLOBAL_CHAR_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalCharReference.class); - private static final ReusablePool GLOBAL_INT_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalIntReference.class); - private static final ReusablePool GLOBAL_LONG_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalLongReference.class); - private static final ReusablePool GLOBAL_FLOAT_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalFloatReference.class); - private static final ReusablePool GLOBAL_DOUBLE_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalDoubleReference.class); - private static final ReusablePool GLOBAL_OBJ_REF_POOL = - PoolFactory.newConcurrentStampedLockReusablePool(GlobalObjectReference.class); - - private static final ThreadLocal> TL_BYTE_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLByteReference.class)); - private static final ThreadLocal> TL_SHORT_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLShortReference.class)); - private static final ThreadLocal> TL_CHAR_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLCharReference.class)); - private static final ThreadLocal> TL_INT_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLIntReference.class)); - private static final ThreadLocal> TL_LONG_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLLongReference.class)); - private static final ThreadLocal> TL_FLOAT_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLFloatReference.class)); - private static final ThreadLocal> TL_DOUBLE_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLDoubleReference.class)); - private static final ThreadLocal> TL_OBJECT_REF_POOL = - ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLObjectReference.class)); - - /** - * @param value the init value. - * @return the new byte ref. - * @since 9.2.1 - */ - public static @NotNull ByteReference newByteRef(byte value) { - return new ByteReference(value); - } - - /** - * @param value the init value. - * @return the new byte ref. - * @since 9.2.1 - */ - public static @NotNull ByteReference newReusableByteRef(byte value) { - var ref = GLOBAL_BYTE_REF_POOL.take(GlobalByteReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new byte ref. - * @since 9.2.1 - */ - public static @NotNull ByteReference newThreadLocalByteRef(byte value) { - var ref = TL_BYTE_REF_POOL.get().take(TLByteReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new short ref. - * @since 9.2.1 - */ - public static @NotNull ShortReference newShortRef(short value) { - return new ShortReference(value); - } - - /** - * @param value the init value. - * @return the new short ref. - * @since 9.2.1 - */ - public static @NotNull ShortReference newReusableShortRef(short value) { - var ref = GLOBAL_SHORT_REF_POOL.take(GlobalShortReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new short ref. - * @since 9.2.1 - */ - public static @NotNull ShortReference newThreadLocalShortRef(short value) { - var ref = TL_SHORT_REF_POOL.get().take(TLShortReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new char ref. - * @since 9.2.1 - */ - public static @NotNull CharReference newCharRef(char value) { - return new CharReference(value); - } - - /** - * @param value the init value. - * @return the new char ref. - * @since 9.2.1 - */ - public static @NotNull CharReference newReusableCharRef(char value) { - var ref = GLOBAL_CHAR_REF_POOL.take(GlobalCharReference::new); - ref.setValue(value); - return ref ; - } - - /** - * @param value the init value. - * @return the new char ref. - * @since 9.2.1 - */ - public static @NotNull CharReference newThreadLocalCharRef(char value) { - var ref = TL_CHAR_REF_POOL.get().take(TLCharReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new int ref. - * @since 9.2.1 - */ - public static @NotNull IntReference newIntRef(int value) { - return new IntReference(value); - } - - /** - * @param value the init value. - * @return the new int ref. - * @since 9.2.1 - */ - public static @NotNull IntReference newReusableIntRef(int value) { - var ref = GLOBAL_INT_REF_POOL.take(GlobalIntReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new int ref. - * @since 9.2.1 - */ - public static @NotNull IntReference newThreadLocalIntRef(int value) { - var ref = TL_INT_REF_POOL.get().take(TLIntReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new long ref. - * @since 9.2.1 - */ - public static @NotNull LongReference newLongRef(long value) { - return new LongReference(value); - } - - /** - * @param value the init value. - * @return the new long ref. - * @since 9.2.1 - */ - public static @NotNull LongReference newReusableLongRef(long value) { - var ref = GLOBAL_LONG_REF_POOL.take(GlobalLongReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new long ref. - * @since 9.2.1 - */ - public static @NotNull LongReference newThreadLocalLongRef(long value) { - var ref = TL_LONG_REF_POOL.get().take(TLLongReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new float ref. - * @since 9.2.1 - */ - public static @NotNull FloatReference newFloatRef(float value) { - return new FloatReference(value); - } - - /** - * @param value the init value. - * @return the new float ref. - * @since 9.2.1 - */ - public static @NotNull FloatReference newReusableFloatRef(float value) { - var ref = GLOBAL_FLOAT_REF_POOL.take(GlobalFloatReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new float ref. - * @since 9.2.1 - */ - public static @NotNull FloatReference newThreadLocalFloatRef(float value) { - var ref = TL_FLOAT_REF_POOL.get().take(TLFloatReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new double ref. - * @since 9.2.1 - */ - public static @NotNull DoubleReference newDoubleRef(double value) { - return new DoubleReference(value); - } - - /** - * @param value the init value. - * @return the new double ref. - * @since 9.2.1 - */ - public static @NotNull DoubleReference newReusableDoubleRef(double value) { - var ref = GLOBAL_DOUBLE_REF_POOL.take(GlobalDoubleReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @return the new double ref. - * @since 9.2.1 - */ - public static @NotNull DoubleReference newThreadLocalDoubleRef(double value) { - var ref = TL_DOUBLE_REF_POOL.get().take(TLDoubleReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @param the object's type. - * @return the new object ref. - * @since 9.2.1 - */ - public static @NotNull ObjectReference newObjRef(@Nullable T value) { - return new ObjectReference<>(value); - } - - /** - * @param value the init value. - * @param the object's type. - * @return the new object ref. - * @since 9.2.1 - */ - public static @NotNull ObjectReference newReusableObjRef(@Nullable T value) { - ObjectReference ref = GLOBAL_OBJ_REF_POOL.take(GlobalObjectReference::new); - ref.setValue(value); - return ref; - } - - /** - * @param value the init value. - * @param the object's type. - * @return the new object ref. - * @since 9.2.1 - */ - public static @NotNull ObjectReference newThreadLocalObjRef(@Nullable T value) { - TLObjectReference ref = TL_OBJECT_REF_POOL.get().take(TLObjectReference::new); - ref.setValue(value); - return ref; - } - - static void release(@NotNull GlobalByteReference ref) { - GLOBAL_BYTE_REF_POOL.put(ref); - } - - static void release(@NotNull GlobalShortReference ref) { - GLOBAL_SHORT_REF_POOL.put(ref); - } - - static void release(@NotNull GlobalCharReference ref) { - GLOBAL_CHAR_REF_POOL.put(ref); - } - - static void release(@NotNull GlobalIntReference ref) { - GLOBAL_INT_REF_POOL.put(ref); - } - - static void release(@NotNull GlobalLongReference ref) { - GLOBAL_LONG_REF_POOL.put(ref); - } - - static void release(@NotNull GlobalFloatReference ref) { - GLOBAL_FLOAT_REF_POOL.put(ref); - } - - static void release(@NotNull GlobalDoubleReference ref) { - GLOBAL_DOUBLE_REF_POOL.put(ref); - } - - static void release(@NotNull GlobalObjectReference ref) { - GLOBAL_OBJ_REF_POOL.put(ref); - } - - static void release(@NotNull TLByteReference ref) { - TL_BYTE_REF_POOL.get().put(ref); - } - - static void release(@NotNull TLShortReference ref) { - TL_SHORT_REF_POOL.get().put(ref); - } - - static void release(@NotNull TLCharReference ref) { - TL_CHAR_REF_POOL.get().put(ref); - } - - static void release(@NotNull TLIntReference ref) { - TL_INT_REF_POOL.get().put(ref); - } - - static void release(@NotNull TLLongReference ref) { - TL_LONG_REF_POOL.get().put(ref); - } - - static void release(@NotNull TLFloatReference ref) { - TL_FLOAT_REF_POOL.get().put(ref); - } - - static void release(@NotNull TLDoubleReference ref) { - TL_DOUBLE_REF_POOL.get().put(ref); - } - - static void release(@NotNull TLObjectReference ref) { - TL_OBJECT_REF_POOL.get().put(ref); - } - - private ReferenceFactory() { - throw new IllegalArgumentException(); - } -} +package javasabr.rlib.common.util.ref; + +import javasabr.rlib.common.util.pools.PoolFactory; +import javasabr.rlib.common.util.pools.ReusablePool; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author JavaSaBr + */ +public final class ReferenceFactory { + + private static final ReusablePool GLOBAL_BYTE_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalByteReference.class); + private static final ReusablePool GLOBAL_SHORT_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalShortReference.class); + private static final ReusablePool GLOBAL_CHAR_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalCharReference.class); + private static final ReusablePool GLOBAL_INT_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalIntReference.class); + private static final ReusablePool GLOBAL_LONG_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalLongReference.class); + private static final ReusablePool GLOBAL_FLOAT_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalFloatReference.class); + private static final ReusablePool GLOBAL_DOUBLE_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalDoubleReference.class); + private static final ReusablePool GLOBAL_OBJ_REF_POOL = + PoolFactory.newConcurrentStampedLockReusablePool(GlobalObjectReference.class); + + private static final ThreadLocal> TL_BYTE_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLByteReference.class)); + private static final ThreadLocal> TL_SHORT_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLShortReference.class)); + private static final ThreadLocal> TL_CHAR_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLCharReference.class)); + private static final ThreadLocal> TL_INT_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLIntReference.class)); + private static final ThreadLocal> TL_LONG_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLLongReference.class)); + private static final ThreadLocal> TL_FLOAT_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLFloatReference.class)); + private static final ThreadLocal> TL_DOUBLE_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLDoubleReference.class)); + private static final ThreadLocal> TL_OBJECT_REF_POOL = + ThreadLocal.withInitial(() -> PoolFactory.newReusablePool(TLObjectReference.class)); + + /** + * @param value the init value. + * @return the new byte ref. + * @since 9.2.1 + */ + public static @NotNull ByteReference newByteRef(byte value) { + return new ByteReference(value); + } + + /** + * @param value the init value. + * @return the new byte ref. + * @since 9.2.1 + */ + public static @NotNull ByteReference newReusableByteRef(byte value) { + var ref = GLOBAL_BYTE_REF_POOL.take(GlobalByteReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new byte ref. + * @since 9.2.1 + */ + public static @NotNull ByteReference newThreadLocalByteRef(byte value) { + var ref = TL_BYTE_REF_POOL.get().take(TLByteReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new short ref. + * @since 9.2.1 + */ + public static @NotNull ShortReference newShortRef(short value) { + return new ShortReference(value); + } + + /** + * @param value the init value. + * @return the new short ref. + * @since 9.2.1 + */ + public static @NotNull ShortReference newReusableShortRef(short value) { + var ref = GLOBAL_SHORT_REF_POOL.take(GlobalShortReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new short ref. + * @since 9.2.1 + */ + public static @NotNull ShortReference newThreadLocalShortRef(short value) { + var ref = TL_SHORT_REF_POOL.get().take(TLShortReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new char ref. + * @since 9.2.1 + */ + public static @NotNull CharReference newCharRef(char value) { + return new CharReference(value); + } + + /** + * @param value the init value. + * @return the new char ref. + * @since 9.2.1 + */ + public static @NotNull CharReference newReusableCharRef(char value) { + var ref = GLOBAL_CHAR_REF_POOL.take(GlobalCharReference::new); + ref.setValue(value); + return ref ; + } + + /** + * @param value the init value. + * @return the new char ref. + * @since 9.2.1 + */ + public static @NotNull CharReference newThreadLocalCharRef(char value) { + var ref = TL_CHAR_REF_POOL.get().take(TLCharReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new int ref. + * @since 9.2.1 + */ + public static @NotNull IntReference newIntRef(int value) { + return new IntReference(value); + } + + /** + * @param value the init value. + * @return the new int ref. + * @since 9.2.1 + */ + public static @NotNull IntReference newReusableIntRef(int value) { + var ref = GLOBAL_INT_REF_POOL.take(GlobalIntReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new int ref. + * @since 9.2.1 + */ + public static @NotNull IntReference newThreadLocalIntRef(int value) { + var ref = TL_INT_REF_POOL.get().take(TLIntReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new long ref. + * @since 9.2.1 + */ + public static @NotNull LongReference newLongRef(long value) { + return new LongReference(value); + } + + /** + * @param value the init value. + * @return the new long ref. + * @since 9.2.1 + */ + public static @NotNull LongReference newReusableLongRef(long value) { + var ref = GLOBAL_LONG_REF_POOL.take(GlobalLongReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new long ref. + * @since 9.2.1 + */ + public static @NotNull LongReference newThreadLocalLongRef(long value) { + var ref = TL_LONG_REF_POOL.get().take(TLLongReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new float ref. + * @since 9.2.1 + */ + public static @NotNull FloatReference newFloatRef(float value) { + return new FloatReference(value); + } + + /** + * @param value the init value. + * @return the new float ref. + * @since 9.2.1 + */ + public static @NotNull FloatReference newReusableFloatRef(float value) { + var ref = GLOBAL_FLOAT_REF_POOL.take(GlobalFloatReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new float ref. + * @since 9.2.1 + */ + public static @NotNull FloatReference newThreadLocalFloatRef(float value) { + var ref = TL_FLOAT_REF_POOL.get().take(TLFloatReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new double ref. + * @since 9.2.1 + */ + public static @NotNull DoubleReference newDoubleRef(double value) { + return new DoubleReference(value); + } + + /** + * @param value the init value. + * @return the new double ref. + * @since 9.2.1 + */ + public static @NotNull DoubleReference newReusableDoubleRef(double value) { + var ref = GLOBAL_DOUBLE_REF_POOL.take(GlobalDoubleReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @return the new double ref. + * @since 9.2.1 + */ + public static @NotNull DoubleReference newThreadLocalDoubleRef(double value) { + var ref = TL_DOUBLE_REF_POOL.get().take(TLDoubleReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @param the object's type. + * @return the new object ref. + * @since 9.2.1 + */ + public static @NotNull ObjectReference newObjRef(@Nullable T value) { + return new ObjectReference<>(value); + } + + /** + * @param value the init value. + * @param the object's type. + * @return the new object ref. + * @since 9.2.1 + */ + public static @NotNull ObjectReference newReusableObjRef(@Nullable T value) { + ObjectReference ref = GLOBAL_OBJ_REF_POOL.take(GlobalObjectReference::new); + ref.setValue(value); + return ref; + } + + /** + * @param value the init value. + * @param the object's type. + * @return the new object ref. + * @since 9.2.1 + */ + public static @NotNull ObjectReference newThreadLocalObjRef(@Nullable T value) { + TLObjectReference ref = TL_OBJECT_REF_POOL.get().take(TLObjectReference::new); + ref.setValue(value); + return ref; + } + + static void release(@NotNull GlobalByteReference ref) { + GLOBAL_BYTE_REF_POOL.put(ref); + } + + static void release(@NotNull GlobalShortReference ref) { + GLOBAL_SHORT_REF_POOL.put(ref); + } + + static void release(@NotNull GlobalCharReference ref) { + GLOBAL_CHAR_REF_POOL.put(ref); + } + + static void release(@NotNull GlobalIntReference ref) { + GLOBAL_INT_REF_POOL.put(ref); + } + + static void release(@NotNull GlobalLongReference ref) { + GLOBAL_LONG_REF_POOL.put(ref); + } + + static void release(@NotNull GlobalFloatReference ref) { + GLOBAL_FLOAT_REF_POOL.put(ref); + } + + static void release(@NotNull GlobalDoubleReference ref) { + GLOBAL_DOUBLE_REF_POOL.put(ref); + } + + static void release(@NotNull GlobalObjectReference ref) { + GLOBAL_OBJ_REF_POOL.put(ref); + } + + static void release(@NotNull TLByteReference ref) { + TL_BYTE_REF_POOL.get().put(ref); + } + + static void release(@NotNull TLShortReference ref) { + TL_SHORT_REF_POOL.get().put(ref); + } + + static void release(@NotNull TLCharReference ref) { + TL_CHAR_REF_POOL.get().put(ref); + } + + static void release(@NotNull TLIntReference ref) { + TL_INT_REF_POOL.get().put(ref); + } + + static void release(@NotNull TLLongReference ref) { + TL_LONG_REF_POOL.get().put(ref); + } + + static void release(@NotNull TLFloatReference ref) { + TL_FLOAT_REF_POOL.get().put(ref); + } + + static void release(@NotNull TLDoubleReference ref) { + TL_DOUBLE_REF_POOL.get().put(ref); + } + + static void release(@NotNull TLObjectReference ref) { + TL_OBJECT_REF_POOL.get().put(ref); + } + + private ReferenceFactory() { + throw new IllegalArgumentException(); + } +} diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ShortReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ShortReference.java similarity index 64% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/ShortReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/ShortReference.java index b8833fea..e712c14a 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/ShortReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/ShortReference.java @@ -1,6 +1,11 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; /** * The reference to short value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLByteReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLByteReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLByteReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLByteReference.java index 1bc1f5c3..381b5878 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLByteReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLByteReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to byte value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLCharReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLCharReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLCharReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLCharReference.java index f6ba974f..bc387bfa 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLCharReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLCharReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to char value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLDoubleReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLDoubleReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLDoubleReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLDoubleReference.java index 9324c243..d2185350 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLDoubleReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLDoubleReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to double value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLFloatReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLFloatReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLFloatReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLFloatReference.java index 9ff4d7db..0a3f07ff 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLFloatReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLFloatReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to float value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLIntReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLIntReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLIntReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLIntReference.java index 5e84b8d6..48c5310c 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLIntReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLIntReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to integer value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLLongReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLLongReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLLongReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLLongReference.java index 6821eaa0..84f28220 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLLongReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLLongReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to long value. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLObjectReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLObjectReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLObjectReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLObjectReference.java index 4ded56f1..7fc75a23 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLObjectReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLObjectReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to object. diff --git a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLShortReference.java b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLShortReference.java similarity index 84% rename from rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLShortReference.java rename to rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLShortReference.java index 5641717c..decd05e7 100644 --- a/rlib-common/src/main/java/com/ss/rlib/common/util/ref/TLShortReference.java +++ b/rlib-common/src/main/java/javasabr/rlib/common/util/ref/TLShortReference.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.util.ref; +package javasabr.rlib.common.util.ref; /** * The reference to short value. diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/BaseTest.java b/rlib-common/src/test/java/javasabr/rlib/common/BaseTest.java similarity index 94% rename from rlib-common/src/test/java/com/ss/rlib/common/test/BaseTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/BaseTest.java index e1eeb288..06ee95d4 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/BaseTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/BaseTest.java @@ -1,4 +1,4 @@ -package com.ss.rlib.common.test; +package javasabr.rlib.common; import org.jetbrains.annotations.NotNull; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/classpath/ClasspathScannerTests.java b/rlib-common/src/test/java/javasabr/rlib/common/classpath/ClasspathScannerTests.java similarity index 79% rename from rlib-common/src/test/java/com/ss/rlib/common/test/classpath/ClasspathScannerTests.java rename to rlib-common/src/test/java/javasabr/rlib/common/classpath/ClasspathScannerTests.java index 27453c4c..161f6acd 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/classpath/ClasspathScannerTests.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/classpath/ClasspathScannerTests.java @@ -1,12 +1,10 @@ -package com.ss.rlib.common.test.classpath; +package javasabr.rlib.common.classpath; -import com.ss.rlib.common.classpath.ClassPathScannerFactory; -import com.ss.rlib.common.util.array.impl.AbstractArray; +import java.util.Collection; +import javasabr.rlib.common.util.array.impl.AbstractArray; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.Collection; - /** * @author JavaSaBr */ diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/compiler/CompilerTests.java b/rlib-common/src/test/java/javasabr/rlib/common/compiler/CompilerTests.java similarity index 88% rename from rlib-common/src/test/java/com/ss/rlib/common/test/compiler/CompilerTests.java rename to rlib-common/src/test/java/javasabr/rlib/common/compiler/CompilerTests.java index 6a528511..e213bc60 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/compiler/CompilerTests.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/compiler/CompilerTests.java @@ -1,12 +1,10 @@ -package com.ss.rlib.common.test.compiler; - -import com.ss.rlib.common.compiler.CompilerFactory; -import com.ss.rlib.common.util.ClassUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +package javasabr.rlib.common.compiler; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; +import javasabr.rlib.common.util.ClassUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * The list of tests to work with compiler API. diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/concurrent/executor/TestThreadPoolTaskExecutor.java b/rlib-common/src/test/java/javasabr/rlib/common/concurrent/executor/TestThreadPoolTaskExecutor.java similarity index 77% rename from rlib-common/src/test/java/com/ss/rlib/common/test/concurrent/executor/TestThreadPoolTaskExecutor.java rename to rlib-common/src/test/java/javasabr/rlib/common/concurrent/executor/TestThreadPoolTaskExecutor.java index b67aefbc..fd953e66 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/concurrent/executor/TestThreadPoolTaskExecutor.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/concurrent/executor/TestThreadPoolTaskExecutor.java @@ -1,10 +1,9 @@ -package com.ss.rlib.common.test.concurrent.executor; +package javasabr.rlib.common.concurrent.executor; -import com.ss.rlib.common.concurrent.GroupThreadFactory; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.concurrent.executor.TaskExecutor; -import com.ss.rlib.common.concurrent.executor.impl.ThreadPoolTaskExecutor; -import com.ss.rlib.common.concurrent.util.ThreadUtils; +import javasabr.rlib.common.concurrent.GroupThreadFactory; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.concurrent.executor.impl.ThreadPoolTaskExecutor; +import javasabr.rlib.common.concurrent.util.ThreadUtils; import org.junit.jupiter.api.Assertions; /** diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/concurrent/lock/TestPrimitiveAtomicReadWriteLock.java b/rlib-common/src/test/java/javasabr/rlib/common/concurrent/lock/TestPrimitiveAtomicReadWriteLock.java similarity index 92% rename from rlib-common/src/test/java/com/ss/rlib/common/test/concurrent/lock/TestPrimitiveAtomicReadWriteLock.java rename to rlib-common/src/test/java/javasabr/rlib/common/concurrent/lock/TestPrimitiveAtomicReadWriteLock.java index e8618056..7f50542e 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/concurrent/lock/TestPrimitiveAtomicReadWriteLock.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/concurrent/lock/TestPrimitiveAtomicReadWriteLock.java @@ -1,9 +1,4 @@ -package com.ss.rlib.common.test.concurrent.lock; - -import com.ss.rlib.common.concurrent.lock.AsyncReadSyncWriteLock; -import com.ss.rlib.common.concurrent.lock.impl.AtomicReadWriteLock; -import com.ss.rlib.common.concurrent.lock.impl.ReentrantARSWLock; -import com.ss.rlib.common.concurrent.util.ThreadUtils; +package javasabr.rlib.common.concurrent.lock; import java.util.ArrayList; import java.util.List; @@ -12,6 +7,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import javasabr.rlib.common.concurrent.lock.impl.AtomicReadWriteLock; +import javasabr.rlib.common.concurrent.lock.impl.ReentrantARSWLock; +import javasabr.rlib.common.concurrent.util.ThreadUtils; /** * Тест функционала блокировщика. diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/geom/QuaternionTests.java b/rlib-common/src/test/java/javasabr/rlib/common/geom/QuaternionTests.java similarity index 89% rename from rlib-common/src/test/java/com/ss/rlib/common/test/geom/QuaternionTests.java rename to rlib-common/src/test/java/javasabr/rlib/common/geom/QuaternionTests.java index 36978a84..ab2888d8 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/geom/QuaternionTests.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/geom/QuaternionTests.java @@ -1,8 +1,5 @@ -package com.ss.rlib.common.test.geom; +package javasabr.rlib.common.geom; -import com.ss.rlib.common.geom.DirectionType; -import com.ss.rlib.common.geom.Quaternion4f; -import com.ss.rlib.common.geom.Vector3f; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/plugin/extension/ExtensionPointTests.java b/rlib-common/src/test/java/javasabr/rlib/common/plugin/extension/ExtensionPointTests.java similarity index 80% rename from rlib-common/src/test/java/com/ss/rlib/common/test/plugin/extension/ExtensionPointTests.java rename to rlib-common/src/test/java/javasabr/rlib/common/plugin/extension/ExtensionPointTests.java index 28664db2..a08a272c 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/plugin/extension/ExtensionPointTests.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/plugin/extension/ExtensionPointTests.java @@ -1,14 +1,11 @@ -package com.ss.rlib.common.test.plugin.extension; +package javasabr.rlib.common.plugin.extension; -import com.ss.rlib.common.plugin.extension.ExtensionPoint; -import com.ss.rlib.common.plugin.extension.ExtensionPointManager; +import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.Arrays; - /** - * The list of tests {@link com.ss.rlib.common.plugin.extension.ExtensionPoint}. + * The list of tests {@link ExtensionPoint}. * * @author JavaSaBr */ diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/plugin/system/PluginSystemTests.java b/rlib-common/src/test/java/javasabr/rlib/common/plugin/system/PluginSystemTests.java similarity index 79% rename from rlib-common/src/test/java/com/ss/rlib/common/test/plugin/system/PluginSystemTests.java rename to rlib-common/src/test/java/javasabr/rlib/common/plugin/system/PluginSystemTests.java index 7335cdf1..b8da4f48 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/plugin/system/PluginSystemTests.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/plugin/system/PluginSystemTests.java @@ -1,11 +1,10 @@ -package com.ss.rlib.common.test.plugin.system; - -import com.ss.rlib.common.plugin.Version; -import com.ss.rlib.common.plugin.impl.PluginSystemFactory; -import org.junit.jupiter.api.Test; +package javasabr.rlib.common.plugin.system; import java.nio.file.Paths; import java.util.concurrent.ForkJoinPool; +import javasabr.rlib.common.plugin.Version; +import javasabr.rlib.common.plugin.impl.PluginSystemFactory; +import org.junit.jupiter.api.Test; /** * @author JavaSaBr diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/ArrayUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/ArrayUtilsTest.java similarity index 93% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/ArrayUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/ArrayUtilsTest.java index 26e5a64f..52a96903 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/ArrayUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/ArrayUtilsTest.java @@ -1,8 +1,12 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; -import static org.junit.jupiter.api.Assertions.*; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.array.ArrayFactory; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import javasabr.rlib.common.util.array.ArrayFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/BufferUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/BufferUtilsTest.java similarity index 95% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/BufferUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/BufferUtilsTest.java index 0f52f626..5a880560 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/BufferUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/BufferUtilsTest.java @@ -1,11 +1,9 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; -import com.ss.rlib.common.util.BufferUtils; +import java.nio.ByteBuffer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.nio.ByteBuffer; - /** * @author JavaSaBr */ diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/DateUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/DateUtilsTest.java similarity index 97% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/DateUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/DateUtilsTest.java index bc5f000e..c4f9a34f 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/DateUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/DateUtilsTest.java @@ -1,15 +1,14 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE; import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME; -import com.ss.rlib.common.util.DateUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.ZonedDateTime; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DateUtilsTest { diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/FileUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/FileUtilsTest.java similarity index 92% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/FileUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/FileUtilsTest.java index b7eaefb8..2416fe71 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/FileUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/FileUtilsTest.java @@ -1,7 +1,9 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.*; -import com.ss.rlib.common.util.FileUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/IOUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/IOUtilsTest.java similarity index 92% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/IOUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/IOUtilsTest.java index 3e56c6eb..b9eba31c 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/IOUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/IOUtilsTest.java @@ -1,14 +1,16 @@ -package com.ss.rlib.common.test.util; - -import com.ss.rlib.common.util.IOUtils; -import com.ss.rlib.common.util.StringUtils; +package javasabr.rlib.common.util; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.UncheckedIOException; +import java.nio.charset.StandardCharsets; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.io.*; -import java.nio.charset.StandardCharsets; - /** * @author JavaSaBr */ diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/NumberUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/NumberUtilsTest.java similarity index 96% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/NumberUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/NumberUtilsTest.java index 139d7368..419a3863 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/NumberUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/NumberUtilsTest.java @@ -1,7 +1,12 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.*; -import com.ss.rlib.common.util.NumberUtils; import org.junit.jupiter.api.Test; /** diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/ReferencesTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/ReferencesTest.java similarity index 98% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/ReferencesTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/ReferencesTest.java index 86bacb93..ea50dc9a 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/ReferencesTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/ReferencesTest.java @@ -1,6 +1,6 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; -import com.ss.rlib.common.util.ref.*; +import javasabr.rlib.common.util.ref.ReferenceFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/ReflectionUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/ReflectionUtilsTest.java similarity index 96% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/ReflectionUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/ReflectionUtilsTest.java index 22915274..e97fffd6 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/ReflectionUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/ReflectionUtilsTest.java @@ -1,8 +1,8 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import com.ss.rlib.common.util.ReflectionUtils; + import org.junit.jupiter.api.Test; public class ReflectionUtilsTest { diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/StringUtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/StringUtilsTest.java similarity index 95% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/StringUtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/StringUtilsTest.java index 10e3bfe5..784ef999 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/StringUtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/StringUtilsTest.java @@ -1,13 +1,10 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; -import com.ss.rlib.common.util.StringUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.time.*; - /** - * Test methods in {@link com.ss.rlib.common.util.StringUtils} + * Test methods in {@link StringUtils} * * @author JavaSaBr */ diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/UtilsTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/UtilsTest.java similarity index 86% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/UtilsTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/UtilsTest.java index 513651b0..c1221323 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/UtilsTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/UtilsTest.java @@ -1,11 +1,10 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; -import com.ss.rlib.common.util.Utils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** - * Tests of {@link com.ss.rlib.common.util.Utils} methods. + * Tests of {@link Utils} methods. * * @author JavaSaBr */ diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/VarTableTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/VarTableTest.java similarity index 93% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/VarTableTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/VarTableTest.java index 6d68b7c2..ba7f22ba 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/VarTableTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/VarTableTest.java @@ -1,8 +1,10 @@ -package com.ss.rlib.common.test.util; +package javasabr.rlib.common.util; -import static com.ss.rlib.common.util.array.ArrayFactory.*; -import com.ss.rlib.common.util.VarTable; -import com.ss.rlib.common.util.array.ArrayFactory; +import static javasabr.rlib.common.util.array.ArrayFactory.toArray; +import static javasabr.rlib.common.util.array.ArrayFactory.toBooleanArray; +import static javasabr.rlib.common.util.array.ArrayFactory.toIntArray; + +import javasabr.rlib.common.util.array.ArrayFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -142,7 +144,7 @@ void testAddAndGetSomeTypes() { var vars = new VarTable(); vars.put("string", "Hello"); - vars.put("intArray", ArrayFactory.toIntArray(1, 2, 3, 5)); + vars.put("intArray", toIntArray(1, 2, 3, 5)); vars.put("floatStringArray", "1.5,4.2,5.5"); vars.put("stringEnum", "THIRD"); vars.put("enum", SimpleEnum.SECOND); @@ -155,7 +157,7 @@ void testAddAndGetSomeTypes() { var unsafeGet = vars.get("enum"); Assertions.assertEquals("Hello", string); - Assertions.assertArrayEquals(array, ArrayFactory.toIntArray(1, 2, 3, 5)); + Assertions.assertArrayEquals(array, toIntArray(1, 2, 3, 5)); Assertions.assertArrayEquals(floatStringArray, ArrayFactory.toFloatArray(1.5F, 4.2F, 5.5F)); Assertions.assertEquals(SimpleEnum.THIRD, stringEnum); Assertions.assertEquals(SimpleEnum.SECOND, anEnum); diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ArrayTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/array/ArrayTest.java similarity index 98% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ArrayTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/array/ArrayTest.java index d5c32e5e..cd5e082f 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ArrayTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/array/ArrayTest.java @@ -1,14 +1,12 @@ -package com.ss.rlib.common.test.util.array; +package javasabr.rlib.common.util.array; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.test.BaseTest; -import com.ss.rlib.common.util.NumberUtils; -import com.ss.rlib.common.util.array.*; +import java.util.Objects; +import javasabr.rlib.common.BaseTest; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.NumberUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.Objects; - /** * The list of tests {@link Array}. * diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ConcurrentArrayTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/array/ConcurrentArrayTest.java similarity index 95% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ConcurrentArrayTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/array/ConcurrentArrayTest.java index bc2e1a3b..2c71c99e 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ConcurrentArrayTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/array/ConcurrentArrayTest.java @@ -1,17 +1,18 @@ -package com.ss.rlib.common.test.util.array; - -import static org.junit.jupiter.api.Assertions.*; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.test.BaseTest; -import com.ss.rlib.common.util.NumberUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +package javasabr.rlib.common.util.array; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collections; import java.util.Objects; +import javasabr.rlib.common.BaseTest; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.NumberUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author JavaSaBr diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/CopyOnModifyArrayTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/array/CopyOnModifyArrayTest.java similarity index 96% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/array/CopyOnModifyArrayTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/array/CopyOnModifyArrayTest.java index d147d7c5..91d7a668 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/CopyOnModifyArrayTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/array/CopyOnModifyArrayTest.java @@ -1,13 +1,11 @@ -package com.ss.rlib.common.test.util.array; +package javasabr.rlib.common.util.array; -import static com.ss.rlib.common.util.array.ArrayFactory.asArray; -import static com.ss.rlib.common.util.array.ArrayFactory.toArray; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import static javasabr.rlib.common.util.array.ArrayFactory.asArray; +import static javasabr.rlib.common.util.array.ArrayFactory.toArray; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class CopyOnModifyArrayTest { diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/DefaultIntegerArrayTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/array/DefaultIntegerArrayTest.java similarity index 97% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/array/DefaultIntegerArrayTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/array/DefaultIntegerArrayTest.java index 0f5d6d23..d0bcd604 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/DefaultIntegerArrayTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/array/DefaultIntegerArrayTest.java @@ -1,7 +1,5 @@ -package com.ss.rlib.common.test.util.array; +package javasabr.rlib.common.util.array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.IntegerArray; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/FastArrayTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/array/FastArrayTest.java similarity index 91% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/array/FastArrayTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/array/FastArrayTest.java index bbab5b18..4aac6c3b 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/FastArrayTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/array/FastArrayTest.java @@ -1,6 +1,5 @@ -package com.ss.rlib.common.test.util.array; +package javasabr.rlib.common.util.array; -import com.ss.rlib.common.util.array.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ReadOnlyIntegerArrayTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/array/ReadOnlyIntegerArrayTest.java similarity index 93% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ReadOnlyIntegerArrayTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/array/ReadOnlyIntegerArrayTest.java index 9cc32a06..47d11571 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ReadOnlyIntegerArrayTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/array/ReadOnlyIntegerArrayTest.java @@ -1,7 +1,5 @@ -package com.ss.rlib.common.test.util.array; +package javasabr.rlib.common.util.array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.IntegerArray; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ConcurrentObjectDictionaryTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ConcurrentObjectDictionaryTest.java similarity index 93% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ConcurrentObjectDictionaryTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ConcurrentObjectDictionaryTest.java index 197d172d..fadc0492 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ConcurrentObjectDictionaryTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ConcurrentObjectDictionaryTest.java @@ -1,8 +1,6 @@ -package com.ss.rlib.common.test.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.test.BaseTest; -import com.ss.rlib.common.util.dictionary.ConcurrentObjectDictionary; -import com.ss.rlib.common.util.dictionary.ObjectDictionary; +import javasabr.rlib.common.BaseTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ConcurrentStampedLockObjectDictionaryTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionaryTest.java similarity index 90% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ConcurrentStampedLockObjectDictionaryTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionaryTest.java index 1e885e76..adce2518 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ConcurrentStampedLockObjectDictionaryTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ConcurrentStampedLockObjectDictionaryTest.java @@ -1,13 +1,11 @@ -package com.ss.rlib.common.test.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.util.Utils; -import com.ss.rlib.common.util.dictionary.DictionaryFactory; -import com.ss.rlib.common.util.dictionary.ObjectDictionary; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; +import javasabr.rlib.common.util.Utils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.concurrent.*; - /** * @author JavaSaBr */ diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/FastLongDictionaryTests.java b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/FastLongDictionaryTests.java similarity index 84% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/FastLongDictionaryTests.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/FastLongDictionaryTests.java index 99efc58b..3e1f2e42 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/FastLongDictionaryTests.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/FastLongDictionaryTests.java @@ -1,16 +1,13 @@ -package com.ss.rlib.common.test.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import static com.ss.rlib.common.util.dictionary.DictionaryCollectors.toLongDictionary; -import static com.ss.rlib.common.util.dictionary.DictionaryFactory.newLongDictionary; +import static javasabr.rlib.common.util.dictionary.DictionaryCollectors.toLongDictionary; +import static javasabr.rlib.common.util.dictionary.DictionaryFactory.newLongDictionary; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.ss.rlib.common.util.dictionary.DictionaryFactory; -import com.ss.rlib.common.util.dictionary.FastLongDictionary; -import com.ss.rlib.common.util.dictionary.LongDictionary; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.function.Function; +import org.junit.jupiter.api.Test; /** * The list of tests {@link FastLongDictionary}. diff --git a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ObjectDictionaryTest.java b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ObjectDictionaryTest.java similarity index 91% rename from rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ObjectDictionaryTest.java rename to rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ObjectDictionaryTest.java index 6eacb8fe..c1c7803e 100644 --- a/rlib-common/src/test/java/com/ss/rlib/common/test/util/dictionary/ObjectDictionaryTest.java +++ b/rlib-common/src/test/java/javasabr/rlib/common/util/dictionary/ObjectDictionaryTest.java @@ -1,7 +1,5 @@ -package com.ss.rlib.common.test.util.dictionary; +package javasabr.rlib.common.util.dictionary; -import com.ss.rlib.common.util.dictionary.DictionaryFactory; -import com.ss.rlib.common.util.dictionary.ObjectDictionary; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/CssClasses.java b/rlib-fx/src/main/java/javasabr/rlib/fx/CssClasses.java similarity index 94% rename from rlib-fx/src/main/java/com/ss/rlib/fx/CssClasses.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/CssClasses.java index 83c70746..a3f98180 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/CssClasses.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/CssClasses.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx; +package javasabr.rlib.fx; /** * @author JavaSaBr diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/LoggerClass.java b/rlib-fx/src/main/java/javasabr/rlib/fx/LoggerClass.java similarity index 70% rename from rlib-fx/src/main/java/com/ss/rlib/fx/LoggerClass.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/LoggerClass.java index 746d5223..178d22c7 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/LoggerClass.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/LoggerClass.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx; +package javasabr.rlib.fx; /** * @author JavaSaBr diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/ControlDialog.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/ControlDialog.java similarity index 97% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/ControlDialog.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/ControlDialog.java index 2ee2c8c8..19be2c60 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/ControlDialog.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/ControlDialog.java @@ -1,9 +1,7 @@ -package com.ss.rlib.fx.control.dialog; +package javasabr.rlib.fx.control.dialog; import static java.lang.Math.max; -import com.ss.rlib.fx.handler.ControlDragHandler; -import com.ss.rlib.fx.handler.ControlResizeHandler; -import com.ss.rlib.fx.util.FxUtils; + import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.geometry.Point2D; @@ -12,6 +10,9 @@ import javafx.scene.Scene; import javafx.scene.input.MouseEvent; import javafx.scene.layout.VBox; +import javasabr.rlib.fx.handler.ControlDragHandler; +import javasabr.rlib.fx.handler.ControlResizeHandler; +import javasabr.rlib.fx.util.FxUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/ControlDialogSupport.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/ControlDialogSupport.java similarity index 97% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/ControlDialogSupport.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/ControlDialogSupport.java index 5a0394f8..d4c77550 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/ControlDialogSupport.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/ControlDialogSupport.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx.control.dialog; +package javasabr.rlib.fx.control.dialog; import javafx.scene.Scene; import javafx.scene.layout.Pane; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/DefaultControlDialog.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/DefaultControlDialog.java similarity index 94% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/DefaultControlDialog.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/DefaultControlDialog.java index 1cb0c8d6..4588b52a 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/dialog/DefaultControlDialog.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/dialog/DefaultControlDialog.java @@ -1,10 +1,10 @@ -package com.ss.rlib.fx.control.dialog; +package javasabr.rlib.fx.control.dialog; -import com.ss.rlib.fx.CssClasses; -import com.ss.rlib.fx.util.FxUtils; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; +import javasabr.rlib.fx.CssClasses; +import javasabr.rlib.fx.util.FxUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/FloatArrayTextField.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/FloatArrayTextField.java similarity index 77% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/input/FloatArrayTextField.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/input/FloatArrayTextField.java index 96d54bf6..6b4d56ce 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/FloatArrayTextField.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/FloatArrayTextField.java @@ -1,6 +1,6 @@ -package com.ss.rlib.fx.control.input; +package javasabr.rlib.fx.control.input; -import com.ss.rlib.fx.util.converter.FloatArrayStringConverter; +import javasabr.rlib.fx.util.converter.FloatArrayStringConverter; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/FloatTextField.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/FloatTextField.java similarity index 89% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/input/FloatTextField.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/input/FloatTextField.java index 5609ce0e..54207d24 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/FloatTextField.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/FloatTextField.java @@ -1,8 +1,8 @@ -package com.ss.rlib.fx.control.input; +package javasabr.rlib.fx.control.input; -import com.ss.rlib.fx.util.converter.LimitedFloatStringConverter; -import com.ss.rlib.fx.util.converter.LimitedNumberStringConverter; import javafx.scene.input.ScrollEvent; +import javasabr.rlib.fx.util.converter.LimitedFloatStringConverter; +import javasabr.rlib.fx.util.converter.LimitedNumberStringConverter; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/IntegerArrayTextField.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/IntegerArrayTextField.java similarity index 77% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/input/IntegerArrayTextField.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/input/IntegerArrayTextField.java index fb43ece9..22ef1a13 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/IntegerArrayTextField.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/IntegerArrayTextField.java @@ -1,6 +1,6 @@ -package com.ss.rlib.fx.control.input; +package javasabr.rlib.fx.control.input; -import com.ss.rlib.fx.util.converter.IntegerArrayStringConverter; +import javasabr.rlib.fx.util.converter.IntegerArrayStringConverter; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/IntegerTextField.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/IntegerTextField.java similarity index 89% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/input/IntegerTextField.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/input/IntegerTextField.java index daab1cd3..7978bec0 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/IntegerTextField.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/IntegerTextField.java @@ -1,8 +1,8 @@ -package com.ss.rlib.fx.control.input; +package javasabr.rlib.fx.control.input; -import com.ss.rlib.fx.util.converter.LimitedIntegerStringConverter; -import com.ss.rlib.fx.util.converter.LimitedNumberStringConverter; import javafx.scene.input.ScrollEvent; +import javasabr.rlib.fx.util.converter.LimitedIntegerStringConverter; +import javasabr.rlib.fx.util.converter.LimitedNumberStringConverter; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/NumberTextField.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/NumberTextField.java similarity index 95% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/input/NumberTextField.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/input/NumberTextField.java index dc792b59..d49adc86 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/NumberTextField.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/NumberTextField.java @@ -1,6 +1,6 @@ -package com.ss.rlib.fx.control.input; +package javasabr.rlib.fx.control.input; -import com.ss.rlib.fx.util.converter.LimitedNumberStringConverter; +import javasabr.rlib.fx.util.converter.LimitedNumberStringConverter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/ScrollableTypedTextField.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/ScrollableTypedTextField.java similarity index 97% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/input/ScrollableTypedTextField.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/input/ScrollableTypedTextField.java index c3578c70..d70b1726 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/ScrollableTypedTextField.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/ScrollableTypedTextField.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx.control.input; +package javasabr.rlib.fx.control.input; import javafx.scene.input.ScrollEvent; import org.jetbrains.annotations.NotNull; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/TypedTextField.java b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/TypedTextField.java similarity index 95% rename from rlib-fx/src/main/java/com/ss/rlib/fx/control/input/TypedTextField.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/control/input/TypedTextField.java index 4e5bde7b..45db876b 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/control/input/TypedTextField.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/control/input/TypedTextField.java @@ -1,6 +1,7 @@ -package com.ss.rlib.fx.control.input; +package javasabr.rlib.fx.control.input; + +import static javasabr.rlib.common.util.ClassUtils.unsafeCast; -import static com.ss.rlib.common.util.ClassUtils.unsafeCast; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.value.ChangeListener; import javafx.scene.control.TextField; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/window/popup/dialog/AbstractPopupDialog.java b/rlib-fx/src/main/java/javasabr/rlib/fx/dialog/AbstractPopupDialog.java similarity index 98% rename from rlib-fx/src/main/java/com/ss/rlib/fx/window/popup/dialog/AbstractPopupDialog.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/dialog/AbstractPopupDialog.java index 514106c8..db845ee0 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/window/popup/dialog/AbstractPopupDialog.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/dialog/AbstractPopupDialog.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx.window.popup.dialog; +package javasabr.rlib.fx.dialog; import javafx.geometry.Point2D; import javafx.scene.Node; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/window/popup/dialog/SimplePopupDialog.java b/rlib-fx/src/main/java/javasabr/rlib/fx/dialog/SimplePopupDialog.java similarity index 94% rename from rlib-fx/src/main/java/com/ss/rlib/fx/window/popup/dialog/SimplePopupDialog.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/dialog/SimplePopupDialog.java index f0c9b950..84709c18 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/window/popup/dialog/SimplePopupDialog.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/dialog/SimplePopupDialog.java @@ -1,14 +1,14 @@ -package com.ss.rlib.fx.window.popup.dialog; +package javasabr.rlib.fx.dialog; -import com.ss.rlib.fx.CssClasses; -import com.ss.rlib.fx.handler.WindowDragHandler; -import com.ss.rlib.fx.util.FxUtils; import javafx.geometry.Point2D; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.TextArea; import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; +import javasabr.rlib.fx.CssClasses; +import javasabr.rlib.fx.handler.WindowDragHandler; +import javasabr.rlib.fx.util.FxUtils; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/ControlDragHandler.java b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/ControlDragHandler.java similarity index 94% rename from rlib-fx/src/main/java/com/ss/rlib/fx/handler/ControlDragHandler.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/handler/ControlDragHandler.java index 9e2cc820..69b5af33 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/ControlDragHandler.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/ControlDragHandler.java @@ -1,11 +1,11 @@ -package com.ss.rlib.fx.handler; +package javasabr.rlib.fx.handler; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerLevel; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.fx.LoggerClass; import javafx.scene.Node; import javafx.scene.input.MouseEvent; +import javasabr.rlib.fx.LoggerClass; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerLevel; +import javasabr.rlib.logger.api.LoggerManager; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/ControlResizeHandler.java b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/ControlResizeHandler.java similarity index 91% rename from rlib-fx/src/main/java/com/ss/rlib/fx/handler/ControlResizeHandler.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/handler/ControlResizeHandler.java index 80995343..8a1d703c 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/ControlResizeHandler.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/ControlResizeHandler.java @@ -1,6 +1,11 @@ -package com.ss.rlib.fx.handler; +package javasabr.rlib.fx.handler; + +import static javafx.scene.input.MouseEvent.MOUSE_DRAGGED; +import static javafx.scene.input.MouseEvent.MOUSE_EXITED; +import static javafx.scene.input.MouseEvent.MOUSE_EXITED_TARGET; +import static javafx.scene.input.MouseEvent.MOUSE_MOVED; +import static javafx.scene.input.MouseEvent.MOUSE_PRESSED; -import static javafx.scene.input.MouseEvent.*; import javafx.event.EventHandler; import javafx.scene.Cursor; import javafx.scene.input.MouseEvent; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/WindowDragHandler.java b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/WindowDragHandler.java similarity index 95% rename from rlib-fx/src/main/java/com/ss/rlib/fx/handler/WindowDragHandler.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/handler/WindowDragHandler.java index 37cd10a7..a11dd1ac 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/WindowDragHandler.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/WindowDragHandler.java @@ -1,12 +1,12 @@ -package com.ss.rlib.fx.handler; +package javasabr.rlib.fx.handler; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerLevel; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.fx.LoggerClass; import javafx.geometry.Point2D; import javafx.scene.Node; import javafx.scene.input.MouseEvent; +import javasabr.rlib.fx.LoggerClass; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerLevel; +import javasabr.rlib.logger.api.LoggerManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/WindowResizeHandler.java b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/WindowResizeHandler.java similarity index 94% rename from rlib-fx/src/main/java/com/ss/rlib/fx/handler/WindowResizeHandler.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/handler/WindowResizeHandler.java index 863aecf4..1500ce7d 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/handler/WindowResizeHandler.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/handler/WindowResizeHandler.java @@ -1,6 +1,11 @@ -package com.ss.rlib.fx.handler; +package javasabr.rlib.fx.handler; + +import static javafx.scene.input.MouseEvent.MOUSE_DRAGGED; +import static javafx.scene.input.MouseEvent.MOUSE_EXITED; +import static javafx.scene.input.MouseEvent.MOUSE_EXITED_TARGET; +import static javafx.scene.input.MouseEvent.MOUSE_MOVED; +import static javafx.scene.input.MouseEvent.MOUSE_PRESSED; -import static javafx.scene.input.MouseEvent.*; import javafx.event.EventHandler; import javafx.scene.Cursor; import javafx.scene.Node; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/DraggablePanel.java b/rlib-fx/src/main/java/javasabr/rlib/fx/impl/DraggablePanel.java similarity index 98% rename from rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/DraggablePanel.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/impl/DraggablePanel.java index 5a298214..f3ca1b0c 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/DraggablePanel.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/impl/DraggablePanel.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx.component.impl; +package javasabr.rlib.fx.impl; import javafx.geometry.Point2D; import javafx.scene.input.MouseEvent; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/SimpleDraggableElement.java b/rlib-fx/src/main/java/javasabr/rlib/fx/impl/SimpleDraggableElement.java similarity index 97% rename from rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/SimpleDraggableElement.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/impl/SimpleDraggableElement.java index 90a25e80..686cd370 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/SimpleDraggableElement.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/impl/SimpleDraggableElement.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx.component.impl; +package javasabr.rlib.fx.impl; import javafx.scene.input.DragEvent; import javafx.scene.input.Dragboard; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/SimpleDroppedPanel.java b/rlib-fx/src/main/java/javasabr/rlib/fx/impl/SimpleDroppedPanel.java similarity index 97% rename from rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/SimpleDroppedPanel.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/impl/SimpleDroppedPanel.java index 4ada6337..71b65ac7 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/component/impl/SimpleDroppedPanel.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/impl/SimpleDroppedPanel.java @@ -1,4 +1,4 @@ -package com.ss.rlib.fx.component.impl; +package javasabr.rlib.fx.impl; import javafx.scene.input.DragEvent; import javafx.scene.input.TransferMode; diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/scene/input/InternalContent.java b/rlib-fx/src/main/java/javasabr/rlib/fx/input/InternalContent.java similarity index 93% rename from rlib-fx/src/main/java/com/ss/rlib/fx/scene/input/InternalContent.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/input/InternalContent.java index 033da5b0..10544515 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/scene/input/InternalContent.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/input/InternalContent.java @@ -1,11 +1,11 @@ -package com.ss.rlib.fx.scene.input; +package javasabr.rlib.fx.input; -import static com.ss.rlib.common.util.ClassUtils.unsafeCast; -import com.ss.rlib.common.util.ref.Reference; -import javafx.scene.input.DataFormat; -import org.jetbrains.annotations.Nullable; +import static javasabr.rlib.common.util.ClassUtils.unsafeCast; import java.util.HashMap; +import javafx.scene.input.DataFormat; +import javasabr.rlib.common.util.ref.Reference; +import org.jetbrains.annotations.Nullable; /** * The implementation of a clipboard/dragboard content for internal using. diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/FXUtils.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/FXUtils.java similarity index 99% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/FXUtils.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/FXUtils.java index 5e7879e2..f558aac1 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/FXUtils.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/FXUtils.java @@ -1,5 +1,8 @@ -package com.ss.rlib.fx.util; +package javasabr.rlib.fx.util; +import java.awt.Point; +import java.util.Random; +import java.util.function.Consumer; import javafx.beans.property.ReadOnlyProperty; import javafx.beans.value.ObservableValue; import javafx.collections.ObservableList; @@ -10,10 +13,6 @@ import javafx.scene.layout.Region; import org.jetbrains.annotations.NotNull; -import java.awt.*; -import java.util.Random; -import java.util.function.Consumer; - /** * The utility class. * diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/FxControlUtils.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/FxControlUtils.java similarity index 93% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/FxControlUtils.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/FxControlUtils.java index 2c248003..1b785fc4 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/FxControlUtils.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/FxControlUtils.java @@ -1,16 +1,25 @@ -package com.ss.rlib.fx.util; +package javasabr.rlib.fx.util; -import com.ss.rlib.fx.control.input.TypedTextField; -import com.ss.rlib.fx.util.ObservableUtils.ChangeEventAppender; +import java.util.function.BiConsumer; +import java.util.function.Consumer; import javafx.event.ActionEvent; import javafx.scene.Node; -import javafx.scene.control.*; +import javafx.scene.control.ButtonBase; +import javafx.scene.control.CheckBox; +import javafx.scene.control.ColorPicker; +import javafx.scene.control.ComboBox; +import javafx.scene.control.ListView; +import javafx.scene.control.Tab; +import javafx.scene.control.TabPane; +import javafx.scene.control.TextInputControl; +import javafx.scene.control.ToggleButton; +import javafx.scene.control.TreeItem; +import javafx.scene.control.TreeView; import javafx.scene.paint.Color; +import javasabr.rlib.fx.control.input.TypedTextField; +import javasabr.rlib.fx.util.ObservableUtils.ChangeEventAppender; import org.jetbrains.annotations.NotNull; -import java.util.function.BiConsumer; -import java.util.function.Consumer; - /** * The utility class. * diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/FxUtils.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/FxUtils.java similarity index 99% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/FxUtils.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/FxUtils.java index 758655b1..2b207de5 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/FxUtils.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/FxUtils.java @@ -1,5 +1,7 @@ -package com.ss.rlib.fx.util; +package javasabr.rlib.fx.util; +import java.awt.Point; +import java.util.concurrent.ThreadLocalRandom; import javafx.beans.value.ObservableValue; import javafx.css.Styleable; import javafx.geometry.Point2D; @@ -9,9 +11,6 @@ import javafx.scene.layout.Region; import org.jetbrains.annotations.NotNull; -import java.awt.*; -import java.util.concurrent.ThreadLocalRandom; - /** * The utility class. * diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/ObservableUtils.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/ObservableUtils.java similarity index 98% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/ObservableUtils.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/ObservableUtils.java index 61d4740e..c740e88e 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/ObservableUtils.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/ObservableUtils.java @@ -1,13 +1,13 @@ -package com.ss.rlib.fx.util; +package javasabr.rlib.fx.util; -import static com.ss.rlib.common.util.ClassUtils.unsafeCast; -import javafx.beans.value.ObservableValue; -import org.jetbrains.annotations.NotNull; +import static javasabr.rlib.common.util.ClassUtils.unsafeCast; import java.util.function.BiConsumer; import java.util.function.BiPredicate; import java.util.function.Consumer; import java.util.function.Predicate; +import javafx.beans.value.ObservableValue; +import org.jetbrains.annotations.NotNull; /** * The utility class. diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/FloatArrayStringConverter.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/FloatArrayStringConverter.java similarity index 88% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/FloatArrayStringConverter.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/FloatArrayStringConverter.java index 81a5d188..3f98edb0 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/FloatArrayStringConverter.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/FloatArrayStringConverter.java @@ -1,8 +1,8 @@ -package com.ss.rlib.fx.util.converter; +package javasabr.rlib.fx.util.converter; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.StringUtils; import javafx.util.StringConverter; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.StringUtils; import org.jetbrains.annotations.Nullable; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/IntegerArrayStringConverter.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/IntegerArrayStringConverter.java similarity index 88% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/IntegerArrayStringConverter.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/IntegerArrayStringConverter.java index 76739bf4..7f7dba70 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/IntegerArrayStringConverter.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/IntegerArrayStringConverter.java @@ -1,8 +1,8 @@ -package com.ss.rlib.fx.util.converter; +package javasabr.rlib.fx.util.converter; -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.StringUtils; import javafx.util.StringConverter; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.StringUtils; import org.jetbrains.annotations.Nullable; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedFloatStringConverter.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedFloatStringConverter.java similarity index 89% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedFloatStringConverter.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedFloatStringConverter.java index 5aa4d1d8..eda7666a 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedFloatStringConverter.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedFloatStringConverter.java @@ -1,6 +1,6 @@ -package com.ss.rlib.fx.util.converter; +package javasabr.rlib.fx.util.converter; -import com.ss.rlib.common.util.StringUtils; +import javasabr.rlib.common.util.StringUtils; import org.jetbrains.annotations.Nullable; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedIntegerStringConverter.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedIntegerStringConverter.java similarity index 91% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedIntegerStringConverter.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedIntegerStringConverter.java index 2dc65407..1743166c 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedIntegerStringConverter.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedIntegerStringConverter.java @@ -1,6 +1,6 @@ -package com.ss.rlib.fx.util.converter; +package javasabr.rlib.fx.util.converter; -import com.ss.rlib.common.util.StringUtils; +import javasabr.rlib.common.util.StringUtils; import org.jetbrains.annotations.Nullable; /** diff --git a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedNumberStringConverter.java b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedNumberStringConverter.java similarity index 94% rename from rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedNumberStringConverter.java rename to rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedNumberStringConverter.java index 034b9072..1df95f16 100644 --- a/rlib-fx/src/main/java/com/ss/rlib/fx/util/converter/LimitedNumberStringConverter.java +++ b/rlib-fx/src/main/java/javasabr/rlib/fx/util/converter/LimitedNumberStringConverter.java @@ -1,7 +1,7 @@ -package com.ss.rlib.fx.util.converter; +package javasabr.rlib.fx.util.converter; -import com.ss.rlib.common.util.StringUtils; import javafx.util.StringConverter; +import javasabr.rlib.common.util.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-fx/src/test/java/com/ss/rlib/fx/test/window/popup/dialog/SimpleControlDialogTest.java b/rlib-fx/src/test/java/javasabr/rlib/fx/SimpleControlDialogTest.java similarity index 91% rename from rlib-fx/src/test/java/com/ss/rlib/fx/test/window/popup/dialog/SimpleControlDialogTest.java rename to rlib-fx/src/test/java/javasabr/rlib/fx/SimpleControlDialogTest.java index 9625094b..788ee27c 100644 --- a/rlib-fx/src/test/java/com/ss/rlib/fx/test/window/popup/dialog/SimpleControlDialogTest.java +++ b/rlib-fx/src/test/java/javasabr/rlib/fx/SimpleControlDialogTest.java @@ -1,9 +1,5 @@ -package com.ss.rlib.fx.test.window.popup.dialog; +package javasabr.rlib.fx; -import com.ss.rlib.fx.CssClasses; -import com.ss.rlib.fx.control.dialog.ControlDialogSupport; -import com.ss.rlib.fx.control.dialog.DefaultControlDialog; -import com.ss.rlib.fx.util.FxUtils; import javafx.application.Application; import javafx.geometry.Pos; import javafx.scene.Node; @@ -14,6 +10,9 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; import javafx.stage.Stage; +import javasabr.rlib.fx.control.dialog.ControlDialogSupport; +import javasabr.rlib.fx.control.dialog.DefaultControlDialog; +import javasabr.rlib.fx.util.FxUtils; import org.jetbrains.annotations.NotNull; public class SimpleControlDialogTest extends Application { diff --git a/rlib-fx/src/test/java/com/ss/rlib/fx/test/window/popup/dialog/SimplePopupDialogTest.java b/rlib-fx/src/test/java/javasabr/rlib/fx/SimplePopupDialogTest.java similarity index 83% rename from rlib-fx/src/test/java/com/ss/rlib/fx/test/window/popup/dialog/SimplePopupDialogTest.java rename to rlib-fx/src/test/java/javasabr/rlib/fx/SimplePopupDialogTest.java index 3040ce34..0f1f0b4d 100644 --- a/rlib-fx/src/test/java/com/ss/rlib/fx/test/window/popup/dialog/SimplePopupDialogTest.java +++ b/rlib-fx/src/test/java/javasabr/rlib/fx/SimplePopupDialogTest.java @@ -1,13 +1,12 @@ -package com.ss.rlib.fx.test.window.popup.dialog; +package javasabr.rlib.fx; -import com.ss.rlib.fx.CssClasses; -import com.ss.rlib.fx.util.FxUtils; -import com.ss.rlib.fx.window.popup.dialog.SimplePopupDialog; import javafx.application.Application; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.layout.StackPane; import javafx.stage.Stage; +import javasabr.rlib.fx.dialog.SimplePopupDialog; +import javasabr.rlib.fx.util.FxUtils; import org.jetbrains.annotations.NotNull; public class SimplePopupDialogTest extends Application { diff --git a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/Logger.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java similarity index 99% rename from rlib-logger-api/src/main/java/com/ss/rlib/logger/api/Logger.java rename to rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java index 4ba4072d..230abc4b 100644 --- a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/Logger.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/Logger.java @@ -1,4 +1,4 @@ -package com.ss.rlib.logger.api; +package javasabr.rlib.logger.api; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerFactory.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerFactory.java similarity index 97% rename from rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerFactory.java rename to rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerFactory.java index b9a274bd..074308d4 100644 --- a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerFactory.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerFactory.java @@ -1,8 +1,7 @@ -package com.ss.rlib.logger.api; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.logger.api; import java.io.Writer; +import org.jetbrains.annotations.NotNull; public interface LoggerFactory { diff --git a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerLevel.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerLevel.java similarity index 96% rename from rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerLevel.java rename to rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerLevel.java index d6641d49..b9e4bac3 100644 --- a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerLevel.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerLevel.java @@ -1,4 +1,4 @@ -package com.ss.rlib.logger.api; +package javasabr.rlib.logger.api; import lombok.Getter; import lombok.Setter; diff --git a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerListener.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerListener.java similarity index 91% rename from rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerListener.java rename to rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerListener.java index 51403a3d..cb88ae3f 100644 --- a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerListener.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerListener.java @@ -1,4 +1,4 @@ -package com.ss.rlib.logger.api; +package javasabr.rlib.logger.api; import org.jetbrains.annotations.NotNull; diff --git a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerManager.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerManager.java similarity index 97% rename from rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerManager.java rename to rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerManager.java index d95d4b04..fccec09d 100644 --- a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/LoggerManager.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerManager.java @@ -1,11 +1,10 @@ -package com.ss.rlib.logger.api; - -import com.ss.rlib.logger.api.impl.NullLoggerFactory; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.logger.api; import java.io.Writer; import java.lang.reflect.InvocationTargetException; import java.util.ServiceLoader; +import javasabr.rlib.logger.api.impl.NullLoggerFactory; +import org.jetbrains.annotations.NotNull; /** * The class to manage loggers. diff --git a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/impl/NullLogger.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLogger.java similarity index 65% rename from rlib-logger-api/src/main/java/com/ss/rlib/logger/api/impl/NullLogger.java rename to rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLogger.java index 6ba26600..6563706e 100644 --- a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/impl/NullLogger.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLogger.java @@ -1,9 +1,8 @@ -package com.ss.rlib.logger.api.impl; +package javasabr.rlib.logger.api.impl; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerLevel; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerLevel; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; public final class NullLogger implements Logger { diff --git a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/impl/NullLoggerFactory.java b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLoggerFactory.java similarity index 82% rename from rlib-logger-api/src/main/java/com/ss/rlib/logger/api/impl/NullLoggerFactory.java rename to rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLoggerFactory.java index b835b7f2..dc454021 100644 --- a/rlib-logger-api/src/main/java/com/ss/rlib/logger/api/impl/NullLoggerFactory.java +++ b/rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLoggerFactory.java @@ -1,11 +1,10 @@ -package com.ss.rlib.logger.api.impl; - -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerFactory; -import com.ss.rlib.logger.api.LoggerListener; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.logger.api.impl; import java.io.Writer; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerFactory; +import javasabr.rlib.logger.api.LoggerListener; +import org.jetbrains.annotations.NotNull; public class NullLoggerFactory implements LoggerFactory { diff --git a/rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/DefaultLogger.java b/rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/DefaultLogger.java similarity index 89% rename from rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/DefaultLogger.java rename to rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/DefaultLogger.java index 1862f291..beca5fba 100644 --- a/rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/DefaultLogger.java +++ b/rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/DefaultLogger.java @@ -1,12 +1,10 @@ -package com.ss.rlib.logger.impl; - -import com.ss.rlib.common.util.StringUtils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerLevel; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.logger.impl; import java.util.Objects; +import javasabr.rlib.common.util.StringUtils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerLevel; +import org.jetbrains.annotations.NotNull; /** * The base implementation of the logger. diff --git a/rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/DefaultLoggerFactory.java b/rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/DefaultLoggerFactory.java similarity index 91% rename from rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/DefaultLoggerFactory.java rename to rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/DefaultLoggerFactory.java index 3a173370..5773f9c4 100644 --- a/rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/DefaultLoggerFactory.java +++ b/rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/DefaultLoggerFactory.java @@ -1,13 +1,6 @@ -package com.ss.rlib.logger.impl; - -import static com.ss.rlib.common.util.ObjectUtils.notNull; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerFactory; -import com.ss.rlib.logger.api.LoggerLevel; -import com.ss.rlib.logger.api.LoggerListener; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.logger.impl; + +import static javasabr.rlib.common.util.ObjectUtils.notNull; import java.io.IOException; import java.io.Writer; @@ -15,6 +8,13 @@ import java.time.format.DateTimeFormatter; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerFactory; +import javasabr.rlib.logger.api.LoggerLevel; +import javasabr.rlib.logger.api.LoggerListener; +import org.jetbrains.annotations.NotNull; /** * The class for managing loggers. diff --git a/rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/FolderFileListener.java b/rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/FolderFileListener.java similarity index 95% rename from rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/FolderFileListener.java rename to rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/FolderFileListener.java index c8abfcda..bcf6f38a 100644 --- a/rlib-logger-impl/src/main/java/com/ss/rlib/logger/impl/FolderFileListener.java +++ b/rlib-logger-impl/src/main/java/javasabr/rlib/logger/impl/FolderFileListener.java @@ -1,4 +1,4 @@ -package com.ss.rlib.logger.impl; +package javasabr.rlib.logger.impl; import java.io.IOException; import java.io.UncheckedIOException; @@ -8,8 +8,7 @@ import java.nio.file.Path; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; - -import com.ss.rlib.logger.api.LoggerListener; +import javasabr.rlib.logger.api.LoggerListener; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-logger-impl/src/main/resources/META-INF/services/com.ss.rlib.logger.api.LoggerFactory b/rlib-logger-impl/src/main/resources/META-INF/services/com.ss.rlib.logger.api.LoggerFactory deleted file mode 100644 index 2ba3a161..00000000 --- a/rlib-logger-impl/src/main/resources/META-INF/services/com.ss.rlib.logger.api.LoggerFactory +++ /dev/null @@ -1 +0,0 @@ -com.ss.rlib.logger.impl.DefaultLoggerFactory \ No newline at end of file diff --git a/rlib-logger-impl/src/main/resources/META-INF/services/javasabr.rlib.logger.api.LoggerFactory b/rlib-logger-impl/src/main/resources/META-INF/services/javasabr.rlib.logger.api.LoggerFactory new file mode 100644 index 00000000..2b061257 --- /dev/null +++ b/rlib-logger-impl/src/main/resources/META-INF/services/javasabr.rlib.logger.api.LoggerFactory @@ -0,0 +1 @@ +javasabr.rlib.logger.impl.DefaultLoggerFactory \ No newline at end of file diff --git a/rlib-logger-impl/src/test/java/com/ss/rlib/logger/impl/test/DefaultLoggerTest.java b/rlib-logger-impl/src/test/java/javasabr/rlib/logger/impl/DefaultLoggerTest.java similarity index 73% rename from rlib-logger-impl/src/test/java/com/ss/rlib/logger/impl/test/DefaultLoggerTest.java rename to rlib-logger-impl/src/test/java/javasabr/rlib/logger/impl/DefaultLoggerTest.java index 229d9d01..e77285de 100644 --- a/rlib-logger-impl/src/test/java/com/ss/rlib/logger/impl/test/DefaultLoggerTest.java +++ b/rlib-logger-impl/src/test/java/javasabr/rlib/logger/impl/DefaultLoggerTest.java @@ -1,13 +1,15 @@ -package com.ss.rlib.logger.impl.test; - -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.logger.api.LoggerLevel; -import com.ss.rlib.logger.api.LoggerListener; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.logger.impl.DefaultLogger; -import org.junit.jupiter.api.*; +package javasabr.rlib.logger.impl; import java.util.Collection; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.logger.api.LoggerLevel; +import javasabr.rlib.logger.api.LoggerListener; +import javasabr.rlib.logger.api.LoggerManager; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DefaultLoggerTest { diff --git a/rlib-logger-slf4j/src/main/java/com/ss/rlib/logger/slf4j/Slf4jLogger.java b/rlib-logger-slf4j/src/main/java/javasabr/rlib/logger/slf4j/Slf4jLogger.java similarity index 93% rename from rlib-logger-slf4j/src/main/java/com/ss/rlib/logger/slf4j/Slf4jLogger.java rename to rlib-logger-slf4j/src/main/java/javasabr/rlib/logger/slf4j/Slf4jLogger.java index e1de3097..a9630ab4 100644 --- a/rlib-logger-slf4j/src/main/java/com/ss/rlib/logger/slf4j/Slf4jLogger.java +++ b/rlib-logger-slf4j/src/main/java/javasabr/rlib/logger/slf4j/Slf4jLogger.java @@ -1,7 +1,7 @@ -package com.ss.rlib.logger.slf4j; +package javasabr.rlib.logger.slf4j; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerLevel; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerLevel; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; diff --git a/rlib-logger-slf4j/src/main/java/com/ss/rlib/logger/slf4j/Slf4jLoggerFactory.java b/rlib-logger-slf4j/src/main/java/javasabr/rlib/logger/slf4j/Slf4jLoggerFactory.java similarity index 87% rename from rlib-logger-slf4j/src/main/java/com/ss/rlib/logger/slf4j/Slf4jLoggerFactory.java rename to rlib-logger-slf4j/src/main/java/javasabr/rlib/logger/slf4j/Slf4jLoggerFactory.java index bb893e9f..3b713e9d 100644 --- a/rlib-logger-slf4j/src/main/java/com/ss/rlib/logger/slf4j/Slf4jLoggerFactory.java +++ b/rlib-logger-slf4j/src/main/java/javasabr/rlib/logger/slf4j/Slf4jLoggerFactory.java @@ -1,11 +1,10 @@ -package com.ss.rlib.logger.slf4j; - -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerFactory; -import com.ss.rlib.logger.api.LoggerListener; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.logger.slf4j; import java.io.Writer; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerFactory; +import javasabr.rlib.logger.api.LoggerListener; +import org.jetbrains.annotations.NotNull; public class Slf4jLoggerFactory implements LoggerFactory { diff --git a/rlib-logger-slf4j/src/main/resources/META-INF/services/com.ss.rlib.logger.api.LoggerFactory b/rlib-logger-slf4j/src/main/resources/META-INF/services/com.ss.rlib.logger.api.LoggerFactory deleted file mode 100644 index 2be77766..00000000 --- a/rlib-logger-slf4j/src/main/resources/META-INF/services/com.ss.rlib.logger.api.LoggerFactory +++ /dev/null @@ -1 +0,0 @@ -com.ss.rlib.logger.slf4j.Slf4jLoggerFactory \ No newline at end of file diff --git a/rlib-logger-slf4j/src/main/resources/META-INF/services/javasabr.rlib.logger.api.LoggerFactory b/rlib-logger-slf4j/src/main/resources/META-INF/services/javasabr.rlib.logger.api.LoggerFactory new file mode 100644 index 00000000..1785a820 --- /dev/null +++ b/rlib-logger-slf4j/src/main/resources/META-INF/services/javasabr.rlib.logger.api.LoggerFactory @@ -0,0 +1 @@ +javasabr.rlib.logger.slf4j.Slf4jLoggerFactory \ No newline at end of file diff --git a/rlib-logger-slf4j/src/test/java/com/ss/rlib/logger/slf4j/test/Slf4jLoggerTest.java b/rlib-logger-slf4j/src/test/java/javasabr/rlib/logger/slf4j/Slf4jLoggerTest.java similarity index 70% rename from rlib-logger-slf4j/src/test/java/com/ss/rlib/logger/slf4j/test/Slf4jLoggerTest.java rename to rlib-logger-slf4j/src/test/java/javasabr/rlib/logger/slf4j/Slf4jLoggerTest.java index 5327b2da..002d7338 100644 --- a/rlib-logger-slf4j/src/test/java/com/ss/rlib/logger/slf4j/test/Slf4jLoggerTest.java +++ b/rlib-logger-slf4j/src/test/java/javasabr/rlib/logger/slf4j/Slf4jLoggerTest.java @@ -1,7 +1,6 @@ -package com.ss.rlib.logger.slf4j.test; +package javasabr.rlib.logger.slf4j; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.logger.slf4j.Slf4jLogger; +import javasabr.rlib.logger.api.LoggerManager; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/MailSender.java b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/MailSender.java similarity index 90% rename from rlib-mail/src/main/java/com/ss/rlib/mail/sender/MailSender.java rename to rlib-mail/src/main/java/javasabr/rlib/mail/sender/MailSender.java index d919e702..99e05868 100644 --- a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/MailSender.java +++ b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/MailSender.java @@ -1,10 +1,9 @@ -package com.ss.rlib.mail.sender; - -import com.ss.rlib.mail.sender.exception.UncheckedMessagingException; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.mail.sender; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; +import javasabr.rlib.mail.sender.exception.UncheckedMessagingException; +import org.jetbrains.annotations.NotNull; public interface MailSender { diff --git a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/MailSenderConfig.java b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/MailSenderConfig.java similarity index 90% rename from rlib-mail/src/main/java/com/ss/rlib/mail/sender/MailSenderConfig.java rename to rlib-mail/src/main/java/javasabr/rlib/mail/sender/MailSenderConfig.java index ce4a7941..2918bae6 100644 --- a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/MailSenderConfig.java +++ b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/MailSenderConfig.java @@ -1,4 +1,4 @@ -package com.ss.rlib.mail.sender; +package javasabr.rlib.mail.sender; import lombok.Builder; import lombok.Getter; diff --git a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/exception/UncheckedMessagingException.java similarity index 85% rename from rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java rename to rlib-mail/src/main/java/javasabr/rlib/mail/sender/exception/UncheckedMessagingException.java index 22bad3c8..f969c911 100644 --- a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java +++ b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/exception/UncheckedMessagingException.java @@ -1,4 +1,4 @@ -package com.ss.rlib.mail.sender.exception; +package javasabr.rlib.mail.sender.exception; import jakarta.mail.MessagingException; import org.jetbrains.annotations.NotNull; diff --git a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/impl/JavaxMailSender.java similarity index 89% rename from rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java rename to rlib-mail/src/main/java/javasabr/rlib/mail/sender/impl/JavaxMailSender.java index e668e0e0..e3498d4f 100644 --- a/rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java +++ b/rlib-mail/src/main/java/javasabr/rlib/mail/sender/impl/JavaxMailSender.java @@ -1,11 +1,7 @@ -package com.ss.rlib.mail.sender.impl; +package javasabr.rlib.mail.sender.impl; import static java.util.concurrent.CompletableFuture.runAsync; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.mail.sender.MailSender; -import com.ss.rlib.mail.sender.MailSenderConfig; -import com.ss.rlib.mail.sender.exception.UncheckedMessagingException; + import jakarta.mail.Authenticator; import jakarta.mail.MessagingException; import jakarta.mail.PasswordAuthentication; @@ -16,14 +12,23 @@ import jakarta.mail.internet.MimeBodyPart; import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMultipart; +import java.nio.charset.StandardCharsets; +import java.util.Properties; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.mail.sender.MailSender; +import javasabr.rlib.mail.sender.MailSenderConfig; +import javasabr.rlib.mail.sender.exception.UncheckedMessagingException; import lombok.Builder; import lombok.Getter; import org.jetbrains.annotations.NotNull; -import java.nio.charset.StandardCharsets; -import java.util.Properties; -import java.util.concurrent.*; - public class JavaxMailSender implements MailSender { private static final Logger LOGGER = LoggerManager.getLogger(JavaxMailSender.class); diff --git a/rlib-mail/src/test/java/com/ss/rlib/mail/test/BaseMailTest.java b/rlib-mail/src/test/java/javasabr/rlib/mail/BaseMailTest.java similarity index 84% rename from rlib-mail/src/test/java/com/ss/rlib/mail/test/BaseMailTest.java rename to rlib-mail/src/test/java/javasabr/rlib/mail/BaseMailTest.java index b5d208db..fbf77ab9 100644 --- a/rlib-mail/src/test/java/com/ss/rlib/mail/test/BaseMailTest.java +++ b/rlib-mail/src/test/java/javasabr/rlib/mail/BaseMailTest.java @@ -1,6 +1,6 @@ -package com.ss.rlib.mail.test; +package javasabr.rlib.mail; -import com.ss.rlib.testcontainers.FakeSMTPTestContainer; +import javasabr.rlib.testcontainers.FakeSMTPTestContainer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/rlib-mail/src/test/java/com/ss/rlib/mail/test/sender/JavaxMailSenderTest.java b/rlib-mail/src/test/java/javasabr/rlib/mail/sender/JavaxMailSenderTest.java similarity index 84% rename from rlib-mail/src/test/java/com/ss/rlib/mail/test/sender/JavaxMailSenderTest.java rename to rlib-mail/src/test/java/javasabr/rlib/mail/sender/JavaxMailSenderTest.java index db6fbec5..75b18a5c 100644 --- a/rlib-mail/src/test/java/com/ss/rlib/mail/test/sender/JavaxMailSenderTest.java +++ b/rlib-mail/src/test/java/javasabr/rlib/mail/sender/JavaxMailSenderTest.java @@ -1,8 +1,7 @@ -package com.ss.rlib.mail.test.sender; +package javasabr.rlib.mail.sender; -import com.ss.rlib.mail.sender.MailSenderConfig; -import com.ss.rlib.mail.sender.impl.JavaxMailSender; -import com.ss.rlib.mail.test.BaseMailTest; +import javasabr.rlib.mail.BaseMailTest; +import javasabr.rlib.mail.sender.impl.JavaxMailSender; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-network/src/main/java/com/ss/rlib/network/annotation/PacketDescription.java b/rlib-network/src/main/java/com/ss/rlib/network/annotation/PacketDescription.java deleted file mode 100644 index 44c0d1f8..00000000 --- a/rlib-network/src/main/java/com/ss/rlib/network/annotation/PacketDescription.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ss.rlib.network.annotation; - -import java.lang.annotation.*; - -/** - * The annotation to describe a network packet. - * - * @author JavaSaBr - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface PacketDescription { - - int id(); -} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/BufferAllocator.java b/rlib-network/src/main/java/javasabr/rlib/network/BufferAllocator.java similarity index 94% rename from rlib-network/src/main/java/com/ss/rlib/network/BufferAllocator.java rename to rlib-network/src/main/java/javasabr/rlib/network/BufferAllocator.java index 823696da..fd24d107 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/BufferAllocator.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/BufferAllocator.java @@ -1,75 +1,74 @@ -package com.ss.rlib.network; - -import org.jetbrains.annotations.NotNull; - -import java.nio.ByteBuffer; - -/** - * The interface to implement a buffer allocator for network things. - * - * @author JavaSaBr - */ -public interface BufferAllocator { - - /** - * Get a new read buffer to use. - * - * @return the new buffer. - */ - @NotNull ByteBuffer takeReadBuffer(); - - /** - * Get a new pending buffer to use. - * - * @return the new pending buffer. - */ - @NotNull ByteBuffer takePendingBuffer(); - - /** - * Get a new write buffer to use. - * - * @return the new buffer. - */ - @NotNull ByteBuffer takeWriteBuffer(); - - /** - * Get a new buffer with requested capacity. - * - * @param bufferSize the size of new buffer. - * @return the new buffer. - */ - @NotNull ByteBuffer takeBuffer(int bufferSize); - - /** - * Store an old read buffer if need. - * - * @param buffer the old read buffer. - * @return this allocator. - */ - @NotNull BufferAllocator putReadBuffer(@NotNull ByteBuffer buffer); - - /** - * Store an old pending buffer if need. - * - * @param buffer the old pending buffer. - * @return this allocator. - */ - @NotNull BufferAllocator putPendingBuffer(@NotNull ByteBuffer buffer); - - /** - * Store an old write buffer if need. - * - * @param buffer the old write buffer. - * @return this allocator. - */ - @NotNull BufferAllocator putWriteBuffer(@NotNull ByteBuffer buffer); - - /** - * Store an old byte buffer if need. - * - * @param buffer the old byte buffer. - * @return this allocator. - */ - - @NotNull BufferAllocator putBuffer(@NotNull ByteBuffer buffer); -} +package javasabr.rlib.network; + +import java.nio.ByteBuffer; +import org.jetbrains.annotations.NotNull; + +/** + * The interface to implement a buffer allocator for network things. + * + * @author JavaSaBr + */ +public interface BufferAllocator { + + /** + * Get a new read buffer to use. + * + * @return the new buffer. + */ + @NotNull ByteBuffer takeReadBuffer(); + + /** + * Get a new pending buffer to use. + * + * @return the new pending buffer. + */ + @NotNull ByteBuffer takePendingBuffer(); + + /** + * Get a new write buffer to use. + * + * @return the new buffer. + */ + @NotNull ByteBuffer takeWriteBuffer(); + + /** + * Get a new buffer with requested capacity. + * + * @param bufferSize the size of new buffer. + * @return the new buffer. + */ + @NotNull ByteBuffer takeBuffer(int bufferSize); + + /** + * Store an old read buffer if need. + * + * @param buffer the old read buffer. + * @return this allocator. + */ + @NotNull BufferAllocator putReadBuffer(@NotNull ByteBuffer buffer); + + /** + * Store an old pending buffer if need. + * + * @param buffer the old pending buffer. + * @return this allocator. + */ + @NotNull BufferAllocator putPendingBuffer(@NotNull ByteBuffer buffer); + + /** + * Store an old write buffer if need. + * + * @param buffer the old write buffer. + * @return this allocator. + */ + @NotNull BufferAllocator putWriteBuffer(@NotNull ByteBuffer buffer); + + /** + * Store an old byte buffer if need. + * + * @param buffer the old byte buffer. + * @return this allocator. + */ + + @NotNull BufferAllocator putBuffer(@NotNull ByteBuffer buffer); +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/Connection.java b/rlib-network/src/main/java/javasabr/rlib/network/Connection.java similarity index 91% rename from rlib-network/src/main/java/com/ss/rlib/network/Connection.java rename to rlib-network/src/main/java/javasabr/rlib/network/Connection.java index 24f49c04..4ebff115 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/Connection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/Connection.java @@ -1,14 +1,13 @@ -package com.ss.rlib.network; +package javasabr.rlib.network; -import com.ss.rlib.common.function.NotNullBiConsumer; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; +import java.util.concurrent.CompletableFuture; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; import lombok.AllArgsConstructor; import org.jetbrains.annotations.NotNull; import reactor.core.publisher.Flux; -import java.util.concurrent.CompletableFuture; - /** * The interface to implement an async connection. * diff --git a/rlib-network/src/main/java/com/ss/rlib/network/Network.java b/rlib-network/src/main/java/javasabr/rlib/network/Network.java similarity index 83% rename from rlib-network/src/main/java/com/ss/rlib/network/Network.java rename to rlib-network/src/main/java/javasabr/rlib/network/Network.java index 8700d961..55b08726 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/Network.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/Network.java @@ -1,14 +1,14 @@ -package com.ss.rlib.network; - -/** - * The interface to implement an asynchronous network. - * - * @author JavaSaBr - */ -public interface Network> { - - /** - * Shutdown this network. - */ - void shutdown(); -} +package javasabr.rlib.network; + +/** + * The interface to implement an asynchronous network. + * + * @author JavaSaBr + */ +public interface Network> { + + /** + * Shutdown this network. + */ + void shutdown(); +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/NetworkConfig.java b/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java similarity index 94% rename from rlib-network/src/main/java/com/ss/rlib/network/NetworkConfig.java rename to rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java index 34922dd0..b55f70bc 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/NetworkConfig.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/NetworkConfig.java @@ -1,85 +1,84 @@ -package com.ss.rlib.network; - -import lombok.Builder; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; - -import java.nio.ByteOrder; - -/** - * The interface to implement a network config. - * - * @author JavaSaBr - */ -public interface NetworkConfig { - - @Builder - @Getter - class SimpleNetworkConfig implements NetworkConfig { - - @Builder.Default - private String groupName = "NetworkThread"; - @Builder.Default - private ByteOrder byteOrder = ByteOrder.BIG_ENDIAN; - - @Builder.Default - private int readBufferSize = 2048; - @Builder.Default - private int pendingBufferSize = 4096; - @Builder.Default - private int writeBufferSize = 2048; - } - - @NotNull NetworkConfig DEFAULT_CLIENT = new NetworkConfig() { - - @Override - public @NotNull String getThreadGroupName() { - return "ClientNetworkThread"; - } - }; - - /** - * Get a group name of network threads. - * - * @return the group name. - */ - default @NotNull String getThreadGroupName() { - return "NetworkThread"; - } - - /** - * Get size of buffer with used to collect received data from network. - * - * @return the read buffer's size. - */ - default int getReadBufferSize() { - return 2048; - } - - /** - * Get size of buffer with pending data. Pending buffer allows to construct a packet with - * bigger data than {@link #getReadBufferSize()}. It should be at least 2x of {@link #getReadBufferSize()} - * - * @return the pending buffer's size. - */ - default int getPendingBufferSize() { - return getReadBufferSize() * 2; - } - - /** - * Get size of buffer which used to serialize packets to bytes. - * - * @return the write buffer's size. - */ - default int getWriteBufferSize() { - return 2048; - } - - default @NotNull ByteOrder getByteOrder() { - return ByteOrder.BIG_ENDIAN; - } - - default boolean isDirectByteBuffer() { - return false; - } -} +package javasabr.rlib.network; + +import java.nio.ByteOrder; +import lombok.Builder; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; + +/** + * The interface to implement a network config. + * + * @author JavaSaBr + */ +public interface NetworkConfig { + + @Builder + @Getter + class SimpleNetworkConfig implements NetworkConfig { + + @Builder.Default + private String groupName = "NetworkThread"; + @Builder.Default + private ByteOrder byteOrder = ByteOrder.BIG_ENDIAN; + + @Builder.Default + private int readBufferSize = 2048; + @Builder.Default + private int pendingBufferSize = 4096; + @Builder.Default + private int writeBufferSize = 2048; + } + + @NotNull NetworkConfig DEFAULT_CLIENT = new NetworkConfig() { + + @Override + public @NotNull String getThreadGroupName() { + return "ClientNetworkThread"; + } + }; + + /** + * Get a group name of network threads. + * + * @return the group name. + */ + default @NotNull String getThreadGroupName() { + return "NetworkThread"; + } + + /** + * Get size of buffer with used to collect received data from network. + * + * @return the read buffer's size. + */ + default int getReadBufferSize() { + return 2048; + } + + /** + * Get size of buffer with pending data. Pending buffer allows to construct a packet with + * bigger data than {@link #getReadBufferSize()}. It should be at least 2x of {@link #getReadBufferSize()} + * + * @return the pending buffer's size. + */ + default int getPendingBufferSize() { + return getReadBufferSize() * 2; + } + + /** + * Get size of buffer which used to serialize packets to bytes. + * + * @return the write buffer's size. + */ + default int getWriteBufferSize() { + return 2048; + } + + default @NotNull ByteOrder getByteOrder() { + return ByteOrder.BIG_ENDIAN; + } + + default boolean isDirectByteBuffer() { + return false; + } +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/NetworkCryptor.java b/rlib-network/src/main/java/javasabr/rlib/network/NetworkCryptor.java similarity index 97% rename from rlib-network/src/main/java/com/ss/rlib/network/NetworkCryptor.java rename to rlib-network/src/main/java/javasabr/rlib/network/NetworkCryptor.java index c5447d51..71d28ce8 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/NetworkCryptor.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/NetworkCryptor.java @@ -1,10 +1,9 @@ -package com.ss.rlib.network; +package javasabr.rlib.network; +import java.nio.ByteBuffer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.nio.ByteBuffer; - /** * The interface to implement a network cryptor. * diff --git a/rlib-network/src/main/java/com/ss/rlib/network/NetworkFactory.java b/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java similarity index 90% rename from rlib-network/src/main/java/com/ss/rlib/network/NetworkFactory.java rename to rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java index e6b70a33..b773a720 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/NetworkFactory.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/NetworkFactory.java @@ -1,243 +1,242 @@ -package com.ss.rlib.network; - -import com.ss.rlib.network.client.ClientNetwork; -import com.ss.rlib.network.client.impl.DefaultClientNetwork; -import com.ss.rlib.network.impl.DefaultBufferAllocator; -import com.ss.rlib.network.impl.DefaultConnection; -import com.ss.rlib.network.impl.StringDataConnection; -import com.ss.rlib.network.impl.StringDataSSLConnection; -import com.ss.rlib.network.packet.impl.DefaultReadablePacket; -import com.ss.rlib.network.packet.registry.ReadablePacketRegistry; -import com.ss.rlib.network.server.ServerNetwork; -import com.ss.rlib.network.server.impl.DefaultServerNetwork; -import org.jetbrains.annotations.NotNull; - -import javax.net.ssl.SSLContext; -import java.nio.channels.AsynchronousSocketChannel; -import java.util.function.BiFunction; - -/** - * Class with factory methods to build client/server networks. - * - * @author JavaSaBr - */ -public final class NetworkFactory { - - public static > @NotNull ClientNetwork newClientNetwork( - @NotNull NetworkConfig networkConfig, - @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection - ) { - return new DefaultClientNetwork<>(networkConfig, channelToConnection); - } - - public static > @NotNull ServerNetwork newServerNetwork( - @NotNull ServerNetworkConfig networkConfig, - @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection - ) { - return new DefaultServerNetwork<>(networkConfig, channelToConnection); - } - - /** - * Create a string packet based asynchronous client network. - * - * @return the client network. - */ - public static @NotNull ClientNetwork newStringDataClientNetwork() { - return newStringDataClientNetwork(NetworkConfig.DEFAULT_CLIENT); - } - - /** - * Create a string packet based asynchronous client network. - * - * @param networkConfig the network config. - * @return the client network. - */ - public static @NotNull ClientNetwork newStringDataClientNetwork( - @NotNull NetworkConfig networkConfig - ) { - return newStringDataClientNetwork( - networkConfig, - new DefaultBufferAllocator(networkConfig) - ); - } - - /** - * Create a string packet based asynchronous client network. - * - * @param networkConfig the network config. - * @param bufferAllocator the buffer allocator. - * @return the client network. - */ - public static @NotNull ClientNetwork newStringDataClientNetwork( - @NotNull NetworkConfig networkConfig, - @NotNull BufferAllocator bufferAllocator - ) { - return newClientNetwork( - networkConfig, - (network, channel) -> new StringDataConnection(network, channel, bufferAllocator) - ); - } - - /** - * Create id based packet default asynchronous client network. - * - * @param packetRegistry the readable packet registry. - * @return the server network. - */ - public static @NotNull ClientNetwork newDefaultClientNetwork( - @NotNull ReadablePacketRegistry packetRegistry - ) { - return newDefaultClientNetwork( - NetworkConfig.DEFAULT_CLIENT, - new DefaultBufferAllocator(NetworkConfig.DEFAULT_CLIENT), - packetRegistry - ); - } - - /** - * Create id based packet default asynchronous client network. - * - * @param networkConfig the network config. - * @param bufferAllocator the buffer allocator. - * @param packetRegistry the readable packet registry. - * @return the server network. - */ - public static @NotNull ClientNetwork newDefaultClientNetwork( - @NotNull NetworkConfig networkConfig, - @NotNull BufferAllocator bufferAllocator, - @NotNull ReadablePacketRegistry packetRegistry - ) { - return newClientNetwork( - networkConfig, - (network, channel) -> new DefaultConnection( - network, - channel, - bufferAllocator, - packetRegistry - ) - ); - } - - /** - * Create string packet based asynchronous secure client network. - * - * @param networkConfig the network config. - * @param bufferAllocator the buffer allocator. - * @param sslContext the ssl context. - * @return the client network. - */ - public static @NotNull ClientNetwork newStringDataSSLClientNetwork( - @NotNull NetworkConfig networkConfig, - @NotNull BufferAllocator bufferAllocator, - @NotNull SSLContext sslContext - ) { - return newClientNetwork( - networkConfig, - (network, channel) -> new StringDataSSLConnection(network, channel, bufferAllocator, sslContext, true) - ); - } - - /** - * Create string packet based asynchronous server network. - * - * @return the server network. - */ - public static @NotNull ServerNetwork newStringDataServerNetwork() { - return newStringDataServerNetwork(ServerNetworkConfig.DEFAULT_SERVER); - } - - /** - * Create string packet based asynchronous server network. - * - * @param networkConfig the network config. - * @return the server network. - */ - public static @NotNull ServerNetwork newStringDataServerNetwork( - @NotNull ServerNetworkConfig networkConfig - ) { - return newStringDataServerNetwork( - networkConfig, - new DefaultBufferAllocator(networkConfig) - ); - } - - /** - * Create string packet based asynchronous server network. - * - * @param networkConfig the network config. - * @param bufferAllocator the buffer allocator. - * @return the server network. - */ - public static @NotNull ServerNetwork newStringDataServerNetwork( - @NotNull ServerNetworkConfig networkConfig, - @NotNull BufferAllocator bufferAllocator - ) { - return newServerNetwork( - networkConfig, - (network, channel) -> new StringDataConnection(network, channel, bufferAllocator) - ); - } - - /** - * Create string packet based asynchronous secure server network. - * - * @param networkConfig the network config. - * @param bufferAllocator the buffer allocator. - * @param sslContext the ssl context. - * @return the server network. - */ - public static @NotNull ServerNetwork newStringDataSSLServerNetwork( - @NotNull ServerNetworkConfig networkConfig, - @NotNull BufferAllocator bufferAllocator, - @NotNull SSLContext sslContext - ) { - return newServerNetwork( - networkConfig, - (network, channel) -> new StringDataSSLConnection(network, channel, bufferAllocator, sslContext, false) - ); - } - - /** - * Create id based packet default asynchronous server network. - * - * @param packetRegistry the readable packet registry. - * @return the server network. - */ - public static @NotNull ServerNetwork newDefaultServerNetwork( - @NotNull ReadablePacketRegistry packetRegistry - ) { - return newDefaultServerNetwork( - ServerNetworkConfig.DEFAULT_SERVER, - new DefaultBufferAllocator(ServerNetworkConfig.DEFAULT_SERVER), - packetRegistry - ); - } - - /** - * Create id based packet default asynchronous server network. - * - * @param networkConfig the network config. - * @param bufferAllocator the buffer allocator. - * @param packetRegistry the readable packet registry. - * @return the server network. - */ - public static @NotNull ServerNetwork newDefaultServerNetwork( - @NotNull ServerNetworkConfig networkConfig, - @NotNull BufferAllocator bufferAllocator, - @NotNull ReadablePacketRegistry packetRegistry - ) { - return newServerNetwork( - networkConfig, - (network, channel) -> new DefaultConnection( - network, - channel, - bufferAllocator, - packetRegistry - ) - ); - } - - private NetworkFactory() throws Exception { - throw new Exception("no permission"); - } -} +package javasabr.rlib.network; + +import java.nio.channels.AsynchronousSocketChannel; +import java.util.function.BiFunction; +import javasabr.rlib.network.client.ClientNetwork; +import javasabr.rlib.network.client.impl.DefaultClientNetwork; +import javasabr.rlib.network.impl.DefaultBufferAllocator; +import javasabr.rlib.network.impl.DefaultConnection; +import javasabr.rlib.network.impl.StringDataConnection; +import javasabr.rlib.network.impl.StringDataSSLConnection; +import javasabr.rlib.network.packet.impl.DefaultReadablePacket; +import javasabr.rlib.network.packet.registry.ReadablePacketRegistry; +import javasabr.rlib.network.server.ServerNetwork; +import javasabr.rlib.network.server.impl.DefaultServerNetwork; +import javax.net.ssl.SSLContext; +import org.jetbrains.annotations.NotNull; + +/** + * Class with factory methods to build client/server networks. + * + * @author JavaSaBr + */ +public final class NetworkFactory { + + public static > @NotNull ClientNetwork newClientNetwork( + @NotNull NetworkConfig networkConfig, + @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection + ) { + return new DefaultClientNetwork<>(networkConfig, channelToConnection); + } + + public static > @NotNull ServerNetwork newServerNetwork( + @NotNull ServerNetworkConfig networkConfig, + @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection + ) { + return new DefaultServerNetwork<>(networkConfig, channelToConnection); + } + + /** + * Create a string packet based asynchronous client network. + * + * @return the client network. + */ + public static @NotNull ClientNetwork newStringDataClientNetwork() { + return newStringDataClientNetwork(NetworkConfig.DEFAULT_CLIENT); + } + + /** + * Create a string packet based asynchronous client network. + * + * @param networkConfig the network config. + * @return the client network. + */ + public static @NotNull ClientNetwork newStringDataClientNetwork( + @NotNull NetworkConfig networkConfig + ) { + return newStringDataClientNetwork( + networkConfig, + new DefaultBufferAllocator(networkConfig) + ); + } + + /** + * Create a string packet based asynchronous client network. + * + * @param networkConfig the network config. + * @param bufferAllocator the buffer allocator. + * @return the client network. + */ + public static @NotNull ClientNetwork newStringDataClientNetwork( + @NotNull NetworkConfig networkConfig, + @NotNull BufferAllocator bufferAllocator + ) { + return newClientNetwork( + networkConfig, + (network, channel) -> new StringDataConnection(network, channel, bufferAllocator) + ); + } + + /** + * Create id based packet default asynchronous client network. + * + * @param packetRegistry the readable packet registry. + * @return the server network. + */ + public static @NotNull ClientNetwork newDefaultClientNetwork( + @NotNull ReadablePacketRegistry packetRegistry + ) { + return newDefaultClientNetwork( + NetworkConfig.DEFAULT_CLIENT, + new DefaultBufferAllocator(NetworkConfig.DEFAULT_CLIENT), + packetRegistry + ); + } + + /** + * Create id based packet default asynchronous client network. + * + * @param networkConfig the network config. + * @param bufferAllocator the buffer allocator. + * @param packetRegistry the readable packet registry. + * @return the server network. + */ + public static @NotNull ClientNetwork newDefaultClientNetwork( + @NotNull NetworkConfig networkConfig, + @NotNull BufferAllocator bufferAllocator, + @NotNull ReadablePacketRegistry packetRegistry + ) { + return newClientNetwork( + networkConfig, + (network, channel) -> new DefaultConnection( + network, + channel, + bufferAllocator, + packetRegistry + ) + ); + } + + /** + * Create string packet based asynchronous secure client network. + * + * @param networkConfig the network config. + * @param bufferAllocator the buffer allocator. + * @param sslContext the ssl context. + * @return the client network. + */ + public static @NotNull ClientNetwork newStringDataSSLClientNetwork( + @NotNull NetworkConfig networkConfig, + @NotNull BufferAllocator bufferAllocator, + @NotNull SSLContext sslContext + ) { + return newClientNetwork( + networkConfig, + (network, channel) -> new StringDataSSLConnection(network, channel, bufferAllocator, sslContext, true) + ); + } + + /** + * Create string packet based asynchronous server network. + * + * @return the server network. + */ + public static @NotNull ServerNetwork newStringDataServerNetwork() { + return newStringDataServerNetwork(ServerNetworkConfig.DEFAULT_SERVER); + } + + /** + * Create string packet based asynchronous server network. + * + * @param networkConfig the network config. + * @return the server network. + */ + public static @NotNull ServerNetwork newStringDataServerNetwork( + @NotNull ServerNetworkConfig networkConfig + ) { + return newStringDataServerNetwork( + networkConfig, + new DefaultBufferAllocator(networkConfig) + ); + } + + /** + * Create string packet based asynchronous server network. + * + * @param networkConfig the network config. + * @param bufferAllocator the buffer allocator. + * @return the server network. + */ + public static @NotNull ServerNetwork newStringDataServerNetwork( + @NotNull ServerNetworkConfig networkConfig, + @NotNull BufferAllocator bufferAllocator + ) { + return newServerNetwork( + networkConfig, + (network, channel) -> new StringDataConnection(network, channel, bufferAllocator) + ); + } + + /** + * Create string packet based asynchronous secure server network. + * + * @param networkConfig the network config. + * @param bufferAllocator the buffer allocator. + * @param sslContext the ssl context. + * @return the server network. + */ + public static @NotNull ServerNetwork newStringDataSSLServerNetwork( + @NotNull ServerNetworkConfig networkConfig, + @NotNull BufferAllocator bufferAllocator, + @NotNull SSLContext sslContext + ) { + return newServerNetwork( + networkConfig, + (network, channel) -> new StringDataSSLConnection(network, channel, bufferAllocator, sslContext, false) + ); + } + + /** + * Create id based packet default asynchronous server network. + * + * @param packetRegistry the readable packet registry. + * @return the server network. + */ + public static @NotNull ServerNetwork newDefaultServerNetwork( + @NotNull ReadablePacketRegistry packetRegistry + ) { + return newDefaultServerNetwork( + ServerNetworkConfig.DEFAULT_SERVER, + new DefaultBufferAllocator(ServerNetworkConfig.DEFAULT_SERVER), + packetRegistry + ); + } + + /** + * Create id based packet default asynchronous server network. + * + * @param networkConfig the network config. + * @param bufferAllocator the buffer allocator. + * @param packetRegistry the readable packet registry. + * @return the server network. + */ + public static @NotNull ServerNetwork newDefaultServerNetwork( + @NotNull ServerNetworkConfig networkConfig, + @NotNull BufferAllocator bufferAllocator, + @NotNull ReadablePacketRegistry packetRegistry + ) { + return newServerNetwork( + networkConfig, + (network, channel) -> new DefaultConnection( + network, + channel, + bufferAllocator, + packetRegistry + ) + ); + } + + private NetworkFactory() throws Exception { + throw new Exception("no permission"); + } +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/ServerNetworkConfig.java b/rlib-network/src/main/java/javasabr/rlib/network/ServerNetworkConfig.java similarity index 92% rename from rlib-network/src/main/java/com/ss/rlib/network/ServerNetworkConfig.java rename to rlib-network/src/main/java/javasabr/rlib/network/ServerNetworkConfig.java index a3e86b5a..cc3630d3 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/ServerNetworkConfig.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/ServerNetworkConfig.java @@ -1,88 +1,87 @@ -package com.ss.rlib.network; - -import com.ss.rlib.common.concurrent.GroupThreadFactory; -import lombok.Builder; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; - -import java.nio.ByteOrder; - -/** - * The interface to implement a server network config. - * - * @author JavaSaBr - */ -public interface ServerNetworkConfig extends NetworkConfig { - - @Builder - @Getter - class SimpleServerNetworkConfig implements ServerNetworkConfig { - - @Builder.Default - private String threadGroupName = "ServerNetworkThread"; - @Builder.Default - private ByteOrder byteOrder = ByteOrder.BIG_ENDIAN; - @Builder.Default - private GroupThreadFactory.ThreadConstructor threadConstructor = Thread::new; - - @Builder.Default - private int readBufferSize = 2048; - @Builder.Default - private int pendingBufferSize = 4096; - @Builder.Default - private int writeBufferSize = 2048; - @Builder.Default - private int threadGroupSize = 1; - @Builder.Default - private int threadPriority = Thread.NORM_PRIORITY; - } - - @NotNull ServerNetworkConfig DEFAULT_SERVER = new ServerNetworkConfig() { - - @Override - public int getThreadGroupMinSize() { - return 1; - } - - @Override - public @NotNull String getThreadGroupName() { - return "ServerNetworkThread"; - } - }; - - /** - * Get a minimal size of network thread executor. - * - * @return the minimal executor size. - */ - default int getThreadGroupMinSize() { - return 1; - } - - /** - * Get a maximum size of network thread executor. - * - * @return the maximum executor size. - */ - default int getThreadGroupMaxSize() { - return getThreadGroupMinSize(); - } - - /** - * Get a thread constructor which should be used to create network threads. - * - * @return the thread constructor. - */ - default @NotNull GroupThreadFactory.ThreadConstructor getThreadConstructor() { - return Thread::new; - } - - /** - * Get a priority of network threads. - * - * @return the priority of network threads. - */ - default int getThreadPriority() { - return Thread.NORM_PRIORITY; - } -} +package javasabr.rlib.network; + +import java.nio.ByteOrder; +import javasabr.rlib.common.concurrent.GroupThreadFactory; +import lombok.Builder; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; + +/** + * The interface to implement a server network config. + * + * @author JavaSaBr + */ +public interface ServerNetworkConfig extends NetworkConfig { + + @Builder + @Getter + class SimpleServerNetworkConfig implements ServerNetworkConfig { + + @Builder.Default + private String threadGroupName = "ServerNetworkThread"; + @Builder.Default + private ByteOrder byteOrder = ByteOrder.BIG_ENDIAN; + @Builder.Default + private GroupThreadFactory.ThreadConstructor threadConstructor = Thread::new; + + @Builder.Default + private int readBufferSize = 2048; + @Builder.Default + private int pendingBufferSize = 4096; + @Builder.Default + private int writeBufferSize = 2048; + @Builder.Default + private int threadGroupSize = 1; + @Builder.Default + private int threadPriority = Thread.NORM_PRIORITY; + } + + @NotNull ServerNetworkConfig DEFAULT_SERVER = new ServerNetworkConfig() { + + @Override + public int getThreadGroupMinSize() { + return 1; + } + + @Override + public @NotNull String getThreadGroupName() { + return "ServerNetworkThread"; + } + }; + + /** + * Get a minimal size of network thread executor. + * + * @return the minimal executor size. + */ + default int getThreadGroupMinSize() { + return 1; + } + + /** + * Get a maximum size of network thread executor. + * + * @return the maximum executor size. + */ + default int getThreadGroupMaxSize() { + return getThreadGroupMinSize(); + } + + /** + * Get a thread constructor which should be used to create network threads. + * + * @return the thread constructor. + */ + default @NotNull GroupThreadFactory.ThreadConstructor getThreadConstructor() { + return Thread::new; + } + + /** + * Get a priority of network threads. + * + * @return the priority of network threads. + */ + default int getThreadPriority() { + return Thread.NORM_PRIORITY; + } +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/UnsafeConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java similarity index 51% rename from rlib-network/src/main/java/com/ss/rlib/network/UnsafeConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java index b5f4d329..e7d8a2f7 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/UnsafeConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/UnsafeConnection.java @@ -1,7 +1,7 @@ -package com.ss.rlib.network; +package javasabr.rlib.network; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; public interface UnsafeConnection extends Connection { diff --git a/rlib-network/src/main/java/javasabr/rlib/network/annotation/PacketDescription.java b/rlib-network/src/main/java/javasabr/rlib/network/annotation/PacketDescription.java new file mode 100644 index 00000000..a2ca1e56 --- /dev/null +++ b/rlib-network/src/main/java/javasabr/rlib/network/annotation/PacketDescription.java @@ -0,0 +1,20 @@ +package javasabr.rlib.network.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * The annotation to describe a network packet. + * + * @author JavaSaBr + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface PacketDescription { + + int id(); +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/client/ClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java similarity index 86% rename from rlib-network/src/main/java/com/ss/rlib/network/client/ClientNetwork.java rename to rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java index 95065c30..08f81f51 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/client/ClientNetwork.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/client/ClientNetwork.java @@ -1,42 +1,41 @@ -package com.ss.rlib.network.client; - -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import reactor.core.publisher.Mono; - -import java.net.InetSocketAddress; -import java.util.concurrent.CompletableFuture; - -/** - * Interface to implement a client network. - * - * @author JavaSaBr - */ -public interface ClientNetwork> extends Network { - - /** - * Connect to a server by the address. - * - * @param serverAddress the sever address. - * @return the future with result connection. - */ - @NotNull CompletableFuture connect(@NotNull InetSocketAddress serverAddress); - - /** - * Connect to a server by the address. - * - * @param serverAddress the sever address. - * @return the future with result connection. - */ - @NotNull Mono connected(@NotNull InetSocketAddress serverAddress); - - - /** - * Get a current connection to a server or null. - * - * @return the current connection or null. - */ - @Nullable C getCurrentConnection(); -} +package javasabr.rlib.network.client; + +import java.net.InetSocketAddress; +import java.util.concurrent.CompletableFuture; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import reactor.core.publisher.Mono; + +/** + * Interface to implement a client network. + * + * @author JavaSaBr + */ +public interface ClientNetwork> extends Network { + + /** + * Connect to a server by the address. + * + * @param serverAddress the sever address. + * @return the future with result connection. + */ + @NotNull CompletableFuture connect(@NotNull InetSocketAddress serverAddress); + + /** + * Connect to a server by the address. + * + * @param serverAddress the sever address. + * @return the future with result connection. + */ + @NotNull Mono connected(@NotNull InetSocketAddress serverAddress); + + + /** + * Get a current connection to a server or null. + * + * @return the current connection or null. + */ + @Nullable C getCurrentConnection(); +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/client/impl/DefaultClientNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java similarity index 84% rename from rlib-network/src/main/java/com/ss/rlib/network/client/impl/DefaultClientNetwork.java rename to rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java index 540be7af..e53398de 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/client/impl/DefaultClientNetwork.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/client/impl/DefaultClientNetwork.java @@ -1,124 +1,124 @@ -package com.ss.rlib.network.client.impl; - -import static com.ss.rlib.common.util.Utils.unchecked; -import static com.ss.rlib.common.util.Utils.uncheckedGet; -import com.ss.rlib.common.concurrent.util.ThreadUtils; -import com.ss.rlib.common.util.AsyncUtils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.NetworkConfig; -import com.ss.rlib.network.client.ClientNetwork; -import com.ss.rlib.network.impl.AbstractNetwork; -import com.ss.rlib.network.util.NetworkUtils; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import reactor.core.publisher.Mono; - -import java.net.InetSocketAddress; -import java.nio.channels.AsynchronousSocketChannel; -import java.nio.channels.CompletionHandler; -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.BiFunction; - -/** - * The default implementation of a client network. - * - * @author JavaSaBr - */ -public class DefaultClientNetwork> extends AbstractNetwork implements ClientNetwork { - - protected static final Logger LOGGER = LoggerManager.getLogger(DefaultClientNetwork.class); - - protected final @NotNull AtomicBoolean connecting; - - protected volatile @Nullable CompletableFuture pendingConnection; - protected volatile @Getter @Nullable C currentConnection; - - public DefaultClientNetwork( - @NotNull NetworkConfig config, - @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection - ) { - super(config, channelToConnection); - this.connecting = new AtomicBoolean(false); - - LOGGER.info(config, conf -> "Client network configuration: {\n" + - " groupName: \"" + conf.getThreadGroupName() + "\",\n" + - " readBufferSize: " + conf.getReadBufferSize() + ",\n" + - " pendingBufferSize: " + conf.getPendingBufferSize() + ",\n" + - " writeBufferSize: " + conf.getWriteBufferSize() + "\n" + - "}"); - } - - @Override - public @NotNull CompletableFuture connect(@NotNull InetSocketAddress serverAddress) { - - C currentConnection = getCurrentConnection(); - - if (currentConnection != null) { - unchecked(currentConnection, C::close); - } - - // if we are trying connection now - if (!connecting.compareAndSet(false, true)) { - - var asyncResult = this.pendingConnection; - - if (asyncResult != null) { - return asyncResult; - } - - ThreadUtils.sleep(100); - - return connect(serverAddress); - } - - var asyncResult = new CompletableFuture(); - - var channel = uncheckedGet(AsynchronousSocketChannel::open); - channel.connect(serverAddress, null, new CompletionHandler() { - - @Override - public void completed(@Nullable Void result, @Nullable Void attachment) { - LOGGER.info(channel, ch -> "Connected to server: " + NetworkUtils.getRemoteAddress(ch)); - asyncResult.complete(channelToConnection.apply(DefaultClientNetwork.this, channel)); - } - - @Override - public void failed(@NotNull Throwable exc, @Nullable Void attachment) { - asyncResult.completeExceptionally(exc); - } - }); - - pendingConnection = asyncResult; - - return asyncResult.handle((connection, throwable) -> { - this.currentConnection = connection; - this.connecting.set(false); - return AsyncUtils.continueCompletableStage(connection, throwable); - }); - } - - @Override - public @NotNull Mono connected(@NotNull InetSocketAddress serverAddress) { - return Mono.create(monoSink -> connect(serverAddress) - .whenComplete((connection, ex) -> { - if(ex != null) { - monoSink.error(ex); - } else { - monoSink.success(connection); - } - })); - } - - @Override - public void shutdown() { - Optional - .ofNullable(getCurrentConnection()) - .ifPresent(connection -> unchecked(connection, C::close)); - } -} +package javasabr.rlib.network.client.impl; + +import static javasabr.rlib.common.util.Utils.unchecked; +import static javasabr.rlib.common.util.Utils.uncheckedGet; + +import java.net.InetSocketAddress; +import java.nio.channels.AsynchronousSocketChannel; +import java.nio.channels.CompletionHandler; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.BiFunction; +import javasabr.rlib.common.concurrent.util.ThreadUtils; +import javasabr.rlib.common.util.AsyncUtils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.NetworkConfig; +import javasabr.rlib.network.client.ClientNetwork; +import javasabr.rlib.network.impl.AbstractNetwork; +import javasabr.rlib.network.util.NetworkUtils; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import reactor.core.publisher.Mono; + +/** + * The default implementation of a client network. + * + * @author JavaSaBr + */ +public class DefaultClientNetwork> extends AbstractNetwork implements ClientNetwork { + + protected static final Logger LOGGER = LoggerManager.getLogger(DefaultClientNetwork.class); + + protected final @NotNull AtomicBoolean connecting; + + protected volatile @Nullable CompletableFuture pendingConnection; + protected volatile @Getter @Nullable C currentConnection; + + public DefaultClientNetwork( + @NotNull NetworkConfig config, + @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection + ) { + super(config, channelToConnection); + this.connecting = new AtomicBoolean(false); + + LOGGER.info(config, conf -> "Client network configuration: {\n" + + " groupName: \"" + conf.getThreadGroupName() + "\",\n" + + " readBufferSize: " + conf.getReadBufferSize() + ",\n" + + " pendingBufferSize: " + conf.getPendingBufferSize() + ",\n" + + " writeBufferSize: " + conf.getWriteBufferSize() + "\n" + + "}"); + } + + @Override + public @NotNull CompletableFuture connect(@NotNull InetSocketAddress serverAddress) { + + C currentConnection = getCurrentConnection(); + + if (currentConnection != null) { + unchecked(currentConnection, C::close); + } + + // if we are trying connection now + if (!connecting.compareAndSet(false, true)) { + + var asyncResult = this.pendingConnection; + + if (asyncResult != null) { + return asyncResult; + } + + ThreadUtils.sleep(100); + + return connect(serverAddress); + } + + var asyncResult = new CompletableFuture(); + + var channel = uncheckedGet(AsynchronousSocketChannel::open); + channel.connect(serverAddress, null, new CompletionHandler() { + + @Override + public void completed(@Nullable Void result, @Nullable Void attachment) { + LOGGER.info(channel, ch -> "Connected to server: " + NetworkUtils.getRemoteAddress(ch)); + asyncResult.complete(channelToConnection.apply(DefaultClientNetwork.this, channel)); + } + + @Override + public void failed(@NotNull Throwable exc, @Nullable Void attachment) { + asyncResult.completeExceptionally(exc); + } + }); + + pendingConnection = asyncResult; + + return asyncResult.handle((connection, throwable) -> { + this.currentConnection = connection; + this.connecting.set(false); + return AsyncUtils.continueCompletableStage(connection, throwable); + }); + } + + @Override + public @NotNull Mono connected(@NotNull InetSocketAddress serverAddress) { + return Mono.create(monoSink -> connect(serverAddress) + .whenComplete((connection, ex) -> { + if(ex != null) { + monoSink.error(ex); + } else { + monoSink.success(connection); + } + })); + } + + @Override + public void shutdown() { + Optional + .ofNullable(getCurrentConnection()) + .ifPresent(connection -> unchecked(connection, C::close)); + } +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java similarity index 88% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java index 0bea6095..b18666b6 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractConnection.java @@ -1,28 +1,6 @@ -package com.ss.rlib.network.impl; - -import static com.ss.rlib.common.util.Utils.unchecked; -import com.ss.rlib.common.function.NotNullBiConsumer; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.linkedlist.LinkedList; -import com.ss.rlib.common.util.linkedlist.LinkedListFactory; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.UnsafeConnection; -import com.ss.rlib.network.packet.PacketReader; -import com.ss.rlib.network.packet.PacketWriter; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; -import com.ss.rlib.network.packet.impl.WritablePacketWrapper; -import com.ss.rlib.network.util.NetworkUtils; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import reactor.core.publisher.Flux; -import reactor.core.publisher.FluxSink; +package javasabr.rlib.network.impl; + +import static javasabr.rlib.common.util.Utils.unchecked; import java.nio.channels.AsynchronousChannel; import java.nio.channels.AsynchronousSocketChannel; @@ -30,6 +8,28 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.StampedLock; import java.util.function.BiConsumer; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.linkedlist.LinkedList; +import javasabr.rlib.common.util.linkedlist.LinkedListFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.UnsafeConnection; +import javasabr.rlib.network.packet.PacketReader; +import javasabr.rlib.network.packet.PacketWriter; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; +import javasabr.rlib.network.packet.impl.WritablePacketWrapper; +import javasabr.rlib.network.util.NetworkUtils; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import reactor.core.publisher.Flux; +import reactor.core.publisher.FluxSink; /** * The base implementation of {@link Connection}. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java similarity index 76% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractNetwork.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java index bb56e4d0..f7508957 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractNetwork.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractNetwork.java @@ -1,14 +1,13 @@ -package com.ss.rlib.network.impl; - -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.NetworkConfig; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.impl; import java.nio.channels.AsynchronousSocketChannel; import java.util.function.BiFunction; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.NetworkConfig; +import org.jetbrains.annotations.NotNull; /** * The base implementation of {@link Network}. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractSSLConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSSLConnection.java similarity index 81% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractSSLConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSSLConnection.java index b04d0991..af6f71b4 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/AbstractSSLConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/AbstractSSLConnection.java @@ -1,16 +1,15 @@ -package com.ss.rlib.network.impl; - -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.impl; +import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLException; -import java.nio.channels.AsynchronousSocketChannel; +import org.jetbrains.annotations.NotNull; public abstract class AbstractSSLConnection extends AbstractConnection { diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultBufferAllocator.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java similarity index 91% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultBufferAllocator.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java index 0fc8f13a..bc3011bf 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultBufferAllocator.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultBufferAllocator.java @@ -1,16 +1,15 @@ -package com.ss.rlib.network.impl; +package javasabr.rlib.network.impl; -import com.ss.rlib.common.util.pools.Pool; -import com.ss.rlib.common.util.pools.PoolFactory; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.NetworkConfig; +import java.nio.ByteBuffer; +import javasabr.rlib.common.util.pools.Pool; +import javasabr.rlib.common.util.pools.PoolFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.NetworkConfig; import lombok.ToString; import org.jetbrains.annotations.NotNull; -import java.nio.ByteBuffer; - /** * The default byte buffer allocator. * diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java similarity index 64% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java index 76aab2a3..bfa599a1 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultConnection.java @@ -1,14 +1,13 @@ -package com.ss.rlib.network.impl; - -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.packet.impl.DefaultReadablePacket; -import com.ss.rlib.network.packet.impl.DefaultWritablePacket; -import com.ss.rlib.network.packet.registry.ReadablePacketRegistry; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.impl; import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.packet.impl.DefaultReadablePacket; +import javasabr.rlib.network.packet.impl.DefaultWritablePacket; +import javasabr.rlib.network.packet.registry.ReadablePacketRegistry; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultDataConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java similarity index 78% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultDataConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java index b46a2626..9feea0f2 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultDataConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataConnection.java @@ -1,20 +1,19 @@ -package com.ss.rlib.network.impl; +package javasabr.rlib.network.impl; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.packet.PacketReader; -import com.ss.rlib.network.packet.PacketWriter; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; -import com.ss.rlib.network.packet.impl.DefaultPacketReader; -import com.ss.rlib.network.packet.impl.DefaultPacketWriter; +import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.packet.PacketReader; +import javasabr.rlib.network.packet.PacketWriter; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; +import javasabr.rlib.network.packet.impl.DefaultPacketReader; +import javasabr.rlib.network.packet.impl.DefaultPacketWriter; import lombok.AccessLevel; import lombok.Getter; import org.jetbrains.annotations.NotNull; -import java.nio.channels.AsynchronousSocketChannel; - /** * @author JavaSaBr */ diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultDataSSLConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSSLConnection.java similarity index 80% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultDataSSLConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSSLConnection.java index b427e7ec..528920ea 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/DefaultDataSSLConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/DefaultDataSSLConnection.java @@ -1,21 +1,20 @@ -package com.ss.rlib.network.impl; +package javasabr.rlib.network.impl; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.packet.PacketReader; -import com.ss.rlib.network.packet.PacketWriter; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; -import com.ss.rlib.network.packet.impl.DefaultSSLPacketReader; -import com.ss.rlib.network.packet.impl.DefaultSSLPacketWriter; +import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.packet.PacketReader; +import javasabr.rlib.network.packet.PacketWriter; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; +import javasabr.rlib.network.packet.impl.DefaultSSLPacketReader; +import javasabr.rlib.network.packet.impl.DefaultSSLPacketWriter; +import javax.net.ssl.SSLContext; import lombok.AccessLevel; import lombok.Getter; import org.jetbrains.annotations.NotNull; -import javax.net.ssl.SSLContext; -import java.nio.channels.AsynchronousSocketChannel; - /** * @author JavaSaBr */ diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/IdBasedPacketConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java similarity index 78% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/IdBasedPacketConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java index 1825d789..f3d73f29 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/IdBasedPacketConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/IdBasedPacketConnection.java @@ -1,21 +1,20 @@ -package com.ss.rlib.network.impl; +package javasabr.rlib.network.impl; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.packet.IdBasedReadablePacket; -import com.ss.rlib.network.packet.IdBasedWritablePacket; -import com.ss.rlib.network.packet.PacketReader; -import com.ss.rlib.network.packet.PacketWriter; -import com.ss.rlib.network.packet.impl.IdBasedPacketReader; -import com.ss.rlib.network.packet.impl.IdBasedPacketWriter; -import com.ss.rlib.network.packet.registry.ReadablePacketRegistry; +import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.packet.IdBasedReadablePacket; +import javasabr.rlib.network.packet.IdBasedWritablePacket; +import javasabr.rlib.network.packet.PacketReader; +import javasabr.rlib.network.packet.PacketWriter; +import javasabr.rlib.network.packet.impl.IdBasedPacketReader; +import javasabr.rlib.network.packet.impl.IdBasedPacketWriter; +import javasabr.rlib.network.packet.registry.ReadablePacketRegistry; import lombok.AccessLevel; import lombok.Getter; import org.jetbrains.annotations.NotNull; -import java.nio.channels.AsynchronousSocketChannel; - /** * @author JavaSaBr */ diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/PackedIdBasedConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java similarity index 87% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/PackedIdBasedConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java index 990de734..4cf933bc 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/PackedIdBasedConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/PackedIdBasedConnection.java @@ -1,6 +1,6 @@ -package com.ss.rlib.network.impl; +package javasabr.rlib.network.impl; -import com.ss.rlib.network.Connection; +import javasabr.rlib.network.Connection; /** * The interface to implement a packet id based async connection. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/ReuseBufferAllocator.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/ReuseBufferAllocator.java similarity index 92% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/ReuseBufferAllocator.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/ReuseBufferAllocator.java index 1a76250e..59fa9983 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/ReuseBufferAllocator.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/ReuseBufferAllocator.java @@ -1,19 +1,18 @@ -package com.ss.rlib.network.impl; - -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.common.util.array.ConcurrentArray; -import com.ss.rlib.common.util.pools.Pool; -import com.ss.rlib.common.util.pools.PoolFactory; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.NetworkConfig; -import lombok.ToString; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.impl; import java.nio.ByteBuffer; import java.util.Collection; import java.util.function.Function; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.common.util.array.ConcurrentArray; +import javasabr.rlib.common.util.pools.Pool; +import javasabr.rlib.common.util.pools.PoolFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.NetworkConfig; +import lombok.ToString; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/StringDataConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java similarity index 70% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/StringDataConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java index bd97b79c..4b6cdfce 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/StringDataConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataConnection.java @@ -1,13 +1,12 @@ -package com.ss.rlib.network.impl; - -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.packet.impl.StringReadablePacket; -import com.ss.rlib.network.packet.impl.StringWritablePacket; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.impl; import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.packet.impl.StringReadablePacket; +import javasabr.rlib.network.packet.impl.StringWritablePacket; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/impl/StringDataSSLConnection.java b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSSLConnection.java similarity index 73% rename from rlib-network/src/main/java/com/ss/rlib/network/impl/StringDataSSLConnection.java rename to rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSSLConnection.java index 8fdd8648..68a9719c 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/impl/StringDataSSLConnection.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/impl/StringDataSSLConnection.java @@ -1,14 +1,13 @@ -package com.ss.rlib.network.impl; +package javasabr.rlib.network.impl; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.packet.impl.StringReadablePacket; -import com.ss.rlib.network.packet.impl.StringWritablePacket; -import org.jetbrains.annotations.NotNull; - -import javax.net.ssl.SSLContext; import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.packet.impl.StringReadablePacket; +import javasabr.rlib.network.packet.impl.StringWritablePacket; +import javax.net.ssl.SSLContext; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedPacket.java similarity index 75% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedPacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedPacket.java index 32d78618..468a7592 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedPacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedPacket.java @@ -1,6 +1,6 @@ -package com.ss.rlib.network.packet; +package javasabr.rlib.network.packet; -import com.ss.rlib.network.annotation.PacketDescription; +import javasabr.rlib.network.annotation.PacketDescription; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadablePacket.java similarity index 82% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedReadablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadablePacket.java index 3c90bbd4..bcc88ca0 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedReadablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedReadablePacket.java @@ -1,7 +1,7 @@ -package com.ss.rlib.network.packet; +package javasabr.rlib.network.packet; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.network.Connection; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.network.Connection; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritablePacket.java similarity index 74% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedWritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritablePacket.java index 518d86be..2907a2e6 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/IdBasedWritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/IdBasedWritablePacket.java @@ -1,4 +1,4 @@ -package com.ss.rlib.network.packet; +package javasabr.rlib.network.packet; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/Packet.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/Packet.java similarity index 87% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/Packet.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/Packet.java index bc7314cd..e4663c6f 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/Packet.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/Packet.java @@ -1,4 +1,4 @@ -package com.ss.rlib.network.packet; +package javasabr.rlib.network.packet; import org.jetbrains.annotations.NotNull; diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/PacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/PacketReader.java similarity index 85% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/PacketReader.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/PacketReader.java index 6eb29714..ebf88793 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/PacketReader.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/PacketReader.java @@ -1,4 +1,4 @@ -package com.ss.rlib.network.packet; +package javasabr.rlib.network.packet; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/PacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/PacketWriter.java similarity index 80% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/PacketWriter.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/PacketWriter.java index 4bce54c5..1d918cea 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/PacketWriter.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/PacketWriter.java @@ -1,4 +1,4 @@ -package com.ss.rlib.network.packet; +package javasabr.rlib.network.packet; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/ReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadablePacket.java similarity index 84% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/ReadablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/ReadablePacket.java index b027738b..14f5e88a 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/ReadablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReadablePacket.java @@ -1,24 +1,23 @@ -package com.ss.rlib.network.packet; - -import com.ss.rlib.network.Connection; -import org.jetbrains.annotations.NotNull; - -import java.nio.ByteBuffer; - -/** - * The interface to implement a readable network packet. - * - * @author JavaSaBr - */ -public interface ReadablePacket extends Packet { - - /** - * Read packet's data from byte buffer. - * - * @param connection the network connection. - * @param buffer the buffer with received data. - * @param length the data length. - * @return true if reading was success. - */ - boolean read(@NotNull Connection connection, @NotNull ByteBuffer buffer, int length); -} +package javasabr.rlib.network.packet; + +import java.nio.ByteBuffer; +import javasabr.rlib.network.Connection; +import org.jetbrains.annotations.NotNull; + +/** + * The interface to implement a readable network packet. + * + * @author JavaSaBr + */ +public interface ReadablePacket extends Packet { + + /** + * Read packet's data from byte buffer. + * + * @param connection the network connection. + * @param buffer the buffer with received data. + * @param length the data length. + * @return true if reading was success. + */ + boolean read(@NotNull Connection connection, @NotNull ByteBuffer buffer, int length); +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/ReusableWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java similarity index 88% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/ReusableWritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java index 8974bd58..a313507d 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/ReusableWritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/ReusableWritablePacket.java @@ -1,7 +1,7 @@ -package com.ss.rlib.network.packet; +package javasabr.rlib.network.packet; -import com.ss.rlib.common.util.pools.Pool; -import com.ss.rlib.common.util.pools.Reusable; +import javasabr.rlib.common.util.pools.Pool; +import javasabr.rlib.common.util.pools.Reusable; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/WritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritablePacket.java similarity index 93% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/WritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/WritablePacket.java index d6480c1e..bc422dd4 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/WritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/WritablePacket.java @@ -1,135 +1,134 @@ -package com.ss.rlib.network.packet; - -import com.ss.rlib.logger.api.LoggerManager; -import org.jetbrains.annotations.NotNull; - -import java.nio.BufferOverflowException; -import java.nio.ByteBuffer; - -/** - * Interface to implement a writable packet. - * - * @author JavaSaBr - */ -public interface WritablePacket extends Packet { - - /** - * Write this packet to the buffer. - * - * @param buffer the buffer. - * @return true if writing was successful. - */ - boolean write(@NotNull ByteBuffer buffer); - - /** - * Return an expected data length of this packet or -1. - * - * @return expected data length of this packet or -1. - */ - default int getExpectedLength() { - return -1; - } - - /** - * Write 1 byte to the buffer. - * - * @param buffer the buffer. - * @param value the value. - */ - default void writeByte(@NotNull ByteBuffer buffer, int value) { - buffer.put((byte) value); - } - - /** - * Write 2 bytes to the buffer. - * - * @param buffer the buffer. - * @param value the value. - */ - default void writeChar(@NotNull ByteBuffer buffer, char value) { - buffer.putChar(value); - } - - /** - * Write 2 bytes to the buffer. - * - * @param buffer the buffer. - * @param value the value. - */ - default void writeChar(@NotNull final ByteBuffer buffer, final int value) { - buffer.putChar((char) value); - } - - /** - * Write 4 bytes to the buffer. - * - * @param buffer the buffer. - * @param value the value. - */ - default void writeFloat(@NotNull ByteBuffer buffer, float value) { - buffer.putFloat(value); - } - - /** - * Write 4 bytes to the buffer. - * - * @param buffer the buffer. - * @param value the value. - */ - default void writeInt(@NotNull ByteBuffer buffer, int value) { - buffer.putInt(value); - } - - /** - * Write 8 bytes to the buffer. - * - * @param buffer the buffer. - * @param value the value. - */ - default void writeLong(@NotNull ByteBuffer buffer, long value) { - buffer.putLong(value); - } - - /** - * Writes 2 bytes to the buffer. - * - * @param buffer the buffer. - * @param value the value for writing. - */ - default void writeShort(@NotNull ByteBuffer buffer, int value) { - buffer.putShort((short) value); - } - - /** - * Writes the string to the buffer. - * - * @param buffer the buffer. - * @param string the string for writing. - */ - default void writeString(@NotNull ByteBuffer buffer, @NotNull String string) { - try { - - writeInt(buffer, string.length()); - - for (int i = 0, length = string.length(); i < length; i++) { - buffer.putChar(string.charAt(i)); - } - - } catch (BufferOverflowException ex) { - LoggerManager.getLogger(WritablePacket.class) - .error("Cannot write a string to buffer because the string is too long." + - " String length: " + string.length() + ", buffer: " + buffer); - throw ex; - } - } - - /** - * Write a data buffer to packet buffer. - * - * @param buffer thr packet buffer. - * @param data the data buffer. - */ - default void writeBuffer(@NotNull ByteBuffer buffer, @NotNull ByteBuffer data) { - buffer.put(data.array(), data.position(), data.limit()); - } -} +package javasabr.rlib.network.packet; + +import java.nio.BufferOverflowException; +import java.nio.ByteBuffer; +import javasabr.rlib.logger.api.LoggerManager; +import org.jetbrains.annotations.NotNull; + +/** + * Interface to implement a writable packet. + * + * @author JavaSaBr + */ +public interface WritablePacket extends Packet { + + /** + * Write this packet to the buffer. + * + * @param buffer the buffer. + * @return true if writing was successful. + */ + boolean write(@NotNull ByteBuffer buffer); + + /** + * Return an expected data length of this packet or -1. + * + * @return expected data length of this packet or -1. + */ + default int getExpectedLength() { + return -1; + } + + /** + * Write 1 byte to the buffer. + * + * @param buffer the buffer. + * @param value the value. + */ + default void writeByte(@NotNull ByteBuffer buffer, int value) { + buffer.put((byte) value); + } + + /** + * Write 2 bytes to the buffer. + * + * @param buffer the buffer. + * @param value the value. + */ + default void writeChar(@NotNull ByteBuffer buffer, char value) { + buffer.putChar(value); + } + + /** + * Write 2 bytes to the buffer. + * + * @param buffer the buffer. + * @param value the value. + */ + default void writeChar(@NotNull final ByteBuffer buffer, final int value) { + buffer.putChar((char) value); + } + + /** + * Write 4 bytes to the buffer. + * + * @param buffer the buffer. + * @param value the value. + */ + default void writeFloat(@NotNull ByteBuffer buffer, float value) { + buffer.putFloat(value); + } + + /** + * Write 4 bytes to the buffer. + * + * @param buffer the buffer. + * @param value the value. + */ + default void writeInt(@NotNull ByteBuffer buffer, int value) { + buffer.putInt(value); + } + + /** + * Write 8 bytes to the buffer. + * + * @param buffer the buffer. + * @param value the value. + */ + default void writeLong(@NotNull ByteBuffer buffer, long value) { + buffer.putLong(value); + } + + /** + * Writes 2 bytes to the buffer. + * + * @param buffer the buffer. + * @param value the value for writing. + */ + default void writeShort(@NotNull ByteBuffer buffer, int value) { + buffer.putShort((short) value); + } + + /** + * Writes the string to the buffer. + * + * @param buffer the buffer. + * @param string the string for writing. + */ + default void writeString(@NotNull ByteBuffer buffer, @NotNull String string) { + try { + + writeInt(buffer, string.length()); + + for (int i = 0, length = string.length(); i < length; i++) { + buffer.putChar(string.charAt(i)); + } + + } catch (BufferOverflowException ex) { + LoggerManager.getLogger(WritablePacket.class) + .error("Cannot write a string to buffer because the string is too long." + + " String length: " + string.length() + ", buffer: " + buffer); + throw ex; + } + } + + /** + * Write a data buffer to packet buffer. + * + * @param buffer thr packet buffer. + * @param data the data buffer. + */ + default void writeBuffer(@NotNull ByteBuffer buffer, @NotNull ByteBuffer data) { + buffer.put(data.array(), data.position(), data.limit()); + } +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractIdBasedReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadablePacket.java similarity index 71% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractIdBasedReadablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadablePacket.java index 029148a7..2c63473d 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractIdBasedReadablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractIdBasedReadablePacket.java @@ -1,10 +1,10 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.IdBasedReadablePacket; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.IdBasedReadablePacket; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacket.java similarity index 83% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacket.java index d4824b2a..f48075a7 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacket.java @@ -1,12 +1,12 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import static com.ss.rlib.network.util.NetworkUtils.hexDump; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.packet.Packet; -import org.jetbrains.annotations.NotNull; +import static javasabr.rlib.network.util.NetworkUtils.hexDump; import java.nio.ByteBuffer; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.packet.Packet; +import org.jetbrains.annotations.NotNull; /** * The base implementation of {@link Packet}. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacketReader.java similarity index 96% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacketReader.java index d3a165a3..d16522b8 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacketReader.java @@ -1,21 +1,7 @@ -package com.ss.rlib.network.packet.impl; - -import static com.ss.rlib.common.util.ObjectUtils.notNull; -import static com.ss.rlib.network.util.NetworkUtils.getRemoteAddress; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.common.util.BufferUtils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.PacketReader; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.util.NetworkUtils; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.Setter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.network.packet.impl; + +import static javasabr.rlib.common.util.ObjectUtils.notNull; +import static javasabr.rlib.network.util.NetworkUtils.getRemoteAddress; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousCloseException; @@ -23,6 +9,20 @@ import java.nio.channels.CompletionHandler; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.util.BufferUtils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.PacketReader; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.util.NetworkUtils; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @param the readable packet's type. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacketWriter.java similarity index 94% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketWriter.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacketWriter.java index cafd8e54..d33ff5a9 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketWriter.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractPacketWriter.java @@ -1,24 +1,26 @@ -package com.ss.rlib.network.packet.impl; - -import static com.ss.rlib.network.util.NetworkUtils.*; -import com.ss.rlib.common.function.NotNullBiConsumer; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.common.function.NullableSupplier; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.PacketWriter; -import com.ss.rlib.network.packet.WritablePacket; -import com.ss.rlib.network.util.NetworkUtils; -import lombok.RequiredArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.network.packet.impl; + +import static javasabr.rlib.network.util.NetworkUtils.EMPTY_BUFFER; +import static javasabr.rlib.network.util.NetworkUtils.getRemoteAddress; +import static javasabr.rlib.network.util.NetworkUtils.hexDump; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; import java.nio.channels.CompletionHandler; import java.util.concurrent.atomic.AtomicBoolean; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NullableSupplier; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.PacketWriter; +import javasabr.rlib.network.packet.WritablePacket; +import javasabr.rlib.network.util.NetworkUtils; +import lombok.RequiredArgsConstructor; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadablePacket.java similarity index 96% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractReadablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadablePacket.java index 371692a3..10409039 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractReadablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReadablePacket.java @@ -1,15 +1,14 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.ReadablePacket; +import java.nio.BufferUnderflowException; +import java.nio.ByteBuffer; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.ReadablePacket; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; -import java.nio.BufferUnderflowException; -import java.nio.ByteBuffer; - /** * The base implementation of {@link ReadablePacket}. * diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractReusableWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritablePacket.java similarity index 92% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractReusableWritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritablePacket.java index ea881644..919d4787 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractReusableWritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractReusableWritablePacket.java @@ -1,17 +1,17 @@ -package com.ss.rlib.network.packet.impl; - -import static com.ss.rlib.common.util.ObjectUtils.notNull; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.pools.Pool; -import com.ss.rlib.common.util.pools.PoolFactory; -import com.ss.rlib.network.packet.ReusableWritablePacket; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.network.packet.impl; + +import static javasabr.rlib.common.util.ObjectUtils.notNull; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.pools.Pool; +import javasabr.rlib.common.util.pools.PoolFactory; +import javasabr.rlib.network.packet.ReusableWritablePacket; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * The reusable implementation of {@link AbstractWritablePacket} using the counter to control the life cycle of diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSSLPacketReader.java similarity index 95% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketReader.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSSLPacketReader.java index 72f4a25a..e2245f7b 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketReader.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSSLPacketReader.java @@ -1,24 +1,23 @@ -package com.ss.rlib.network.packet.impl; - -import static com.ss.rlib.network.util.NetworkUtils.hexDump; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; -import com.ss.rlib.network.util.NetworkUtils; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.packet.impl; + +import static javasabr.rlib.network.util.NetworkUtils.hexDump; -import javax.crypto.BadPaddingException; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; +import javasabr.rlib.network.util.NetworkUtils; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLException; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.AsynchronousSocketChannel; +import org.jetbrains.annotations.NotNull; /** * @param the readable packet's type. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSSLPacketWriter.java similarity index 92% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketWriter.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSSLPacketWriter.java index d8cc8f25..d5901889 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketWriter.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractSSLPacketWriter.java @@ -1,26 +1,26 @@ -package com.ss.rlib.network.packet.impl; - -import static com.ss.rlib.network.util.NetworkUtils.EMPTY_BUFFER; -import static com.ss.rlib.network.util.NetworkUtils.hexDump; -import com.ss.rlib.common.function.NotNullBiConsumer; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.common.function.NullableSupplier; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.WritablePacket; -import com.ss.rlib.network.util.NetworkUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.network.packet.impl; + +import static javasabr.rlib.network.util.NetworkUtils.EMPTY_BUFFER; +import static javasabr.rlib.network.util.NetworkUtils.hexDump; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NullableSupplier; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.WritablePacket; +import javasabr.rlib.network.util.NetworkUtils; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLException; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.AsynchronousSocketChannel; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public abstract class AbstractSSLPacketWriter> extends AbstractPacketWriter { diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritablePacket.java similarity index 87% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractWritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritablePacket.java index 35f98d25..bf599c70 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractWritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/AbstractWritablePacket.java @@ -1,9 +1,8 @@ -package com.ss.rlib.network.packet.impl; - -import com.ss.rlib.network.packet.WritablePacket; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.packet.impl; import java.nio.ByteBuffer; +import javasabr.rlib.network.packet.WritablePacket; +import org.jetbrains.annotations.NotNull; /** * The base implementation of the {@link WritablePacket}. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultPacketReader.java similarity index 88% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultPacketReader.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultPacketReader.java index e78bce48..507ab2a3 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultPacketReader.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultPacketReader.java @@ -1,15 +1,14 @@ -package com.ss.rlib.network.packet.impl; - -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.ReadablePacket; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.network.packet.impl; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; import java.util.function.IntFunction; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.ReadablePacket; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @param the readable packet's type. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultPacketWriter.java similarity index 81% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultPacketWriter.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultPacketWriter.java index e37f7e2e..dcd52ff0 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultPacketWriter.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultPacketWriter.java @@ -1,19 +1,14 @@ -package com.ss.rlib.network.packet.impl; - -import com.ss.rlib.common.function.NotNullBiConsumer; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.common.function.NullableSupplier; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.WritablePacket; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.network.packet.impl; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NullableSupplier; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.WritablePacket; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadablePacket.java similarity index 61% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultReadablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadablePacket.java index ac47398b..cd07d802 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultReadablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultReadablePacket.java @@ -1,6 +1,6 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.network.impl.DefaultConnection; +import javasabr.rlib.network.impl.DefaultConnection; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultSSLPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSSLPacketReader.java similarity index 87% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultSSLPacketReader.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSSLPacketReader.java index cdf2ac6f..a7bf4c01 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultSSLPacketReader.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSSLPacketReader.java @@ -1,17 +1,16 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.ReadablePacket; -import com.ss.rlib.network.packet.WritablePacket; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.net.ssl.SSLEngine; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; import java.util.function.IntFunction; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.ReadablePacket; +import javasabr.rlib.network.packet.WritablePacket; +import javax.net.ssl.SSLEngine; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @param the readable packet's type. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultSSLPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSSLPacketWriter.java similarity index 87% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultSSLPacketWriter.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSSLPacketWriter.java index 4fa70c2f..9a0a9316 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultSSLPacketWriter.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultSSLPacketWriter.java @@ -1,16 +1,15 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.common.function.NotNullBiConsumer; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.common.function.NullableSupplier; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.WritablePacket; -import org.jetbrains.annotations.NotNull; - -import javax.net.ssl.SSLEngine; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NullableSupplier; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.WritablePacket; +import javax.net.ssl.SSLEngine; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritablePacket.java similarity index 56% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultWritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritablePacket.java index 7db57a65..63753ed3 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/DefaultWritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/DefaultWritablePacket.java @@ -1,6 +1,6 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.network.packet.IdBasedWritablePacket; +import javasabr.rlib.network.packet.IdBasedWritablePacket; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/IdBasedPacketReader.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java similarity index 86% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/IdBasedPacketReader.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java index 874e5681..9022313c 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/IdBasedPacketReader.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketReader.java @@ -1,15 +1,14 @@ -package com.ss.rlib.network.packet.impl; - -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.IdBasedReadablePacket; -import com.ss.rlib.network.packet.registry.ReadablePacketRegistry; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package javasabr.rlib.network.packet.impl; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.IdBasedReadablePacket; +import javasabr.rlib.network.packet.registry.ReadablePacketRegistry; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @param the readable packet's type. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/IdBasedPacketWriter.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketWriter.java similarity index 79% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/IdBasedPacketWriter.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketWriter.java index 06287197..5ba0aadc 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/IdBasedPacketWriter.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/IdBasedPacketWriter.java @@ -1,16 +1,15 @@ -package com.ss.rlib.network.packet.impl; - -import com.ss.rlib.common.function.NotNullBiConsumer; -import com.ss.rlib.common.function.NotNullConsumer; -import com.ss.rlib.common.function.NullableSupplier; -import com.ss.rlib.network.BufferAllocator; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.packet.IdBasedWritablePacket; -import com.ss.rlib.network.packet.WritablePacket; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.packet.impl; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; +import javasabr.rlib.common.function.NotNullBiConsumer; +import javasabr.rlib.common.function.NotNullConsumer; +import javasabr.rlib.common.function.NullableSupplier; +import javasabr.rlib.network.BufferAllocator; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.packet.IdBasedWritablePacket; +import javasabr.rlib.network.packet.WritablePacket; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/SSLWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SSLWritablePacket.java similarity index 90% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/SSLWritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SSLWritablePacket.java index 86b77768..9ddb9e6b 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/SSLWritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/SSLWritablePacket.java @@ -1,8 +1,7 @@ -package com.ss.rlib.network.packet.impl; - -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network.packet.impl; import java.nio.ByteBuffer; +import org.jetbrains.annotations.NotNull; /** * Packet marker. diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/StringReadablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java similarity index 90% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/StringReadablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java index 3ac98890..36c7f5ae 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/StringReadablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringReadablePacket.java @@ -1,12 +1,11 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.network.Connection; +import java.nio.ByteBuffer; +import javasabr.rlib.network.Connection; import lombok.Getter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.nio.ByteBuffer; - /** * @author JavaSaBr */ diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/StringWritablePacket.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritablePacket.java similarity index 93% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/StringWritablePacket.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritablePacket.java index 28edb0c3..f8678846 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/StringWritablePacket.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/StringWritablePacket.java @@ -1,10 +1,9 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; +import java.nio.ByteBuffer; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; -import java.nio.ByteBuffer; - /** * @author JavaSaBr */ diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/WritablePacketWrapper.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java similarity index 89% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/impl/WritablePacketWrapper.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java index d0f9d2c2..69fc9b8f 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/impl/WritablePacketWrapper.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/impl/WritablePacketWrapper.java @@ -1,12 +1,11 @@ -package com.ss.rlib.network.packet.impl; +package javasabr.rlib.network.packet.impl; -import com.ss.rlib.network.packet.WritablePacket; +import java.nio.ByteBuffer; +import javasabr.rlib.network.packet.WritablePacket; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; -import java.nio.ByteBuffer; - /** * The writable packet wrapper with additional attachment. * diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/registry/ReadablePacketRegistry.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadablePacketRegistry.java similarity index 89% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/registry/ReadablePacketRegistry.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadablePacketRegistry.java index bfc47c35..71512c02 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/registry/ReadablePacketRegistry.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/ReadablePacketRegistry.java @@ -1,12 +1,12 @@ -package com.ss.rlib.network.packet.registry; - -import com.ss.rlib.common.classpath.ClassPathScanner; -import com.ss.rlib.common.classpath.ClassPathScannerFactory; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayCollectors; -import com.ss.rlib.network.annotation.PacketDescription; -import com.ss.rlib.network.packet.IdBasedReadablePacket; -import com.ss.rlib.network.packet.registry.impl.IdBasedReadablePacketRegistry; +package javasabr.rlib.network.packet.registry; + +import javasabr.rlib.common.classpath.ClassPathScanner; +import javasabr.rlib.common.classpath.ClassPathScannerFactory; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayCollectors; +import javasabr.rlib.network.annotation.PacketDescription; +import javasabr.rlib.network.packet.IdBasedReadablePacket; +import javasabr.rlib.network.packet.registry.impl.IdBasedReadablePacketRegistry; import org.jetbrains.annotations.NotNull; /** diff --git a/rlib-network/src/main/java/com/ss/rlib/network/packet/registry/impl/IdBasedReadablePacketRegistry.java b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadablePacketRegistry.java similarity index 93% rename from rlib-network/src/main/java/com/ss/rlib/network/packet/registry/impl/IdBasedReadablePacketRegistry.java rename to rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadablePacketRegistry.java index e166ee74..d9efaace 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/packet/registry/impl/IdBasedReadablePacketRegistry.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/packet/registry/impl/IdBasedReadablePacketRegistry.java @@ -1,21 +1,20 @@ -package com.ss.rlib.network.packet.registry.impl; - -import com.ss.rlib.common.util.ArrayUtils; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.annotation.PacketDescription; -import com.ss.rlib.network.packet.IdBasedReadablePacket; -import com.ss.rlib.network.packet.registry.ReadablePacketRegistry; +package javasabr.rlib.network.packet.registry.impl; + +import java.util.Arrays; +import java.util.function.Supplier; +import javasabr.rlib.common.util.ArrayUtils; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.annotation.PacketDescription; +import javasabr.rlib.network.packet.IdBasedReadablePacket; +import javasabr.rlib.network.packet.registry.ReadablePacketRegistry; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; -import java.util.Arrays; -import java.util.function.Supplier; - /** * The id based implementation of readable packets registry. * diff --git a/rlib-network/src/main/java/com/ss/rlib/network/server/ServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java similarity index 87% rename from rlib-network/src/main/java/com/ss/rlib/network/server/ServerNetwork.java rename to rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java index 6b0f8d85..b3a31de1 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/server/ServerNetwork.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/server/ServerNetwork.java @@ -1,47 +1,46 @@ -package com.ss.rlib.network.server; - -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import org.jetbrains.annotations.NotNull; -import reactor.core.publisher.Flux; - -import java.net.InetSocketAddress; -import java.util.function.Consumer; - -/** - * The interface to implement a server network. - * - * @author JavaSaBr - */ -public interface ServerNetwork> extends Network { - - /** - * Start a server using any available address. - * - * @return this server's address. - */ - @NotNull InetSocketAddress start(); - - /** - * Start a server by the address. - * - * @param serverAddress the sever address. - * @param the server network's type. - * @return this network. - */ - > @NotNull S start(@NotNull InetSocketAddress serverAddress); - - /** - * Register a consumer of new connections. - * - * @param consumer the consumer of new connections. - */ - void onAccept(@NotNull Consumer consumer); - - /** - * Get a stream of new accepted connections. - * - * @return the stream of new accepted connections. - */ - @NotNull Flux accepted(); -} +package javasabr.rlib.network.server; + +import java.net.InetSocketAddress; +import java.util.function.Consumer; +import javasabr.rlib.network.Connection; +import javasabr.rlib.network.Network; +import org.jetbrains.annotations.NotNull; +import reactor.core.publisher.Flux; + +/** + * The interface to implement a server network. + * + * @author JavaSaBr + */ +public interface ServerNetwork> extends Network { + + /** + * Start a server using any available address. + * + * @return this server's address. + */ + @NotNull InetSocketAddress start(); + + /** + * Start a server by the address. + * + * @param serverAddress the sever address. + * @param the server network's type. + * @return this network. + */ + > @NotNull S start(@NotNull InetSocketAddress serverAddress); + + /** + * Register a consumer of new connections. + * + * @param consumer the consumer of new connections. + */ + void onAccept(@NotNull Consumer consumer); + + /** + * Get a stream of new accepted connections. + * + * @return the stream of new accepted connections. + */ + @NotNull Flux accepted(); +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/server/impl/DefaultServerNetwork.java b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java similarity index 84% rename from rlib-network/src/main/java/com/ss/rlib/network/server/impl/DefaultServerNetwork.java rename to rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java index 34b0fa38..b22d0bd1 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/server/impl/DefaultServerNetwork.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/server/impl/DefaultServerNetwork.java @@ -1,188 +1,194 @@ -package com.ss.rlib.network.server.impl; - -import static com.ss.rlib.common.util.Utils.uncheckedGet; -import com.ss.rlib.common.concurrent.GroupThreadFactory; -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.Utils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.ServerNetworkConfig; -import com.ss.rlib.network.UnsafeConnection; -import com.ss.rlib.network.impl.AbstractNetwork; -import com.ss.rlib.network.server.ServerNetwork; -import com.ss.rlib.network.util.NetworkUtils; -import org.jetbrains.annotations.NotNull; -import reactor.core.publisher.Flux; -import reactor.core.publisher.FluxSink; - -import java.io.IOException; -import java.net.InetSocketAddress; -import java.nio.channels.*; -import java.util.concurrent.Executors; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.function.BiFunction; -import java.util.function.Consumer; - -/** - * The base implementation of {@link ServerNetwork}. - * - * @author JavaSaBr - */ -public final class DefaultServerNetwork> extends AbstractNetwork implements - ServerNetwork { - - protected static final Logger LOGGER = LoggerManager.getLogger(DefaultServerNetwork.class); - - private interface ServerCompletionHandler> extends - CompletionHandler> {} - - private final ServerCompletionHandler acceptHandler = new ServerCompletionHandler<>() { - - @Override - public void completed(@NotNull AsynchronousSocketChannel channel, @NotNull DefaultServerNetwork network) { - var connection = network.channelToConnection.apply(DefaultServerNetwork.this, channel); - LOGGER.debug(connection, conn -> "Accepted new connection: " + conn.getRemoteAddress()); - network.onAccept(connection); - network.acceptNext(); - } - - @Override - public void failed(@NotNull Throwable exc, @NotNull DefaultServerNetwork network) { - if (exc instanceof AsynchronousCloseException) { - LOGGER.warning("Server network was closed"); - } else { - LOGGER.error("Got exception during accepting new connection:"); - LOGGER.error(exc); - - if (channel.isOpen()) { - network.acceptNext(); - } - } - } - }; - - protected final AsynchronousChannelGroup group; - protected final AsynchronousServerSocketChannel channel; - protected final Array> subscribers; - - public DefaultServerNetwork( - @NotNull ServerNetworkConfig config, - @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection - ) { - - super(config, channelToConnection); - - var threadFactory = new GroupThreadFactory( - config.getThreadGroupName(), - config.getThreadConstructor(), - config.getThreadPriority(), - false - ); - - var executor = config.getThreadGroupMinSize() < config.getThreadGroupMaxSize() ? new ThreadPoolExecutor( - config.getThreadGroupMinSize(), - config.getThreadGroupMaxSize(), - 120, - TimeUnit.SECONDS, - new SynchronousQueue<>(), - threadFactory, - new ThreadPoolExecutor.CallerRunsPolicy() - ) : Executors.newFixedThreadPool(config.getThreadGroupMinSize(), threadFactory); - - // activate the executor - executor.submit(() -> {}); - - LOGGER.info(config, conf -> "Server network configuration: {\n" + - " minThreads: " + conf.getThreadGroupMinSize() + ",\n" + - " maxThreads: " + conf.getThreadGroupMaxSize() + ",\n" + - " priority: " + conf.getThreadPriority() + ",\n" + - " groupName: \"" + conf.getThreadGroupName() + "\",\n" + - " readBufferSize: " + conf.getReadBufferSize() + ",\n" + - " pendingBufferSize: " + conf.getPendingBufferSize() + ",\n" + - " writeBufferSize: " + conf.getWriteBufferSize() + "\n" + - "}"); - - this.group = uncheckedGet(executor, AsynchronousChannelGroup::withThreadPool); - this.channel = uncheckedGet(group, AsynchronousServerSocketChannel::open); - this.subscribers = ArrayFactory.newCopyOnModifyArray(Consumer.class); - } - - @Override - public @NotNull InetSocketAddress start() { - - InetSocketAddress address = null; - - while (address == null) { - - address = new InetSocketAddress(NetworkUtils.getAvailablePort(1500)); - try { - channel.bind(address); - } catch (IOException e) { - address = null; - } - } - - LOGGER.info(address, adr -> "Started server socket on address: " + adr); - - if (!subscribers.isEmpty()) { - acceptNext(); - } - - return address; - } - - @Override - public > @NotNull S start(@NotNull InetSocketAddress serverAddress) { - Utils.unchecked(channel, serverAddress, AsynchronousServerSocketChannel::bind); - - LOGGER.info(serverAddress, addr -> "Started server socket on address: " + addr); - - if (!subscribers.isEmpty()) { - acceptNext(); - } - - return ClassUtils.unsafeNNCast(this); - } - - protected void acceptNext() { - if (channel.isOpen()) { - try { channel.accept(this, acceptHandler); } - catch (AcceptPendingException ignored) {} - } else { - LOGGER.warning("Cannot accept a next connection because server channel is already closed"); - } - } - - protected void onAccept(@NotNull C connection) { - connection.onConnected(); - subscribers.forEachR(connection, Consumer::accept); - } - - @Override - public void onAccept(@NotNull Consumer consumer) { - subscribers.add(consumer); - acceptNext(); - } - - @Override - public @NotNull Flux accepted() { - return Flux.create(this::registerFluxOnAccepted); - } - - protected void registerFluxOnAccepted(@NotNull FluxSink sink) { - Consumer listener = sink::next; - onAccept(listener); - sink.onDispose(() -> subscribers.remove(listener)); - } - - @Override - public void shutdown() { - Utils.unchecked(channel, AsynchronousChannel::close); - group.shutdown(); - } -} +package javasabr.rlib.network.server.impl; + +import static javasabr.rlib.common.util.Utils.uncheckedGet; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.nio.channels.AcceptPendingException; +import java.nio.channels.AsynchronousChannel; +import java.nio.channels.AsynchronousChannelGroup; +import java.nio.channels.AsynchronousCloseException; +import java.nio.channels.AsynchronousServerSocketChannel; +import java.nio.channels.AsynchronousSocketChannel; +import java.nio.channels.CompletionHandler; +import java.util.concurrent.Executors; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.function.BiFunction; +import java.util.function.Consumer; +import javasabr.rlib.common.concurrent.GroupThreadFactory; +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.Utils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.Network; +import javasabr.rlib.network.ServerNetworkConfig; +import javasabr.rlib.network.UnsafeConnection; +import javasabr.rlib.network.impl.AbstractNetwork; +import javasabr.rlib.network.server.ServerNetwork; +import javasabr.rlib.network.util.NetworkUtils; +import org.jetbrains.annotations.NotNull; +import reactor.core.publisher.Flux; +import reactor.core.publisher.FluxSink; + +/** + * The base implementation of {@link ServerNetwork}. + * + * @author JavaSaBr + */ +public final class DefaultServerNetwork> extends AbstractNetwork implements + ServerNetwork { + + protected static final Logger LOGGER = LoggerManager.getLogger(DefaultServerNetwork.class); + + private interface ServerCompletionHandler> extends + CompletionHandler> {} + + private final ServerCompletionHandler acceptHandler = new ServerCompletionHandler<>() { + + @Override + public void completed(@NotNull AsynchronousSocketChannel channel, @NotNull DefaultServerNetwork network) { + var connection = network.channelToConnection.apply(DefaultServerNetwork.this, channel); + LOGGER.debug(connection, conn -> "Accepted new connection: " + conn.getRemoteAddress()); + network.onAccept(connection); + network.acceptNext(); + } + + @Override + public void failed(@NotNull Throwable exc, @NotNull DefaultServerNetwork network) { + if (exc instanceof AsynchronousCloseException) { + LOGGER.warning("Server network was closed"); + } else { + LOGGER.error("Got exception during accepting new connection:"); + LOGGER.error(exc); + + if (channel.isOpen()) { + network.acceptNext(); + } + } + } + }; + + protected final AsynchronousChannelGroup group; + protected final AsynchronousServerSocketChannel channel; + protected final Array> subscribers; + + public DefaultServerNetwork( + @NotNull ServerNetworkConfig config, + @NotNull BiFunction, AsynchronousSocketChannel, C> channelToConnection + ) { + + super(config, channelToConnection); + + var threadFactory = new GroupThreadFactory( + config.getThreadGroupName(), + config.getThreadConstructor(), + config.getThreadPriority(), + false + ); + + var executor = config.getThreadGroupMinSize() < config.getThreadGroupMaxSize() ? new ThreadPoolExecutor( + config.getThreadGroupMinSize(), + config.getThreadGroupMaxSize(), + 120, + TimeUnit.SECONDS, + new SynchronousQueue<>(), + threadFactory, + new ThreadPoolExecutor.CallerRunsPolicy() + ) : Executors.newFixedThreadPool(config.getThreadGroupMinSize(), threadFactory); + + // activate the executor + executor.submit(() -> {}); + + LOGGER.info(config, conf -> "Server network configuration: {\n" + + " minThreads: " + conf.getThreadGroupMinSize() + ",\n" + + " maxThreads: " + conf.getThreadGroupMaxSize() + ",\n" + + " priority: " + conf.getThreadPriority() + ",\n" + + " groupName: \"" + conf.getThreadGroupName() + "\",\n" + + " readBufferSize: " + conf.getReadBufferSize() + ",\n" + + " pendingBufferSize: " + conf.getPendingBufferSize() + ",\n" + + " writeBufferSize: " + conf.getWriteBufferSize() + "\n" + + "}"); + + this.group = uncheckedGet(executor, AsynchronousChannelGroup::withThreadPool); + this.channel = uncheckedGet(group, AsynchronousServerSocketChannel::open); + this.subscribers = ArrayFactory.newCopyOnModifyArray(Consumer.class); + } + + @Override + public @NotNull InetSocketAddress start() { + + InetSocketAddress address = null; + + while (address == null) { + + address = new InetSocketAddress(NetworkUtils.getAvailablePort(1500)); + try { + channel.bind(address); + } catch (IOException e) { + address = null; + } + } + + LOGGER.info(address, adr -> "Started server socket on address: " + adr); + + if (!subscribers.isEmpty()) { + acceptNext(); + } + + return address; + } + + @Override + public > @NotNull S start(@NotNull InetSocketAddress serverAddress) { + Utils.unchecked(channel, serverAddress, AsynchronousServerSocketChannel::bind); + + LOGGER.info(serverAddress, addr -> "Started server socket on address: " + addr); + + if (!subscribers.isEmpty()) { + acceptNext(); + } + + return ClassUtils.unsafeNNCast(this); + } + + protected void acceptNext() { + if (channel.isOpen()) { + try { channel.accept(this, acceptHandler); } + catch (AcceptPendingException ignored) {} + } else { + LOGGER.warning("Cannot accept a next connection because server channel is already closed"); + } + } + + protected void onAccept(@NotNull C connection) { + connection.onConnected(); + subscribers.forEachR(connection, Consumer::accept); + } + + @Override + public void onAccept(@NotNull Consumer consumer) { + subscribers.add(consumer); + acceptNext(); + } + + @Override + public @NotNull Flux accepted() { + return Flux.create(this::registerFluxOnAccepted); + } + + protected void registerFluxOnAccepted(@NotNull FluxSink sink) { + Consumer listener = sink::next; + onAccept(listener); + sink.onDispose(() -> subscribers.remove(listener)); + } + + @Override + public void shutdown() { + Utils.unchecked(channel, AsynchronousChannel::close); + group.shutdown(); + } +} diff --git a/rlib-network/src/main/java/com/ss/rlib/network/util/NetworkUtils.java b/rlib-network/src/main/java/javasabr/rlib/network/util/NetworkUtils.java similarity index 95% rename from rlib-network/src/main/java/com/ss/rlib/network/util/NetworkUtils.java rename to rlib-network/src/main/java/javasabr/rlib/network/util/NetworkUtils.java index be4b4b97..48f43acd 100644 --- a/rlib-network/src/main/java/com/ss/rlib/network/util/NetworkUtils.java +++ b/rlib-network/src/main/java/javasabr/rlib/network/util/NetworkUtils.java @@ -1,12 +1,5 @@ -package com.ss.rlib.network.util; +package javasabr.rlib.network.util; -import com.ss.rlib.common.util.Utils; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.network.BufferAllocator; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.net.ssl.*; import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; @@ -18,6 +11,18 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; import java.util.stream.IntStream; +import javasabr.rlib.common.util.Utils; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.network.BufferAllocator; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLEngineResult; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author JavaSaBr diff --git a/rlib-network/src/test/java/com/ss/rlib/network/test/BaseNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java similarity index 93% rename from rlib-network/src/test/java/com/ss/rlib/network/test/BaseNetworkTest.java rename to rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java index f925f918..2cb1afce 100644 --- a/rlib-network/src/test/java/com/ss/rlib/network/test/BaseNetworkTest.java +++ b/rlib-network/src/test/java/javasabr/rlib/network/BaseNetworkTest.java @@ -1,19 +1,17 @@ -package com.ss.rlib.network.test; - -import com.ss.rlib.network.*; -import com.ss.rlib.network.client.ClientNetwork; -import com.ss.rlib.network.impl.DefaultBufferAllocator; -import com.ss.rlib.network.impl.DefaultConnection; -import com.ss.rlib.network.impl.StringDataConnection; -import com.ss.rlib.network.impl.StringDataSSLConnection; -import com.ss.rlib.network.packet.impl.DefaultReadablePacket; -import com.ss.rlib.network.packet.registry.ReadablePacketRegistry; -import com.ss.rlib.network.server.ServerNetwork; -import lombok.AllArgsConstructor; -import org.jetbrains.annotations.NotNull; +package javasabr.rlib.network; -import javax.net.ssl.SSLContext; import java.util.concurrent.CompletableFuture; +import javasabr.rlib.network.client.ClientNetwork; +import javasabr.rlib.network.impl.DefaultBufferAllocator; +import javasabr.rlib.network.impl.DefaultConnection; +import javasabr.rlib.network.impl.StringDataConnection; +import javasabr.rlib.network.impl.StringDataSSLConnection; +import javasabr.rlib.network.packet.impl.DefaultReadablePacket; +import javasabr.rlib.network.packet.registry.ReadablePacketRegistry; +import javasabr.rlib.network.server.ServerNetwork; +import javax.net.ssl.SSLContext; +import lombok.AllArgsConstructor; +import org.jetbrains.annotations.NotNull; /** * @author JavaSaBr diff --git a/rlib-network/src/test/java/com/ss/rlib/network/test/DefaultNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java similarity index 90% rename from rlib-network/src/test/java/com/ss/rlib/network/test/DefaultNetworkTest.java rename to rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java index 711e4963..765d4403 100644 --- a/rlib-network/src/test/java/com/ss/rlib/network/test/DefaultNetworkTest.java +++ b/rlib-network/src/test/java/javasabr/rlib/network/DefaultNetworkTest.java @@ -1,21 +1,29 @@ -package com.ss.rlib.network.test; +package javasabr.rlib.network; -import static com.ss.rlib.network.NetworkFactory.*; -import static com.ss.rlib.network.ServerNetworkConfig.DEFAULT_SERVER; import static java.util.stream.Collectors.toList; -import com.ss.rlib.common.util.ObjectUtils; -import com.ss.rlib.common.util.StringUtils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.NetworkConfig; -import com.ss.rlib.network.annotation.PacketDescription; -import com.ss.rlib.network.impl.DefaultBufferAllocator; -import com.ss.rlib.network.impl.DefaultConnection; -import com.ss.rlib.network.packet.impl.DefaultReadablePacket; -import com.ss.rlib.network.packet.impl.DefaultWritablePacket; -import com.ss.rlib.network.packet.impl.StringWritablePacket; -import com.ss.rlib.network.packet.registry.ReadablePacketRegistry; +import static javasabr.rlib.network.NetworkFactory.newDefaultClientNetwork; +import static javasabr.rlib.network.NetworkFactory.newDefaultServerNetwork; +import static javasabr.rlib.network.ServerNetworkConfig.DEFAULT_SERVER; + +import java.nio.ByteBuffer; +import java.time.Duration; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; +import javasabr.rlib.common.util.ObjectUtils; +import javasabr.rlib.common.util.StringUtils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.annotation.PacketDescription; +import javasabr.rlib.network.impl.DefaultBufferAllocator; +import javasabr.rlib.network.impl.DefaultConnection; +import javasabr.rlib.network.packet.impl.DefaultReadablePacket; +import javasabr.rlib.network.packet.impl.DefaultWritablePacket; +import javasabr.rlib.network.packet.registry.ReadablePacketRegistry; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -24,13 +32,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.nio.ByteBuffer; -import java.time.*; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.TimeUnit; -import java.util.stream.IntStream; - /** * The tests of default network. * diff --git a/rlib-network/src/test/java/com/ss/rlib/network/test/IdBasedReadablePacketRegistryTest.java b/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadablePacketRegistryTest.java similarity index 87% rename from rlib-network/src/test/java/com/ss/rlib/network/test/IdBasedReadablePacketRegistryTest.java rename to rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadablePacketRegistryTest.java index 06c6950e..70aa3d4b 100644 --- a/rlib-network/src/test/java/com/ss/rlib/network/test/IdBasedReadablePacketRegistryTest.java +++ b/rlib-network/src/test/java/javasabr/rlib/network/IdBasedReadablePacketRegistryTest.java @@ -1,14 +1,14 @@ -package com.ss.rlib.network.test; - -import com.ss.rlib.common.util.ClassUtils; -import com.ss.rlib.common.util.array.Array; -import com.ss.rlib.common.util.array.ArrayFactory; -import com.ss.rlib.network.annotation.PacketDescription; -import com.ss.rlib.network.impl.DefaultConnection; -import com.ss.rlib.network.packet.IdBasedReadablePacket; -import com.ss.rlib.network.packet.impl.AbstractIdBasedReadablePacket; -import com.ss.rlib.network.packet.impl.DefaultReadablePacket; -import com.ss.rlib.network.packet.registry.impl.IdBasedReadablePacketRegistry; +package javasabr.rlib.network; + +import javasabr.rlib.common.util.ClassUtils; +import javasabr.rlib.common.util.array.Array; +import javasabr.rlib.common.util.array.ArrayFactory; +import javasabr.rlib.network.annotation.PacketDescription; +import javasabr.rlib.network.impl.DefaultConnection; +import javasabr.rlib.network.packet.IdBasedReadablePacket; +import javasabr.rlib.network.packet.impl.AbstractIdBasedReadablePacket; +import javasabr.rlib.network.packet.impl.DefaultReadablePacket; +import javasabr.rlib.network.packet.registry.impl.IdBasedReadablePacketRegistry; import lombok.NoArgsConstructor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/rlib-network/src/test/java/com/ss/rlib/network/test/StringNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java similarity index 93% rename from rlib-network/src/test/java/com/ss/rlib/network/test/StringNetworkTest.java rename to rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java index 797af6ce..15ad4277 100644 --- a/rlib-network/src/test/java/com/ss/rlib/network/test/StringNetworkTest.java +++ b/rlib-network/src/test/java/javasabr/rlib/network/StringNetworkTest.java @@ -1,30 +1,9 @@ -package com.ss.rlib.network.test; +package javasabr.rlib.network; -import static com.ss.rlib.network.NetworkFactory.newStringDataClientNetwork; -import static com.ss.rlib.network.NetworkFactory.newStringDataServerNetwork; -import static com.ss.rlib.network.ServerNetworkConfig.DEFAULT_SERVER; import static java.util.stream.Collectors.toList; -import com.ss.rlib.common.concurrent.atomic.AtomicInteger; -import com.ss.rlib.common.util.ObjectUtils; -import com.ss.rlib.common.util.StringUtils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerLevel; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.Network; -import com.ss.rlib.network.NetworkConfig; -import com.ss.rlib.network.ServerNetworkConfig.SimpleServerNetworkConfig; -import com.ss.rlib.network.client.ClientNetwork; -import com.ss.rlib.network.impl.DefaultBufferAllocator; -import com.ss.rlib.network.impl.ReuseBufferAllocator; -import com.ss.rlib.network.packet.impl.AbstractPacketWriter; -import com.ss.rlib.network.packet.impl.StringReadablePacket; -import com.ss.rlib.network.packet.impl.StringWritablePacket; -import lombok.SneakyThrows; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import reactor.core.publisher.Flux; +import static javasabr.rlib.network.NetworkFactory.newStringDataClientNetwork; +import static javasabr.rlib.network.NetworkFactory.newStringDataServerNetwork; +import static javasabr.rlib.network.ServerNetworkConfig.DEFAULT_SERVER; import java.nio.ByteBuffer; import java.time.Duration; @@ -34,6 +13,20 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; +import javasabr.rlib.common.concurrent.atomic.AtomicInteger; +import javasabr.rlib.common.util.ObjectUtils; +import javasabr.rlib.common.util.StringUtils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.ServerNetworkConfig.SimpleServerNetworkConfig; +import javasabr.rlib.network.client.ClientNetwork; +import javasabr.rlib.network.impl.DefaultBufferAllocator; +import javasabr.rlib.network.packet.impl.StringWritablePacket; +import lombok.SneakyThrows; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; /** * The tests of string based network. diff --git a/rlib-network/src/test/java/com/ss/rlib/network/test/StringSSLNetworkTest.java b/rlib-network/src/test/java/javasabr/rlib/network/StringSSLNetworkTest.java similarity index 93% rename from rlib-network/src/test/java/com/ss/rlib/network/test/StringSSLNetworkTest.java rename to rlib-network/src/test/java/javasabr/rlib/network/StringSSLNetworkTest.java index 354b2aac..4aba06dc 100644 --- a/rlib-network/src/test/java/com/ss/rlib/network/test/StringSSLNetworkTest.java +++ b/rlib-network/src/test/java/javasabr/rlib/network/StringSSLNetworkTest.java @@ -1,31 +1,11 @@ -package com.ss.rlib.network.test; +package javasabr.rlib.network; -import static com.ss.rlib.network.NetworkFactory.*; import static java.util.stream.Collectors.toList; -import com.ss.rlib.common.util.ObjectUtils; -import com.ss.rlib.common.util.StringUtils; -import com.ss.rlib.common.util.Utils; -import com.ss.rlib.logger.api.Logger; -import com.ss.rlib.logger.api.LoggerLevel; -import com.ss.rlib.logger.api.LoggerManager; -import com.ss.rlib.network.Connection; -import com.ss.rlib.network.NetworkConfig; -import com.ss.rlib.network.ServerNetworkConfig; -import com.ss.rlib.network.impl.DefaultBufferAllocator; -import com.ss.rlib.network.packet.impl.*; -import com.ss.rlib.network.util.NetworkUtils; -import lombok.SneakyThrows; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import static javasabr.rlib.network.NetworkFactory.newStringDataSSLClientNetwork; +import static javasabr.rlib.network.NetworkFactory.newStringDataSSLServerNetwork; -import javax.net.ssl.*; -import java.io.InputStream; -import java.io.OutputStream; import java.io.PrintWriter; import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Scanner; @@ -33,6 +13,23 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; +import javasabr.rlib.common.util.ObjectUtils; +import javasabr.rlib.common.util.StringUtils; +import javasabr.rlib.common.util.Utils; +import javasabr.rlib.logger.api.Logger; +import javasabr.rlib.logger.api.LoggerLevel; +import javasabr.rlib.logger.api.LoggerManager; +import javasabr.rlib.network.impl.DefaultBufferAllocator; +import javasabr.rlib.network.packet.impl.AbstractSSLPacketReader; +import javasabr.rlib.network.packet.impl.AbstractSSLPacketWriter; +import javasabr.rlib.network.packet.impl.StringReadablePacket; +import javasabr.rlib.network.packet.impl.StringWritablePacket; +import javasabr.rlib.network.util.NetworkUtils; +import javax.net.ssl.SSLSocket; +import lombok.SneakyThrows; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * The tests of string based network. diff --git a/rlib-testcontainers/src/main/java/com/ss/rlib/testcontainers/FakeSMTPTestContainer.java b/rlib-testcontainers/src/main/java/javasabr/rlib/testcontainers/FakeSMTPTestContainer.java similarity index 98% rename from rlib-testcontainers/src/main/java/com/ss/rlib/testcontainers/FakeSMTPTestContainer.java rename to rlib-testcontainers/src/main/java/javasabr/rlib/testcontainers/FakeSMTPTestContainer.java index 7db62bd4..aad222bd 100644 --- a/rlib-testcontainers/src/main/java/com/ss/rlib/testcontainers/FakeSMTPTestContainer.java +++ b/rlib-testcontainers/src/main/java/javasabr/rlib/testcontainers/FakeSMTPTestContainer.java @@ -1,8 +1,4 @@ -package com.ss.rlib.testcontainers; - -import lombok.Getter; -import org.jetbrains.annotations.NotNull; -import org.testcontainers.containers.GenericContainer; +package javasabr.rlib.testcontainers; import java.io.IOException; import java.net.URI; @@ -10,6 +6,9 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse.BodySubscribers; import java.nio.charset.StandardCharsets; +import lombok.Getter; +import org.jetbrains.annotations.NotNull; +import org.testcontainers.containers.GenericContainer; public class FakeSMTPTestContainer extends GenericContainer { diff --git a/rlib-testcontainers/src/test/java/com/ss/rlib/testcontainers/test/FakeSMTPTestContainerTest.java b/rlib-testcontainers/src/test/java/javasabr/rlib/testcontainers/FakeSMTPTestContainerTest.java similarity index 88% rename from rlib-testcontainers/src/test/java/com/ss/rlib/testcontainers/test/FakeSMTPTestContainerTest.java rename to rlib-testcontainers/src/test/java/javasabr/rlib/testcontainers/FakeSMTPTestContainerTest.java index 6093dcf0..17df6cb0 100644 --- a/rlib-testcontainers/src/test/java/com/ss/rlib/testcontainers/test/FakeSMTPTestContainerTest.java +++ b/rlib-testcontainers/src/test/java/javasabr/rlib/testcontainers/FakeSMTPTestContainerTest.java @@ -1,8 +1,7 @@ -package com.ss.rlib.testcontainers.test; +package javasabr.rlib.testcontainers; -import com.ss.rlib.mail.sender.MailSenderConfig; -import com.ss.rlib.mail.sender.impl.JavaxMailSender; -import com.ss.rlib.testcontainers.FakeSMTPTestContainer; +import javasabr.rlib.mail.sender.MailSenderConfig; +import javasabr.rlib.mail.sender.impl.JavaxMailSender; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll;