Merge remote-tracking branch 'original/develop' into feature-9.9.1

# Conflicts:
#	build.gradle

Author: JavaSaBr

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

@@ -0,0 +1,70 @@
+package com.ss.rlib.common.function;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+public class Functions {
+
+    public static class Predicates {
+
+        public static @NotNull Predicate<Boolean> isTrue() {
+
+            return bool -> bool;
+        }
+
+        public static @NotNull Predicate<Boolean> ifTrue(@NotNull Runnable task) {
+
+            return bool -> {
+
+                if (bool) {
+                    task.run();
+                }
+
+                return true;
+            };
+        }
+
+        public static @NotNull Predicate<Boolean> throwIfTrue(@NotNull Supplier<? extends RuntimeException> factory) {
+
+            return bool -> {
+
+                if (bool) {
+                    throw factory.get();
+                }
+
+                return true;
+            };
+        }
+
+        public static @NotNull Predicate<Boolean> isFalse() {
+
+            return bool -> !bool;
+        }
+
+        public static @NotNull Predicate<Boolean> ifFalse(@NotNull Runnable task) {
+
+            return bool -> {
+
+                if (!bool) {
+                    task.run();
+                }
+
+                return true;
+            };
+        }
+
+        public static @NotNull Predicate<Boolean> throwIfFalse(@NotNull Supplier<? extends RuntimeException> factory) {
+
+            return bool -> {
+
+                if (!bool) {
+                    throw factory.get();
+                }
+
+                return true;
+            };
+        }
+    }
+}

rlib-common/src/main/java/com/ss/rlib/common/util/ArrayUtils.java

@@ -7,9 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.*;
 
 /**
@@ -244,6 +242,48 @@ public static <T, F> void fill(@NotNull T[] array, @Nullable F argument, @NotNul
         return result;
     }
 
+    /**
+     * Combine two arrays to one single array with uniq elements.
+     *
+     * @param <T>   the base array's component type.
+     * @param <E>   the added array's component type.
+     * @param base  the base array.
+     * @param added the additional array.
+     * @return the combined array with uniq elements.
+     */
+    public static <T, E extends T> @NotNull T[] combineUniq(@NotNull T[] base, @Nullable E[] added) {
+        return combineUniq(base, added, getComponentType(base));
+    }
+
+    /**
+     * Combine two arrays to one single array with uniq elements.
+     *
+     * @param <T>   the base array's component type.
+     * @param <E>   the added array's component type.
+     * @param base  the base array.
+     * @param added the additional array.
+     * @param type  the base array's component type.
+     * @return the combined array with uniq elements.
+     */
+    public static <T, E extends T> @NotNull T[] combineUniq(
+        @Nullable T[] base,
+        @Nullable E[] added,
+        @NotNull Class<T> type
+    ) {
+
+        if (base == null) {
+            return added == null ? create(type, 0) : added;
+        } else if (added == null || added.length < 1) {
+            return base;
+        }
+
+        var result = new HashSet<T>(base.length + added.length);
+        result.addAll(Arrays.asList(base));
+        result.addAll(Arrays.asList(added));
+
+        return result.toArray(create(type, result.size()));
+    }
+
     /**
      * Check the array on contains the value.
      *

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractPacketReader.java

@@ -278,13 +278,7 @@ else if (packetLength > tempPendingBuffer.capacity()) {
 
             if (packet != null) {
                 LOGGER.debug(packet, pck -> "Created instance of packet to read data: " + pck);
-
-                if (packet.read(connection, bufferToRead, dataLength)) {
-                    readPacketHandler.accept(packet);
-                } else {
-                    LOGGER.error("Packet " + packet + " was read incorrectly");
-                }
-
+                readAndHandlePacket(bufferToRead, dataLength, packet);
                 LOGGER.debug(packet, pck -> "Finished reading data of packet: " + pck);
                 readPackets++;
             } else {
@@ -319,6 +313,14 @@ else if (packetLength > tempPendingBuffer.capacity()) {
         return readPackets;
     }
 
+    protected void readAndHandlePacket(@NotNull ByteBuffer bufferToRead, int dataLength, @NotNull R packet) {
+        if (packet.read(connection, bufferToRead, dataLength)) {
+            readPacketHandler.accept(packet);
+        } else {
+            LOGGER.error("Packet " + packet + " was read incorrectly");
+        }
+    }
+
     /**
      * Check buffer's data.
      *