fix Array.of() and add new removeIf methods

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/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()));
     }
 
     /**
@@ -723,6 +722,40 @@ 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.
+     */
+    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.
      *

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

@@ -513,4 +513,27 @@ 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.
+     */
+    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);
+        }
+    }
 }

rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ArrayTest.java

@@ -18,6 +18,24 @@
  */
 public class ArrayTest extends BaseTest {
 
+    @Test
+    void ofTest() {
+
+        var array = ArrayFactory.asArray("First", "Second", "Third", "  ");
+        var copy = Array.of(array);
+
+        Assertions.assertEquals(array, copy);
+
+        var array2 = Array.of("First", "Second", "Third", "  ");
+
+        Assertions.assertEquals(array, array2);
+
+        var single = ArrayFactory.asArray("First");
+        var single2 = Array.of("First");
+
+        Assertions.assertEquals(single, single2);
+    }
+
     @Test
     void removeIfTest() {
 
@@ -59,6 +77,16 @@ void removeIfTest() {
         ));
 
         Assertions.assertEquals(2, array.size());
+
+        array = ArrayFactory.asArray("10", "5", "2", "1");
+
+        Assertions.assertTrue(array.removeConvertedIf(
+            5,
+            Integer::parseInt,
+            Integer::equals
+        ));
+
+        Assertions.assertEquals(3, array.size());
     }
 
     @Test

rlib-common/src/test/java/com/ss/rlib/common/test/util/array/ConcurrentArrayTest.java

@@ -53,6 +53,16 @@ void removeIfInWriteLockTest() {
         ));
 
         Assertions.assertEquals(2, array.size());
+
+        array = ConcurrentArray.of("10", "5", "2", "1");
+
+        Assertions.assertTrue(array.removeConvertedIfInWriteLock(
+            5,
+            Integer::parseInt,
+            Integer::equals
+        ));
+
+        Assertions.assertEquals(3, array.size());
     }
 
     @Test