From e16c7347564a9697421a1cc919cf6db8d7a1c9c0 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 24 Apr 2023 09:54:58 +0800 Subject: [PATCH] fix code --- .../extra/aop/{aspects => }/Aspect.java | 2 +- .../extra/aop/{proxy => }/ProxyFactory.java | 3 +-- .../dromara/hutool/extra/aop/ProxyUtil.java | 2 -- .../{interceptor => }/SimpleInterceptor.java | 4 +--- .../extra/aop/aspects/SimpleAspect.java | 2 ++ .../jdk}/JdkInterceptor.java | 5 +++-- .../jdk}/JdkProxyFactory.java | 6 +++--- .../spring}/SpringCglibInterceptor.java | 5 +++-- .../spring}/SpringCglibProxyFactory.java | 8 ++++---- .../extra/aop/interceptor/package-info.java | 19 ------------------- .../hutool/extra/aop/package-info.java | 7 ++++++- .../hutool/extra/aop/proxy/package-info.java | 19 ------------------- ...org.dromara.hutool.extra.aop.ProxyFactory} | 4 ++-- 13 files changed, 26 insertions(+), 60 deletions(-) rename hutool-extra/src/main/java/org/dromara/hutool/extra/aop/{aspects => }/Aspect.java (97%) rename hutool-extra/src/main/java/org/dromara/hutool/extra/aop/{proxy => }/ProxyFactory.java (95%) rename hutool-extra/src/main/java/org/dromara/hutool/extra/aop/{interceptor => }/SimpleInterceptor.java (91%) rename hutool-extra/src/main/java/org/dromara/hutool/extra/aop/{interceptor => engine/jdk}/JdkInterceptor.java (93%) rename hutool-extra/src/main/java/org/dromara/hutool/extra/aop/{proxy => engine/jdk}/JdkProxyFactory.java (86%) rename hutool-extra/src/main/java/org/dromara/hutool/extra/aop/{interceptor => engine/spring}/SpringCglibInterceptor.java (92%) rename hutool-extra/src/main/java/org/dromara/hutool/extra/aop/{proxy => engine/spring}/SpringCglibProxyFactory.java (81%) delete mode 100644 hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/package-info.java delete mode 100644 hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/package-info.java rename hutool-extra/src/main/resources/META-INF/services/{org.dromara.hutool.extra.aop.proxy.ProxyFactory => org.dromara.hutool.extra.aop.ProxyFactory} (80%) diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/Aspect.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/Aspect.java similarity index 97% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/Aspect.java rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/Aspect.java index e318b5604..40261d79c 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/Aspect.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/Aspect.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.extra.aop.aspects; +package org.dromara.hutool.extra.aop; import java.lang.reflect.Method; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/ProxyFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyFactory.java similarity index 95% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/ProxyFactory.java rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyFactory.java index 0f1e4d67b..b35b92c81 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/ProxyFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyFactory.java @@ -10,11 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.extra.aop.proxy; +package org.dromara.hutool.extra.aop; import org.dromara.hutool.core.reflect.ConstructorUtil; import org.dromara.hutool.core.spi.SpiUtil; -import org.dromara.hutool.extra.aop.aspects.Aspect; import java.io.Serializable; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java index a04d022bc..f16a8e9cd 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/ProxyUtil.java @@ -13,8 +13,6 @@ package org.dromara.hutool.extra.aop; import org.dromara.hutool.core.classloader.ClassLoaderUtil; -import org.dromara.hutool.extra.aop.aspects.Aspect; -import org.dromara.hutool.extra.aop.proxy.ProxyFactory; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SimpleInterceptor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/SimpleInterceptor.java similarity index 91% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SimpleInterceptor.java rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/SimpleInterceptor.java index fb5a55151..6d73ffe6c 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SimpleInterceptor.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/SimpleInterceptor.java @@ -10,9 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.extra.aop.interceptor; - -import org.dromara.hutool.extra.aop.aspects.Aspect; +package org.dromara.hutool.extra.aop; import java.io.Serializable; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java index 3180de73f..597b619b4 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/aspects/SimpleAspect.java @@ -12,6 +12,8 @@ package org.dromara.hutool.extra.aop.aspects; +import org.dromara.hutool.extra.aop.Aspect; + import java.io.Serializable; import java.lang.reflect.Method; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/JdkInterceptor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkInterceptor.java similarity index 93% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/JdkInterceptor.java rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkInterceptor.java index defe641e4..6be4dbfa4 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/JdkInterceptor.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkInterceptor.java @@ -10,11 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.extra.aop.interceptor; +package org.dromara.hutool.extra.aop.engine.jdk; import org.dromara.hutool.core.reflect.ModifierUtil; import org.dromara.hutool.core.reflect.ReflectUtil; -import org.dromara.hutool.extra.aop.aspects.Aspect; +import org.dromara.hutool.extra.aop.Aspect; +import org.dromara.hutool.extra.aop.SimpleInterceptor; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/JdkProxyFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkProxyFactory.java similarity index 86% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/JdkProxyFactory.java rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkProxyFactory.java index cb55d2680..06fd8aa47 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/JdkProxyFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/jdk/JdkProxyFactory.java @@ -10,11 +10,11 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.extra.aop.proxy; +package org.dromara.hutool.extra.aop.engine.jdk; +import org.dromara.hutool.extra.aop.ProxyFactory; import org.dromara.hutool.extra.aop.ProxyUtil; -import org.dromara.hutool.extra.aop.aspects.Aspect; -import org.dromara.hutool.extra.aop.interceptor.JdkInterceptor; +import org.dromara.hutool.extra.aop.Aspect; /** * JDK实现的切面代理 diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SpringCglibInterceptor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibInterceptor.java similarity index 92% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SpringCglibInterceptor.java rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibInterceptor.java index 3f1ed34f1..bb4e8c448 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/SpringCglibInterceptor.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibInterceptor.java @@ -10,9 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.extra.aop.interceptor; +package org.dromara.hutool.extra.aop.engine.spring; -import org.dromara.hutool.extra.aop.aspects.Aspect; +import org.dromara.hutool.extra.aop.Aspect; +import org.dromara.hutool.extra.aop.SimpleInterceptor; import org.springframework.cglib.proxy.MethodInterceptor; import org.springframework.cglib.proxy.MethodProxy; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/SpringCglibProxyFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibProxyFactory.java similarity index 81% rename from hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/SpringCglibProxyFactory.java rename to hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibProxyFactory.java index 9be9b3f04..651e7033d 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/SpringCglibProxyFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/engine/spring/SpringCglibProxyFactory.java @@ -10,10 +10,10 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.extra.aop.proxy; +package org.dromara.hutool.extra.aop.engine.spring; -import org.dromara.hutool.extra.aop.aspects.Aspect; -import org.dromara.hutool.extra.aop.interceptor.SpringCglibInterceptor; +import org.dromara.hutool.extra.aop.ProxyFactory; +import org.dromara.hutool.extra.aop.Aspect; import org.springframework.cglib.proxy.Enhancer; /** @@ -22,7 +22,7 @@ import org.springframework.cglib.proxy.Enhancer; * @author looly * */ -public class SpringCglibProxyFactory implements ProxyFactory{ +public class SpringCglibProxyFactory implements ProxyFactory { private static final long serialVersionUID = 1L; @Override diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/package-info.java deleted file mode 100644 index 85b3f0ec0..000000000 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/interceptor/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023 looly(loolly@aliyun.com) - * Hutool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -/** - * 代理拦截器实现 - * - * @author looly - * - */ -package org.dromara.hutool.extra.aop.interceptor; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java index ee66f4d60..770cbac08 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/package-info.java @@ -11,7 +11,12 @@ */ /** - * JDK动态代理封装，提供非IOC下的切面支持 + * JDK动态代理封装，提供非IOC下的切面支持，封装包括： + * + * 考虑到cglib库不再更新且对JDK9+兼容性问题，不再封装 * * @author looly * diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/package-info.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/package-info.java deleted file mode 100644 index 87e2969b6..000000000 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/aop/proxy/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023 looly(loolly@aliyun.com) - * Hutool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -/** - * 代理实现 - * - * @author looly - * - */ -package org.dromara.hutool.extra.aop.proxy; diff --git a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.proxy.ProxyFactory b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.ProxyFactory similarity index 80% rename from hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.proxy.ProxyFactory rename to hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.ProxyFactory index b0a8078d2..830440e23 100644 --- a/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.proxy.ProxyFactory +++ b/hutool-extra/src/main/resources/META-INF/services/org.dromara.hutool.extra.aop.ProxyFactory @@ -10,5 +10,5 @@ # See the Mulan PSL v2 for more details. # -org.dromara.hutool.extra.aop.proxy.SpringCglibProxyFactory -org.dromara.hutool.extra.aop.proxy.JdkProxyFactory +org.dromara.hutool.extra.aop.engine.spring.SpringCglibProxyFactory +org.dromara.hutool.extra.aop.engine.jdk.JdkProxyFactory