1.73

Author: MORIMORI0317

common/src/main/java/dev/felnull/fnjl/FNJLBuildIn.java

@@ -1,5 +1,5 @@
 package dev.felnull.fnjl;
 
 public class FNJLBuildIn {
-    protected static final String VERSION = "1.72";
+    protected static final String VERSION = "1.73";
 }

common/src/main/java/dev/felnull/fnjl/util/FNArrayUtil.java

@@ -1,8 +1,8 @@
 package dev.felnull.fnjl.util;
 
-import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.Objects;
+import java.util.function.IntFunction;
 import java.util.function.Supplier;
 
 /**
@@ -186,16 +186,11 @@ public static float[] insert(float[] array, int index, float value) {
     /**
      * サプライヤーの配列からすべてを取得し配列へ変換
      *
-     * @param clazz     型クラス
      * @param suppliers サプライヤー
      * @param <T>       型
      * @return 配列
      */
-    public static <T> T[] allGet(Class<T> clazz, Supplier<T>[] suppliers) {
-        T[] array = (T[]) Array.newInstance(clazz, suppliers.length);
-        for (int i = 0; i < suppliers.length; i++) {
-            array[i] = suppliers[i].get();
-        }
-        return array;
+    public static <T> T[] allGet(Supplier<T>[] suppliers, IntFunction<T[]> generator) {
+        return Arrays.stream(suppliers).map(Supplier::get).toArray(generator);
     }
 }

common/src/test/java/dev/felnull/fnjltest/Main.java

@@ -11,7 +11,7 @@ public static void main(String[] args) throws Exception {
         strs[0] = () -> "114514";
         strs[1] = () -> "FCOH";
         strs[2] = () -> "TEST";
-        String[] ret = FNArrayUtil.allGet(String.class, strs);
+        String[] ret = FNArrayUtil.allGet(strs, String[]::new);
         System.out.println(Arrays.toString(ret));
     }
 }

gradle.properties

@@ -1,3 +1,3 @@
 fnjl_group=dev.felnull
 fnjl_name=felnull-java-library
-fnjl_version=1.72
+fnjl_version=1.73

natives/src/main/java/dev/felnull/fnjln/FNJLNBuildIn.java

@@ -1,7 +1,7 @@
 package dev.felnull.fnjln;
 
 public class FNJLNBuildIn {
-    protected static final String VERSION = "1.72";
+    protected static final String VERSION = "1.73";
 
     protected static final int NATIVE_LIBRARY_VERSION = 1;
 }