diff --git a/storage/src/main/java/com/zfoo/storage/util/LambdaUtils.java b/storage/src/main/java/com/zfoo/storage/util/LambdaUtils.java index bd18307d..31f47650 100644 --- a/storage/src/main/java/com/zfoo/storage/util/LambdaUtils.java +++ b/storage/src/main/java/com/zfoo/storage/util/LambdaUtils.java @@ -3,11 +3,7 @@ package com.zfoo.storage.util; import com.zfoo.protocol.util.FieldUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.storage.util.function.Func1; -import com.zfoo.storage.util.support.IdeaProxyLambdaMeta; -import com.zfoo.storage.util.support.LambdaMeta; -import com.zfoo.storage.util.support.ReflectLambdaMeta; -import com.zfoo.storage.util.support.SerializedLambda; -import com.zfoo.storage.util.support.ShadowLambdaMeta; +import com.zfoo.storage.util.lambda.*; import org.springframework.util.ConcurrentReferenceHashMap; import java.io.Serializable; diff --git a/storage/src/main/java/com/zfoo/storage/util/support/IdeaProxyLambdaMeta.java b/storage/src/main/java/com/zfoo/storage/util/lambda/IdeaProxyLambdaMeta.java similarity index 96% rename from storage/src/main/java/com/zfoo/storage/util/support/IdeaProxyLambdaMeta.java rename to storage/src/main/java/com/zfoo/storage/util/lambda/IdeaProxyLambdaMeta.java index 84e65c5b..889bc6a8 100644 --- a/storage/src/main/java/com/zfoo/storage/util/support/IdeaProxyLambdaMeta.java +++ b/storage/src/main/java/com/zfoo/storage/util/lambda/IdeaProxyLambdaMeta.java @@ -1,4 +1,4 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandleProxies; diff --git a/storage/src/main/java/com/zfoo/storage/util/support/LambdaMeta.java b/storage/src/main/java/com/zfoo/storage/util/lambda/LambdaMeta.java similarity index 87% rename from storage/src/main/java/com/zfoo/storage/util/support/LambdaMeta.java rename to storage/src/main/java/com/zfoo/storage/util/lambda/LambdaMeta.java index 2671caff..9217b0d3 100644 --- a/storage/src/main/java/com/zfoo/storage/util/support/LambdaMeta.java +++ b/storage/src/main/java/com/zfoo/storage/util/lambda/LambdaMeta.java @@ -1,4 +1,4 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; /** * Lambda 信息 diff --git a/storage/src/main/java/com/zfoo/storage/util/support/ReflectLambdaMeta.java b/storage/src/main/java/com/zfoo/storage/util/lambda/ReflectLambdaMeta.java similarity index 90% rename from storage/src/main/java/com/zfoo/storage/util/support/ReflectLambdaMeta.java rename to storage/src/main/java/com/zfoo/storage/util/lambda/ReflectLambdaMeta.java index 256eaa33..35406c5b 100644 --- a/storage/src/main/java/com/zfoo/storage/util/support/ReflectLambdaMeta.java +++ b/storage/src/main/java/com/zfoo/storage/util/lambda/ReflectLambdaMeta.java @@ -1,4 +1,4 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; /** * Created by hcl at 2021/5/14 diff --git a/storage/src/main/java/com/zfoo/storage/util/support/SerializedLambda.java b/storage/src/main/java/com/zfoo/storage/util/lambda/SerializedLambda.java similarity index 87% rename from storage/src/main/java/com/zfoo/storage/util/support/SerializedLambda.java rename to storage/src/main/java/com/zfoo/storage/util/lambda/SerializedLambda.java index b64f150d..2cd684b3 100644 --- a/storage/src/main/java/com/zfoo/storage/util/support/SerializedLambda.java +++ b/storage/src/main/java/com/zfoo/storage/util/lambda/SerializedLambda.java @@ -1,12 +1,6 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamClass; -import java.io.Serializable; +import java.io.*; /** * 当前类是 {@link java.lang.invoke.SerializedLambda } 的一个镜像 diff --git a/storage/src/main/java/com/zfoo/storage/util/support/ShadowLambdaMeta.java b/storage/src/main/java/com/zfoo/storage/util/lambda/ShadowLambdaMeta.java similarity index 91% rename from storage/src/main/java/com/zfoo/storage/util/support/ShadowLambdaMeta.java rename to storage/src/main/java/com/zfoo/storage/util/lambda/ShadowLambdaMeta.java index a0f78b64..56dc993e 100644 --- a/storage/src/main/java/com/zfoo/storage/util/support/ShadowLambdaMeta.java +++ b/storage/src/main/java/com/zfoo/storage/util/lambda/ShadowLambdaMeta.java @@ -1,4 +1,4 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; /** * 基于 {@link SerializedLambda} 创建的元信息 diff --git a/storage/src/test/java/com/zfoo/storage/util/support/TestFieldUtils.java b/storage/src/test/java/com/zfoo/storage/util/lambda/TestFieldUtils.java similarity index 95% rename from storage/src/test/java/com/zfoo/storage/util/support/TestFieldUtils.java rename to storage/src/test/java/com/zfoo/storage/util/lambda/TestFieldUtils.java index f4a69c84..c95ddf60 100644 --- a/storage/src/test/java/com/zfoo/storage/util/support/TestFieldUtils.java +++ b/storage/src/test/java/com/zfoo/storage/util/lambda/TestFieldUtils.java @@ -1,4 +1,4 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; import com.zfoo.protocol.util.FieldUtils; import org.junit.Test; diff --git a/storage/src/test/java/com/zfoo/storage/util/support/TestLambdaFunction.java b/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunction.java similarity index 91% rename from storage/src/test/java/com/zfoo/storage/util/support/TestLambdaFunction.java rename to storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunction.java index 5eb56f49..948cac88 100644 --- a/storage/src/test/java/com/zfoo/storage/util/support/TestLambdaFunction.java +++ b/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunction.java @@ -1,14 +1,12 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; import com.zfoo.storage.StudentResource; import com.zfoo.storage.util.LambdaUtils; import com.zfoo.storage.util.function.Func1; -import com.zfoo.storage.util.support.LambdaMeta; import org.junit.Test; import java.io.Serializable; import java.lang.reflect.Method; -import java.util.function.Function; /** * @author veione diff --git a/storage/src/test/java/com/zfoo/storage/util/support/TestLambdaFunctionCache.java b/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunctionCache.java similarity index 92% rename from storage/src/test/java/com/zfoo/storage/util/support/TestLambdaFunctionCache.java rename to storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunctionCache.java index 1f093fb6..80daac03 100644 --- a/storage/src/test/java/com/zfoo/storage/util/support/TestLambdaFunctionCache.java +++ b/storage/src/test/java/com/zfoo/storage/util/lambda/TestLambdaFunctionCache.java @@ -1,4 +1,4 @@ -package com.zfoo.storage.util.support; +package com.zfoo.storage.util.lambda; import com.zfoo.storage.resource.StudentResource; import com.zfoo.storage.util.LambdaUtils;