extend long/int arrays API

Author: JavaSaBr

README.md

@@ -14,7 +14,7 @@ repositories {
 }
 
 ext {
- rlibVersion = "10.0.alpha6"
+ rlibVersion = "10.0.alpha7"
 }
 
 dependencies {

build.gradle

@@ -1,4 +1,4 @@
-rootProject.version = "10.0.alpha6"
+rootProject.version = "10.0.alpha7"
 group = 'javasabr.rlib'
 
 allprojects {

rlib-collections/src/main/java/javasabr/rlib/collections/array/Array.java

@@ -1,6 +1,7 @@
 package javasabr.rlib.collections.array;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -9,6 +10,7 @@
 import java.util.stream.Stream;
 import javasabr.rlib.collections.array.impl.DefaultArrayIterator;
 import javasabr.rlib.collections.array.impl.ImmutableArray;
+import javasabr.rlib.common.util.ArrayUtils;
 import javasabr.rlib.common.util.ClassUtils;
 import org.jspecify.annotations.Nullable;
 
@@ -21,20 +23,44 @@ static <E> Array<E> empty(Class<? super E> type) {
  return new ImmutableArray<>(ClassUtils.unsafeCast(type));
  }
 
- static <E> Array<E> of(E e1) {
- return new ImmutableArray<>(Object.class, e1);
+ static <E> Array<E> of(E single) {
+ @SuppressWarnings("unchecked")
+ Class<E> type = (Class<E>) single.getClass();
+ return new ImmutableArray<>(type, single);
  }
 
  static <E> Array<E> of(E e1, E e2) {
- return new ImmutableArray<>(Object.class, e1, e2);
+ Class<E> commonType = ClassUtils.commonType(e1, e2);
+ return new ImmutableArray<>(commonType, e1, e2);
  }
 
  static <E> Array<E> of(E e1, E e2, E e3) {
- return new ImmutableArray<>(Object.class, e1, e2, e3);
+ Class<E> commonType = ClassUtils.commonType(e1, e2, e3);
+ return new ImmutableArray<>(commonType, e1, e2, e3);
  }
 
  static <E> Array<E> of(E e1, E e2, E e3, E e4) {
- return new ImmutableArray<>(Object.class, e1, e2, e3, e4);
+ Class<E> commonType = ClassUtils.commonType(e1, e2, e3, e4);
+ return new ImmutableArray<>(commonType, e1, e2, e3, e4);
+ }
+
+ static <E> Array<E> of(E e1, E e2, E e3, E e4, E e5) {
+ Class<E> commonType = ClassUtils.commonType(e1, e2, e3, e4, e5);
+ return new ImmutableArray<>(commonType, e1, e2, e3, e4, e5);
+ }
+
+ static <E> Array<E> of(E e1, E e2, E e3, E e4, E e5, E e6) {
+ Class<E> commonType = ClassUtils.commonType(e1, e2, e3, e4, e5, e6);
+ return new ImmutableArray<>(commonType, e1, e2, e3, e4, e5, e6);
+ }
+
+ @SafeVarargs
+ static <E> Array<E> of(E... elements) {
+ //noinspection unchecked
+ Class<E> type = (Class<E>) elements
+ .getClass()
+ .getComponentType();
+ return new ImmutableArray<>(type, elements);
  }
 
  @SafeVarargs
@@ -51,7 +77,21 @@ static <E> Array<E> optionals(Class<? super E> type, Optional<E>... elements) {
  .collect(ArrayCollectors.toArray(type));
  }
 
- static <E> Array<E> copyOf(MutableArray<E> array) {
+ /**
+ * Creates array with the same element repeated 'count' times
+ */
+ static <E> Array<E> repeated(E element, int count) {
+ @SuppressWarnings("unchecked")
+ Class<E> type = (Class<E>) element.getClass();
+ E[] array = ArrayUtils.create(type, count);
+ Arrays.fill(array, element);
+ return ImmutableArray.trustWrap(array);
+ }
+
+ static <E> Array<E> copyOf(Array<E> array) {
+ if (array instanceof ImmutableArray<E>) {
+ return array;
+ }
  return new ImmutableArray<>(array.type(), array.toArray());
  }
 
@@ -203,8 +243,6 @@ default Iterator<E> iterator() {
  */
  Stream<E> stream();
 
- ReversedArrayIterationFunctions<E> reversedIterations();
-
  ArrayIterationFunctions<E> iterations();
 
  UnsafeArray<E> asUnsafe();

rlib-collections/src/main/java/javasabr/rlib/collections/array/ArrayIterationFunctions.java

@@ -9,6 +9,8 @@
 
 public interface ArrayIterationFunctions<E> {
 
+ ReversedArgsArrayIterationFunctions<E> reversedArgs();
+
  @Nullable
  <A> E findAny(A arg1, BiPredicate<? super E, A> filter);
 

rlib-collections/src/main/java/javasabr/rlib/collections/array/MutableIntArray.java

@@ -11,10 +11,14 @@ public interface MutableIntArray extends IntArray {
  /**
  * @return the element previously at the specified position
  */
- int removeByInex(int index);
+ int removeByIndex(int index);
 
  boolean remove(int value);
 
+ boolean removeAll(IntArray array);
+
+ boolean removeAll(int[] array);
+
  void replace(int index, int value);
 
  void clear();

rlib-collections/src/main/java/javasabr/rlib/collections/array/MutableLongArray.java

@@ -11,10 +11,14 @@ public interface MutableLongArray extends LongArray {
  /**
  * @return the element previously at the specified position
  */
- long removeByInex(int index);
+ long removeByIndex(int index);
 
  boolean remove(long value);
 
+ boolean removeAll(LongArray array);
+
+ boolean removeAll(long[] array);
+
  void replace(int index, long value);
 
  void clear();

rlib-collections/src/main/java/javasabr/rlib/collections/array/ReversedArrayIterationFunctions.java renamed to rlib-collections/src/main/java/javasabr/rlib/collections/array/ReversedArgsArrayIterationFunctions.java

@@ -5,14 +5,14 @@
 import javasabr.rlib.functions.TriConsumer;
 import org.jspecify.annotations.Nullable;
 
-public interface ReversedArrayIterationFunctions<E> {
+public interface ReversedArgsArrayIterationFunctions<E> {
 
  @Nullable
  <A> E findAny(A arg1, BiPredicate<A, ? super E> filter);
 
- <A> ReversedArrayIterationFunctions<E> forEach(A arg1, BiConsumer<A, ? super E> consumer);
+ <A> ReversedArgsArrayIterationFunctions<E> forEach(A arg1, BiConsumer<A, ? super E> consumer);
 
- <A, B> ReversedArrayIterationFunctions<E> forEach(A arg1, B arg2, TriConsumer<A, B, ? super E> consumer);
+ <A, B> ReversedArgsArrayIterationFunctions<E> forEach(A arg1, B arg2, TriConsumer<A, B, ? super E> consumer);
 
  <A> boolean anyMatch(A arg1, BiPredicate<A, ? super E> filter);
 }

rlib-collections/src/main/java/javasabr/rlib/collections/array/impl/AbstractArray.java

@@ -9,7 +9,6 @@
 import java.util.function.Function;
 import javasabr.rlib.collections.array.Array;
 import javasabr.rlib.collections.array.ArrayIterationFunctions;
-import javasabr.rlib.collections.array.ReversedArrayIterationFunctions;
 import javasabr.rlib.collections.array.UnsafeArray;
 import javasabr.rlib.common.util.ArrayUtils;
 import javasabr.rlib.common.util.ClassUtils;
@@ -174,13 +173,13 @@ public void forEach(Consumer<? super E> action) {
  }
 
  @Override
- public ReversedArrayIterationFunctions<E> reversedIterations() {
- return new DefaultReversedArrayIterationFunctions<>(this);
+ public ArrayIterationFunctions<E> iterations() {
+ return createIterations();
  }
 
- @Override
- public ArrayIterationFunctions<E> iterations() {
- return new DefaultArrayIterationFunctions<>(this);
+ protected ArrayIterationFunctions<E> createIterations() {
+  return new DefaultArrayIterationFunctions<>(this,
+  new DefaultReversedArgsArrayIterationFunctions<>(this));
  }
 
  @Override

rlib-collections/src/main/java/javasabr/rlib/collections/array/impl/AbstractIntArray.java

@@ -5,6 +5,7 @@
 import java.util.NoSuchElementException;
 import javasabr.rlib.collections.array.IntArray;
 import javasabr.rlib.collections.array.UnsafeIntArray;
+import javasabr.rlib.common.util.ArrayUtils;
 import lombok.AccessLevel;
 import lombok.experimental.Accessors;
 import lombok.experimental.FieldDefaults;
@@ -110,32 +111,28 @@ public int[] toArray() {
 
  @Override
  public boolean equals(Object another) {
-
  if (!(another instanceof IntArray array)) {
  return false;
  }
-
- int[] wrapped = array
- .asUnsafe()
- .wrapped();
-
+ int[] wrapped = array.asUnsafe().wrapped();
  return Arrays.equals(wrapped(), 0, size(), wrapped, 0, array.size());
  }
 
  @Override
  public int hashCode() {
-
  int[] wrapped = wrapped();
-
  int result = 1;
-
  for (int i = 0, wrappedLength = size(); i < wrappedLength; i++) {
  result = 31 * result + wrapped[i];
  }
-
  return result;
  }
 
+ @Override
+ public String toString() {
+ return ArrayUtils.toString(wrapped(), 0, size(), ",", false, true);
+ }
+
  @Override
  public UnsafeIntArray asUnsafe() {
  return this;

rlib-collections/src/main/java/javasabr/rlib/collections/array/impl/AbstractLongArray.java

@@ -5,6 +5,7 @@
 import java.util.NoSuchElementException;
 import javasabr.rlib.collections.array.LongArray;
 import javasabr.rlib.collections.array.UnsafeLongArray;
+import javasabr.rlib.common.util.ArrayUtils;
 import lombok.AccessLevel;
 import lombok.experimental.Accessors;
 import lombok.experimental.FieldDefaults;
@@ -110,32 +111,28 @@ public long[] toArray() {
 
  @Override
  public boolean equals(Object another) {
-
  if (!(another instanceof LongArray array)) {
  return false;
  }
-
- long[] wrapped = array
- .asUnsafe()
- .wrapped();
-
+ long[] wrapped = array.asUnsafe().wrapped();
  return Arrays.equals(wrapped(), 0, size(), wrapped, 0, array.size());
  }
 
  @Override
  public int hashCode() {
-
  long[] wrapped = wrapped();
-
  int result = 1;
-
  for (int i = 0, wrappedLength = size(); i < wrappedLength; i++) {
  result = 31 * result + Long.hashCode(wrapped[i]);
  }
-
  return result;
  }
 
+ @Override
+ public String toString() {
+ return ArrayUtils.toString(wrapped(), 0, size(), ",", false, true);
+ }
+
  @Override
  public UnsafeLongArray asUnsafe() {
  return this;