Finish 9.2.0

Author: JavaSaBr

README.md

@@ -16,11 +16,11 @@ repositories {
 }
 
 dependencies {
-    compile 'com.spaceshift:rlib.common:9.1.0'
-    compile 'com.spaceshift:rlib.fx:9.1.0'
-    compile 'com.spaceshift:rlib.network:9.1.0'
-    compile 'com.spaceshift:rlib.mail:9.1.0'
-    compile 'com.spaceshift:rlib.testcontainers:9.1.0'
+    compile 'com.spaceshift:rlib.common:9.2.0'
+    compile 'com.spaceshift:rlib.fx:9.2.0'
+    compile 'com.spaceshift:rlib.network:9.2.0'
+    compile 'com.spaceshift:rlib.mail:9.2.0'
+    compile 'com.spaceshift:rlib.testcontainers:9.2.0'
 }
 ```
 
@@ -41,27 +41,27 @@ dependencies {
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.common</artifactId>
-    <version>9.1.0</version>
+    <version>9.2.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.fx</artifactId>
-    <version>9.1.2</version>
+    <version>9.2.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.network</artifactId>
-    <version>9.1.0</version>
+    <version>9.2.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.mail</artifactId>
-    <version>9.1.0</version>
+    <version>9.2.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.testcontainers</artifactId>
-    <version>9.1.0</version>
+    <version>9.2.0</version>
 </dependency>
 
 ```
@@ -368,4 +368,4 @@ dependencies {
 
     var server = clientNetwork.getCurrentServer();
     server.sendPacket(new ClientPackets.MessageRequest("Test client message"));
-```
+```

build.gradle

@@ -4,11 +4,11 @@ buildscript {
     }
     dependencies {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'net.ltgt.gradle:gradle-apt-plugin:0.19'
+        classpath 'net.ltgt.gradle:gradle-apt-plugin:0.21'
     }
 }
 
-rootProject.version = '9.1.0'
+rootProject.version = '9.2.0'
 group = 'com.spaceshift'
 
 allprojects {
@@ -26,12 +26,13 @@ allprojects {
     targetCompatibility = JavaVersion.VERSION_11
 
     ext {
+        projectreactorVersion = '3.2.9.RELEASE'
         sl4jVersion = '1.7.26'
         javaxMailVersion = "1.5.0-b01"
         testcontainersVersion = '1.11.1'
-        lombokVersion = '1.18.4'
-        junitJupiterVersion = "5.2.0"
-        jetbrainsAnnotation = '16.0.3'
+        lombokVersion = '1.18.6'
+        junitJupiterVersion = "5.4.2"
+        jetbrainsAnnotation = '17.0.0'
         bintrayVersion = version
     }
 
@@ -41,24 +42,18 @@ allprojects {
 
     test {
         useJUnitPlatform()
-
-        testLogging {
-            events "passed", "skipped", "failed"
-        }
-
-        reports {
-            html.enabled = true
-        }
     }
 
     dependencies {
         compileOnly "org.jetbrains:annotations:$jetbrainsAnnotation"
+        compileOnly "org.projectlombok:lombok:$lombokVersion"
+        annotationProcessor "org.projectlombok:lombok:$lombokVersion"
+    
         testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
+        testCompileOnly "org.projectlombok:lombok:$lombokVersion"
         testCompileOnly "org.jetbrains:annotations:$jetbrainsAnnotation"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
-        compileOnly "org.projectlombok:lombok:$lombokVersion"
-        testCompileOnly "org.projectlombok:lombok:$lombokVersion"
-        annotationProcessor "org.projectlombok:lombok:$lombokVersion"
+        testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
     }
 
     /*compileJava {
@@ -144,6 +139,6 @@ allprojects {
 }
 
 wrapper {
-    gradleVersion = '5.3.1'
+    gradleVersion = '5.4.1'
     distributionType = Wrapper.DistributionType.ALL
-}
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -438,7 +438,7 @@ public void scan(@Nullable Predicate<String> filter) {
                 continue;
             }
 
-            LOGGER.debug(this, file, toScan -> "scan " + toScan);
+            LOGGER.debug(file, toScan -> "scan " + toScan);
 
             String filename = file.getFileName().toString();
 
@@ -452,7 +452,7 @@ public void scan(@Nullable Predicate<String> filter) {
         this.classes = classes.toArray(new Class[classes.size()]);
         this.resources = resources.toArray(new String[resources.size()]);
 
-        LOGGER.debug(this, getClasses(), getResources(),
+        LOGGER.debug(getClasses(), getResources(),
                 (cses, rses) -> "scanned for " + cses.length + " classes and " + rses.length + " resources.");
     }
 

gradlew

@@ -56,7 +56,7 @@ public ManifestClassPathScannerImpl(@NotNull final ClassLoader classLoader, @Not
 
         final Thread currentThread = Thread.currentThread();
         final ClassLoader loader = currentThread.getContextClassLoader();
-        final Enumeration<URL> urls = Utils.get(loader, first -> first.getResources(JarFile.MANIFEST_NAME));
+        final Enumeration<URL> urls = Utils.uncheckedGet(loader, first -> first.getResources(JarFile.MANIFEST_NAME));
 
         while (urls.hasMoreElements()) {
 

gradlew.bat

@@ -5,6 +5,7 @@
 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;
 
 /**
  * The implementation of a class loader of compiled classes.
@@ -28,19 +29,20 @@ public CompileClassLoader() {
      *
      * @param byteCode the byte code
      */
-    public void addByteCode(@NotNull final ByteCode byteCode) {
+    public synchronized void addByteCode(@NotNull ByteCode byteCode) {
         this.byteCode.add(byteCode);
     }
 
     @Override
-    protected Class<?> findClass(@NotNull final String name) {
-
-        synchronized (byteCode) {
-            if (byteCode.isEmpty()) return null;
-            for (final ByteCode byteCode : this.byteCode) {
-                final byte[] content = byteCode.getByteCode();
-                return Utils.get(() -> defineClass(name, content, 0, content.length));
-            }
+    protected synchronized @Nullable Class<?> findClass(@NotNull String name) {
+
+        if (byteCode.isEmpty()) {
+            return null;
+        }
+
+        for (var byteCode : this.byteCode) {
+            var content = byteCode.getByteCode();
+            return Utils.uncheckedGet(() -> defineClass(name, content, 0, content.length));
         }
 
         return null;

rlib-common/src/main/java/com/ss/rlib/common/classpath/impl/ClassPathScannerImpl.java

@@ -1,22 +1,10 @@
 package com.ss.rlib.common.function;
 
-import org.jetbrains.annotations.Nullable;
-
 /**
- * THe function.
- *
- * @param <T> the type parameter
  * @author JavaSaBr
  */
 @FunctionalInterface
 public interface ObjectIntPredicate<T> {
 
-    /**
-     * Test boolean.
-     *
-     * @param fisrt  the fisrt
-     * @param second the second
-     * @return the boolean
-     */
-    boolean test(@Nullable T fisrt, int second);
+    boolean test(T first, int second);
 }