Change test of params system + add some methods (tested)

Author: AlexBolot

src/main/java/CodingUtils/ArrayList8.java

@@ -4,72 +4,63 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 /*................................................................................................................................
  . Copyright (c)
  .
  . The ArrayList8	 Class was Coded by : Alexandre BOLOT
  .
- . Last Modified : 20/01/18 00:17
+ . Last Modified : 16/03/18 08:28
  .
  . Contact : [email protected]
  ...............................................................................................................................*/
 
-@SuppressWarnings ({"UnusedReturnValue", "ConstantConditions"})
+@SuppressWarnings ({"UnusedReturnValue", "ConstantConditions", "unchecked"})
 public class ArrayList8<E> extends ArrayList<E>
 {
-    //region --------------- Attributes ----------------------
-    private Random random = new Random();
-    //endregion
-
     //region --------------- Constructors --------------------
-    public ArrayList8 ()
-    {
-        super();
-    }
+    public ArrayList8 () { super(); }
 
-    public ArrayList8 (Collection<? extends E> c)
-    {
-        super(c);
-    }
+    public ArrayList8 (@NotNull Collection<? extends E> c) { super(c); }
+
+    public ArrayList8 (@NotNull E[] array) { this(Arrays.asList(array)); }
     //endregion
 
     //region --------------- Methods -------------------------
+    @NotNull
     public E getRandom ()
     {
-        //region --> Check params
         if (this.isEmpty()) throw new IndexOutOfBoundsException("List is empty");
-        //endregion
 
-        return get(random.nextInt(this.size()));
+        return get(new Random().nextInt(this.size()));
     }
 
+    @NotNull
     public E removeRandom ()
     {
-        //region --> Check params
         if (this.isEmpty()) throw new IndexOutOfBoundsException("List is empty");
-        //endregion
 
-        return remove(random.nextInt(this.size()));
+        return remove(new Random().nextInt(this.size()));
     }
 
-    public boolean addIf (E value, @NotNull Predicate<? super E> filter)
+    @NotNull
+    public ArrayList8<E> merge (@NotNull Collection<? extends E> collection)
     {
-        //region --> Check params
-        if (filter == null) throw new IllegalArgumentException("Filter param is null");
-        //endregion
+        this.addAll(collection);
+        return this;
+    }
 
+    public boolean addIf (E value, @NotNull Predicate<? super E> filter)
+    {
         return filter.test(value) && add(value);
     }
 
     public int addAllIf (@NotNull Collection<? extends E> collection, @NotNull Predicate<? super E> filter)
     {
-        //region --> Check params
-        if (collection == null) throw new IllegalArgumentException("Collection param is null");
-        if (filter == null) throw new IllegalArgumentException("Filter param is null");
-        //endregion
-
         ArrayList8<E> paramList = new ArrayList8<>();
         paramList.addAll(collection);
 
@@ -83,49 +74,42 @@ public int addAllIf (@NotNull Collection<? extends E> collection, @NotNull Predi
     @Contract (pure = true)
     public boolean contains (@NotNull Predicate<? super E> filter)
     {
-        //region --> Check params
-        if (filter == null) throw new IllegalArgumentException("Filter param is null");
-        //endregion
-
         return this.stream().anyMatch(filter::test);
     }
 
-    public int countIf (@NotNull Predicate<? super E> filter)
+    @Contract (pure = true)
+    public boolean containsAny (@NotNull E... items)
+    {
+        return Arrays.stream(items).anyMatch(this::contains);
+    }
+
+    public boolean containsAll (@NotNull E... items)
     {
-        //region --> Check params
-        if (filter == null) throw new IllegalArgumentException("Filter param is null");
-        //endregion
+        return Arrays.stream(items).allMatch(this::contains);
+    }
 
+    public int countIf (@NotNull Predicate<? super E> filter)
+    {
         return (int) this.stream().filter(filter::test).count();
     }
 
+    @NotNull
     public ArrayList8<E> subList (@NotNull Predicate<? super E> filter)
     {
-        //region --> Check params
-        if (filter == null) throw new IllegalArgumentException("Filter param is null");
-        //endregion
+        ArrayList8<E> res = new ArrayList8<>();
+
+        this.forEach(e -> res.addIf(e, filter));
 
-        return new ArrayList8<E>()
-        {{
-            this.forEach(e -> addIf(e, filter));
-        }};
+        return res;
     }
 
     public Optional<E> findAny (@NotNull Predicate<? super E> filter)
     {
-        //region --> Check params
-        if (filter == null) throw new IllegalArgumentException("Filter param is null");
-        //endregion
-
         return this.isEmpty() ? Optional.empty() : subList(filter).stream().findAny();
     }
 
     public Optional<E> findFirst (@NotNull Predicate<? super E> filter)
     {
-        //region --> Check params
-        if (filter == null) throw new IllegalArgumentException("Filter param is null");
-        //endregion
-
         for (E e : this)
         {
             if (filter.test(e)) return Optional.of(e);
@@ -136,10 +120,6 @@ public Optional<E> findFirst (@NotNull Predicate<? super E> filter)
 
     public Optional<E> max (@NotNull Comparator<? super E> comparator)
     {
-        //region --> Check params
-        if (comparator == null) throw new IllegalArgumentException("Comparator param is null");
-        //endregion
-
         if (this.isEmpty()) return Optional.empty();
 
         E max = this.getRandom();
@@ -154,10 +134,6 @@ public Optional<E> max (@NotNull Comparator<? super E> comparator)
 
     public Optional<E> min (@NotNull Comparator<? super E> comparator)
     {
-        //region --> Check params
-        if (comparator == null) throw new IllegalArgumentException("Comparator param is null");
-        //endregion
-
         if (this.isEmpty()) return Optional.empty();
 
         E min = this.get(0);
@@ -169,5 +145,15 @@ public Optional<E> min (@NotNull Comparator<? super E> comparator)
 
         return Optional.of(min);
     }
+
+    public Optional<E> reduce (@NotNull BinaryOperator<E> accumulator)
+    {
+        return this.stream().reduce(accumulator);
+    }
+
+    public <R> Stream<R> map (@NotNull Function<? super E, ? extends R> mapper)
+    {
+        return this.stream().map(mapper);
+    }
     //endregion
 }