refactor functions

Author: JavaSaBr

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

@@ -2,8 +2,8 @@
 
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
+import javasabr.rlib.functions.BiObjLongConsumer;
 import javasabr.rlib.functions.ObjIntPredicate;
-import javasabr.rlib.functions.ObjObjLongConsumer;
 import javasabr.rlib.functions.TriConsumer;
 import org.jspecify.annotations.Nullable;
 
@@ -80,7 +80,7 @@ public interface ArrayIterationFunctions<E> {
    * @return this for method chaining
    * @since 10.0.0
    */
-  <A> ArrayIterationFunctions<E> forEach(A arg1, long arg2, ObjObjLongConsumer<? super E, A> consumer);
+  <A> ArrayIterationFunctions<E> forEach(A arg1, long arg2, BiObjLongConsumer<? super E, A> consumer);
 
   /**
    * Returns whether any element matches the filter predicate.

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

@@ -5,8 +5,8 @@
 import javasabr.rlib.collections.array.ArrayIterationFunctions;
 import javasabr.rlib.collections.array.ReversedArgsArrayIterationFunctions;
 import javasabr.rlib.collections.array.UnsafeArray;
+import javasabr.rlib.functions.BiObjLongConsumer;
 import javasabr.rlib.functions.ObjIntPredicate;
-import javasabr.rlib.functions.ObjObjLongConsumer;
 import javasabr.rlib.functions.TriConsumer;
 import org.jspecify.annotations.Nullable;
 
@@ -64,7 +64,7 @@ public <F, S> ArrayIterationFunctions<E> forEach(F arg1, S arg2, TriConsumer<? s
   }
 
   @Override
-  public <F> ArrayIterationFunctions<E> forEach(F arg1, long arg2, ObjObjLongConsumer<? super E, F> consumer) {
+  public <F> ArrayIterationFunctions<E> forEach(F arg1, long arg2, BiObjLongConsumer<? super E, F> consumer) {
     @Nullable E[] wrapped = array.wrapped();
     int size = array.size();
     for (int i = 0; i < size; i++) {

rlib-collections/src/main/java/javasabr/rlib/collections/operation/LockableOperations.java

@@ -4,7 +4,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import javasabr.rlib.functions.BiObjToBooleanFunction;
+import javasabr.rlib.functions.BiObjToBoolFunction;
 import javasabr.rlib.functions.ObjIntFunction;
 import javasabr.rlib.functions.TriConsumer;
 import javasabr.rlib.functions.TriFunction;
@@ -73,7 +73,7 @@ public interface LockableOperations<S extends LockableSource> {
    * @return the boolean result
    * @since 10.0.0
    */
-  <A> boolean getBooleanInReadLock(A arg1, BiObjToBooleanFunction<S, A> function);
+  <A> boolean getBooleanInReadLock(A arg1, BiObjToBoolFunction<S, A> function);
 
   /**
    * Executes a consumer within a read lock with one argument.

rlib-collections/src/main/java/javasabr/rlib/collections/operation/impl/DefaultLockableOperations.java

@@ -6,7 +6,7 @@
 import java.util.function.Function;
 import javasabr.rlib.collections.operation.LockableOperations;
 import javasabr.rlib.collections.operation.LockableSource;
-import javasabr.rlib.functions.BiObjToBooleanFunction;
+import javasabr.rlib.functions.BiObjToBoolFunction;
 import javasabr.rlib.functions.ObjIntFunction;
 import javasabr.rlib.functions.TriConsumer;
 import javasabr.rlib.functions.TriFunction;
@@ -55,7 +55,7 @@ public <R, A, B> R getInReadLock(A arg1, B arg2, TriFunction<S, A, B, R> functio
   }
 
   @Override
-  public <A> boolean getBooleanInReadLock(A arg1, BiObjToBooleanFunction<S, A> function) {
+  public <A> boolean getBooleanInReadLock(A arg1, BiObjToBoolFunction<S, A> function) {
     long stamp = source.readLock();
     try {
       return function.apply(source, arg1);

rlib-common/build.gradle

@@ -5,4 +5,5 @@ plugins {
 
 dependencies {
   api projects.rlibLoggerApi
+  api projects.rlibFunctions
 }