Finish 9.6.0

Author: JavaSaBr

README.md

@@ -16,11 +16,11 @@ repositories {
 }
 
 dependencies {
-    compile 'com.spaceshift:rlib.common:9.5.0'
-    compile 'com.spaceshift:rlib.fx:9.5.0'
-    compile 'com.spaceshift:rlib.network:9.5.0'
-    compile 'com.spaceshift:rlib.mail:9.5.0'
-    compile 'com.spaceshift:rlib.testcontainers:9.5.0'
+    compile 'com.spaceshift:rlib.common:9.6.0'
+    compile 'com.spaceshift:rlib.fx:9.6.0'
+    compile 'com.spaceshift:rlib.network:9.6.0'
+    compile 'com.spaceshift:rlib.mail:9.6.0'
+    compile 'com.spaceshift:rlib.testcontainers:9.6.0'
 }
 ```
 
@@ -41,27 +41,27 @@ dependencies {
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.common</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.fx</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.network</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.mail</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
 </dependency>
 <dependency>
     <groupId>com.spaceshift</groupId>
     <artifactId>rlib.testcontainers</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
 </dependency>
 
 ```

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 }
 
-rootProject.version = '9.5.0'
+rootProject.version = '9.6.0'
 group = 'com.spaceshift'
 
 allprojects {

rlib-common/src/main/java/com/ss/rlib/common/function/BiIntPredicate.java

@@ -0,0 +1,10 @@
+package com.ss.rlib.common.function;
+
+/**
+ * @author JavaSaBr
+ */
+@FunctionalInterface
+public interface BiIntPredicate {
+
+    boolean test(int first, int second);
+}

rlib-common/src/main/java/com/ss/rlib/common/function/NotNullFunctionInt.java

@@ -0,0 +1,9 @@
+package com.ss.rlib.common.function;
+
+import org.jetbrains.annotations.NotNull;
+
+@FunctionalInterface
+public interface NotNullFunctionInt<T> extends FunctionInt<T> {
+
+    int apply(@NotNull T object);
+}

rlib-common/src/main/java/com/ss/rlib/common/util/array/Array.java

@@ -15,7 +15,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 /**
@@ -56,7 +55,7 @@ public interface Array<E> extends Collection<E>, Serializable, Reusable, Cloneab
      * @return the new read only array.
      */
     static <T> @NotNull ReadOnlyArray<T> of(@NotNull Array<T> another) {
-        return ArrayFactory.newReadOnlyArray(ArrayUtils.copyOf(another.array(), 0, another.size()));
+        return ArrayFactory.newReadOnlyArray(Arrays.copyOf(another.array(), another.size()));
     }
 
     /**
@@ -125,6 +124,15 @@ public interface Array<E> extends Collection<E>, Serializable, Reusable, Cloneab
         return ArrayFactory::newConcurrentStampedLockArray;
     }
 
+    /**
+     * Copy all elements from this array to a target array.
+     *
+     * @param target the target array.
+     */
+    default void copyTo(@NotNull Array<? super E> target) {
+        target.addAll(this);
+    }
+
     /**
      * Adds all elements from the array to this array.
      *
@@ -419,8 +427,7 @@ default int lastIndexOf(@NotNull Object object) {
     }
 
     /**
-     * Removes all of this target's elements that are also contained in the specified array (optional operation).  After
-     * this call returns, this array will contain no elements in common with the specified array.
+     * Removes all of this target's elements that are also contained in the specified array (optional operation).
      *
      * @param target array containing elements to be removed from this array.
      * @return true if this array changed as a result of the call.
@@ -433,15 +440,48 @@ default boolean removeAll(@NotNull Array<?> target) {
 
         int count = 0;
 
-        for (Object element : target.array()) {
+        for (var element : target.array()) {
             if (element == null) {
                 break;
             } else if (slowRemove(element)) {
                 count++;
             }
         }
 
-        return count == target.size();
+        return count > 0;
+    }
+
+    /**
+     * Removes all of this target's elements that are also contained in the specified array (optional operation)
+     * with reordering.
+     *
+     * @param target array containing elements to be removed from this array.
+     * @return true if this array changed as a result of the call.
+     */
+    default boolean fastRemoveAll(@NotNull Array<?> target) {
+
+        if (target.isEmpty()) {
+            return false;
+        }
+
+        var count = 0;
+        var array = array();
+
+        for (int i = 0, length = size(); i < length; i++) {
+
+            var element = array[i];
+
+            if (!target.contains(element)) {
+                continue;
+            }
+
+            fastRemove(i);
+            i--;
+            length--;
+            count++;
+        }
+
+        return count > 0;
     }
 
     @Override
@@ -723,6 +763,41 @@ default <A, B> boolean removeIf(
         return removed > 0;
     }
 
+    /**
+     * Removes all of the elements of this collection that satisfy the given predicate.
+     *
+     * @param argument  the additional argument.
+     * @param converter the converter of the elements.
+     * @param filter    the predicate which returns {@code true} for elements to be removed.
+     * @param <A>       the argument's type.
+     * @param <B>       the element converted type.
+     * @return {@code true} if any elements were removed.
+     * @since 9.6.0
+     */
+    default <A, B> boolean removeConvertedIf(
+        @NotNull A argument,
+        @NotNull NotNullFunction<? super E, B> converter,
+        @NotNull NotNullBiPredicate<A, B> filter
+    ) {
+
+        var array = array();
+        var removed = 0;
+
+        for (int i = 0, length = size(); i < length; i++) {
+
+            var element = array[i];
+
+            if (filter.test(argument, converter.apply(element))) {
+                remove(i);
+                i--;
+                length--;
+                removed++;
+            }
+        }
+
+        return removed > 0;
+    }
+
     /**
      * Return true if there is at least an element for the condition.
      *
@@ -929,6 +1004,38 @@ default <T> boolean anyMatchR(@NotNull T argument, @NotNull NotNullBiPredicate<?
         return null;
     }
 
+    /**
+     * Search an element using the condition.
+     *
+     * @param argument  the argument.
+     * @param filter the condition.
+     * @return the found element or null.
+     * @since 9.6.0
+     */
+    default @Nullable E findAnyConvertedToInt(
+        int argument,
+        @NotNull NotNullFunctionInt<? super E> converter,
+        @NotNull BiIntPredicate filter
+    ) {
+
+        if (isEmpty()) {
+            return null;
+        }
+
+        var array = array();
+
+        for (int i = 0, length = size(); i < length; i++) {
+
+            var element = array[i];
+
+            if (filter.test(argument, converter.apply(element))) {
+                return element;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Calculate a count of matched elements.
      *

rlib-common/src/main/java/com/ss/rlib/common/util/array/ConcurrentArray.java

@@ -6,7 +6,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 /**
  * The interface with methods to manage thread-safe access with arrays.
@@ -416,6 +415,31 @@ default void writeUnlock(long stamp) {
         }
     }
 
+    /**
+     * Search an element using the condition under {@link #readLock()} block.
+     *
+     * @param argument the argument.
+     * @param filter   the condition.
+     * @return the found element or null.
+     * @since 9.6.0
+     */
+    default @Nullable E findAnyConvertedToIntInReadLock(
+        int argument,
+        @NotNull NotNullFunctionInt<? super E> converter,
+        @NotNull BiIntPredicate filter
+    ) {
+        if (isEmpty()) {
+            return null;
+        }
+
+        var stamp = readLock();
+        try {
+            return findAnyConvertedToInt(argument, converter, filter);
+        } finally {
+            readUnlock(stamp);
+        }
+    }
+
     /**
      * Search an element by condition under {@link #readLock()} block.
      *
@@ -513,4 +537,28 @@ default <A, B> boolean removeIfInWriteLock(
             writeUnlock(stamp);
         }
     }
+
+    /**
+     * Removes all of the elements of this collection that satisfy the given predicate.
+     *
+     * @param argument  the additional argument.
+     * @param converter the converter of the elements.
+     * @param filter    the predicate which returns {@code true} for elements to be removed.
+     * @param <A>       the argument's type.
+     * @param <B>       the element converted type.
+     * @return {@code true} if any elements were removed.
+     * @since 9.6.0
+     */
+    default <A, B> boolean removeConvertedIfInWriteLock(
+        @NotNull A argument,
+        @NotNull NotNullFunction<? super E, B> converter,
+        @NotNull NotNullBiPredicate<A, B> filter
+    ) {
+        var stamp = writeLock();
+        try {
+            return removeConvertedIf(argument, converter, filter);
+        } finally {
+            writeUnlock(stamp);
+        }
+    }
 }