ref[storage]: refactor lambda of storage

zfoo-project · Oct 21, 2023 · a6f0657 · a6f0657
1 parent a6fe28d
commit a6f0657
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/storage/src/main/java/com/zfoo/storage/manager/StorageObject.java b/storage/src/main/java/com/zfoo/storage/manager/StorageObject.java
@@ -24,9 +24,7 @@
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 import java.io.InputStream;
-import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.*;
 
@@ -258,7 +256,7 @@ private <INDEX> String getMethodToField(Func1<V, INDEX> func) {
                 var fields = clazz.getDeclaredFields();
                 Arrays.stream(fields).forEach(ReflectionUtils::makeAccessible);
                 for (var value : dataMap.values()) {
-                    var r = func.call(value);
+                    var r = func.apply(value);
                     var valueFields = Arrays.stream(fields)
                             .map(it -> ReflectionUtils.getField(it, value))
                             .filter(it -> it.equals(r) && it.getClass() == r.getClass())

diff --git a/storage/src/main/java/com/zfoo/storage/util/function/Func.java b/storage/src/main/java/com/zfoo/storage/util/function/Func.java
@@ -24,6 +24,6 @@ public interface Func<P, R> extends Serializable {
 	 * @throws Exception 自定义异常
 	 */
 	@SuppressWarnings("unchecked")
-	R call(P... parameters) throws Exception;
+	R apply(P... parameters) throws Exception;
 
 }
diff --git a/storage/src/main/java/com/zfoo/storage/util/function/Func0.java b/storage/src/main/java/com/zfoo/storage/util/function/Func0.java
@@ -21,6 +21,6 @@ public interface Func0<R> extends Serializable {
 	 * @return 函数执行结果
 	 * @throws Exception 自定义异常
 	 */
-	R call() throws Exception;
+	R apply() throws Exception;
 
 }
diff --git a/storage/src/main/java/com/zfoo/storage/util/function/Func1.java b/storage/src/main/java/com/zfoo/storage/util/function/Func1.java
@@ -24,6 +24,6 @@ public interface Func1<P, R> extends Serializable {
 	 * @return 函数执行结果
 	 * @throws Exception 自定义异常
 	 */
-	R call(P parameter) throws Exception;
+	R apply(P parameter) throws Exception;
 
 }