You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/11 09:51:03 UTC
[shardingsphere] branch master updated: Rename package name from point to interceptor (#22801)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ec9a0353dcc Rename package name from point to interceptor (#22801)
ec9a0353dcc is described below
commit ec9a0353dcc52a350b257b4b41300620038ed817
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 11 17:50:58 2022 +0800
Rename package name from point to interceptor (#22801)
---
.../{point => interceptor}/ConstructorInterceptorPoint.java | 2 +-
.../{point => interceptor}/InstanceMethodInterceptorPoint.java | 2 +-
.../api/{point => interceptor}/PluginInterceptorPoint.java | 2 +-
.../{point => interceptor}/StaticMethodInterceptorPoint.java | 2 +-
.../shardingsphere/agent/spi/PluginDefinitionService.java | 2 +-
.../core/bytebuddy/transformer/ShardingSphereTransformer.java | 8 ++++----
.../agent/core/definition/AbstractPluginDefinitionService.java | 4 ++--
.../agent/core/definition/InterceptorPointRegistry.java | 4 ++--
.../shardingsphere/agent/core/plugin/AgentPluginLoader.java | 2 +-
.../apache/shardingsphere/agent/core/plugin/PluginLoader.java | 10 +---------
.../bytebuddy/transformer/ShardingSphereTransformerTest.java | 2 +-
.../agent/core/plugin/loader/AgentPluginLoaderTest.java | 2 +-
.../definition/PrometheusPluginDefinitionService.java | 2 +-
13 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/ConstructorInterceptorPoint.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/ConstructorInterceptorPoint.java
similarity index 95%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/ConstructorInterceptorPoint.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/ConstructorInterceptorPoint.java
index 1c2728d9ebc..363822dedb6 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/ConstructorInterceptorPoint.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/ConstructorInterceptorPoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.api.point;
+package org.apache.shardingsphere.agent.api.interceptor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/InstanceMethodInterceptorPoint.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/InstanceMethodInterceptorPoint.java
similarity index 95%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/InstanceMethodInterceptorPoint.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/InstanceMethodInterceptorPoint.java
index 2f9fad56a1d..7cf51055531 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/InstanceMethodInterceptorPoint.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/InstanceMethodInterceptorPoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.api.point;
+package org.apache.shardingsphere.agent.api.interceptor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/PluginInterceptorPoint.java
similarity index 99%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/PluginInterceptorPoint.java
index 2c961582216..9b00b71e49c 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/PluginInterceptorPoint.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/PluginInterceptorPoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.api.point;
+package org.apache.shardingsphere.agent.api.interceptor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/StaticMethodInterceptorPoint.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/StaticMethodInterceptorPoint.java
similarity index 95%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/StaticMethodInterceptorPoint.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/StaticMethodInterceptorPoint.java
index 32ea75b7f38..692c0a36f81 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/point/StaticMethodInterceptorPoint.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/interceptor/StaticMethodInterceptorPoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.api.point;
+package org.apache.shardingsphere.agent.api.interceptor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginDefinitionService.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginDefinitionService.java
index 37b04c3e19c..4c2bded28e7 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginDefinitionService.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginDefinitionService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.spi;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
import java.util.Collection;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
index 8ded1e42087..65d42a61af2 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
@@ -35,10 +35,10 @@ import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.advice.ConstructorAdvice;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.advice.OverrideArgsInvoker;
-import org.apache.shardingsphere.agent.api.point.StaticMethodInterceptorPoint;
-import org.apache.shardingsphere.agent.api.point.ConstructorInterceptorPoint;
-import org.apache.shardingsphere.agent.api.point.InstanceMethodInterceptorPoint;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.StaticMethodInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.ConstructorInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.InstanceMethodInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginLoader;
import org.apache.shardingsphere.agent.core.plugin.interceptor.StaticMethodAroundInterceptor;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/AbstractPluginDefinitionService.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/AbstractPluginDefinitionService.java
index f54314ef8e6..3e1cf79bb0e 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/AbstractPluginDefinitionService.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/AbstractPluginDefinitionService.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.agent.core.definition;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint.Builder;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint.Builder;
import org.apache.shardingsphere.agent.spi.PluginDefinitionService;
import java.util.Collection;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/InterceptorPointRegistry.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/InterceptorPointRegistry.java
index 9ed30108b4e..86ea4bf2960 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/InterceptorPointRegistry.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/InterceptorPointRegistry.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.agent.core.definition;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint.Builder;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint.Builder;
import java.util.Collection;
import java.util.Map;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
index 76e4945dfd8..bc0d2ee4501 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
@@ -23,7 +23,7 @@ import lombok.Setter;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatcher.Junction;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.config.AgentConfiguration;
import org.apache.shardingsphere.agent.core.common.AgentClassLoader;
import org.apache.shardingsphere.agent.core.config.path.AgentPathBuilder;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
index cc78e724bd3..596bab42044 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.plugin;
import net.bytebuddy.description.type.TypeDescription;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
public interface PluginLoader {
@@ -38,14 +38,6 @@ public interface PluginLoader {
*/
PluginInterceptorPoint loadPluginInterceptorPoint(TypeDescription typeDescription);
- /**
- * To get or create instance of the advice class. Create new one and caching when it is not exist.
- *
- * @param adviceClassName class name of advice
- * @param <T> advice type
- * @return instance of advice
- */
-
/**
* To get or create instance of the advice class. Create new one and caching when it is not exist.
*
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
index 8d1a46520b5..136b71b4b2c 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformerTest.java
@@ -23,7 +23,7 @@ import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.core.bytebuddy.listener.LoggingListener;
import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
index 78ab8ce64e7..b9074165e1c 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoaderTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.core.plugin.loader;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.pool.TypePool;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundAdvice;
diff --git a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
index 3e1954790ee..e9c7dc5cda1 100644
--- a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
+++ b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.prometheus.definition;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint.Builder;
+import org.apache.shardingsphere.agent.api.interceptor.PluginInterceptorPoint.Builder;
import org.apache.shardingsphere.agent.core.definition.AbstractPluginDefinitionService;
import org.apache.shardingsphere.agent.core.yaml.entity.Interceptor;
import org.apache.shardingsphere.agent.core.yaml.entity.TargetPoint;