Skip to content

Commit 54c78df

Browse files
committed
1.72
1 parent 9e4c76d commit 54c78df

File tree

6 files changed

+29
-6
lines changed

6 files changed

+29
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package dev.felnull.fnjl;
22

33
public class FNJLBuildIn {
4-
protected static final String VERSION = "1.71";
4+
protected static final String VERSION = "1.72";
55
}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.felnull.fnjl.util;
22

3+
import java.lang.reflect.Array;
34
import java.util.Arrays;
45
import java.util.Objects;
56
import java.util.function.Supplier;
@@ -185,11 +186,16 @@ public static float[] insert(float[] array, int index, float value) {
185186
/**
186187
* サプライヤーの配列からすべてを取得し配列へ変換
187188
*
189+
* @param clazz 型クラス
188190
* @param suppliers サプライヤー
189191
* @param <T> 型
190192
* @return 配列
191193
*/
192-
public static <T> T[] allGet(Supplier<T>[] suppliers) {
193-
return (T[]) Arrays.stream(suppliers).map(n -> n.get()).toArray();
194+
public static <T> T[] allGet(Class<T> clazz, Supplier<T>[] suppliers) {
195+
T[] array = (T[]) Array.newInstance(clazz, suppliers.length);
196+
for (int i = 0; i < suppliers.length; i++) {
197+
array[i] = suppliers[i].get();
198+
}
199+
return array;
194200
}
195201
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
import java.lang.reflect.Constructor;
44

5+
/**
6+
* リフレクション関係
7+
*
8+
* @author MORIMORI0317
9+
* @since 1.42
10+
*/
511
public class FNReflectionUtil {
612
public static Object newInstance(Class<?> clazz, Object... objects) {
713
try {
@@ -27,4 +33,5 @@ public static Class<?> getClassForName(String name) {
2733
return null;
2834
}
2935
}
36+
3037
}
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
package dev.felnull.fnjltest;
22

3+
import dev.felnull.fnjl.util.FNArrayUtil;
4+
5+
import java.util.Arrays;
6+
import java.util.function.Supplier;
7+
38
public class Main {
49
public static void main(String[] args) throws Exception {
5-
10+
Supplier<String>[] strs = new Supplier[3];
11+
strs[0] = () -> "114514";
12+
strs[1] = () -> "FCOH";
13+
strs[2] = () -> "TEST";
14+
String[] ret = FNArrayUtil.allGet(String.class, strs);
15+
System.out.println(Arrays.toString(ret));
616
}
717
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
fnjl_group=dev.felnull
22
fnjl_name=felnull-java-library
3-
fnjl_version=1.71
3+
fnjl_version=1.72
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.felnull.fnjln;
22

33
public class FNJLNBuildIn {
4-
protected static final String VERSION = "1.71";
4+
protected static final String VERSION = "1.72";
55

66
protected static final int NATIVE_LIBRARY_VERSION = 1;
77
}

0 commit comments

Comments
 (0)