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 089e804e023 Move LoggingListener into builder package (#23395)
089e804e023 is described below
commit 089e804e023e7e2767b1914b6a1be779e59c1293
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 7 21:59:54 2023 +0800
Move LoggingListener into builder package (#23395)
---
.../shardingsphere/agent/core/builder/AgentBuilderFactory.java | 3 +--
.../agent/core/{logging => builder}/LoggingListener.java | 7 ++++---
.../shardingsphere/agent/core/builder/MethodAdvisorBuilder.java | 4 ++--
.../shardingsphere/agent/core/{logging => log}/LoggerFactory.java | 2 +-
.../shardingsphere/agent/core/plugin/PluginBootServiceManager.java | 4 ++--
.../agent/core/plugin/executor/type/ConstructorAdviceExecutor.java | 4 ++--
.../core/plugin/executor/type/InstanceMethodAdviceExecutor.java | 4 ++--
.../core/plugin/executor/type/StaticMethodAdviceExecutor.java | 4 ++--
.../agent/core/plugin/loader/AdvisorConfigurationLoader.java | 4 ++--
.../shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java | 4 ++--
.../shardingsphere/agent/core/builder/AgentTransformerTest.java | 1 -
11 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
index b8cef666a9b..641db78df9e 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentBuilderFactory.java
@@ -24,7 +24,6 @@ import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
-import org.apache.shardingsphere.agent.core.logging.LoggingListener;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
@@ -44,7 +43,7 @@ public final class AgentBuilderFactory {
* @param pluginJars plugin jars
* @param advisorConfigs advisor configurations
* @param isEnhancedForProxy is enhanced for proxy
- * @return agent builder
+ * @return created gent builder
*/
public static AgentBuilder create(final Map<String, PluginConfiguration>
pluginConfigs,
final Collection<PluginJar> pluginJars,
final Map<String, AdvisorConfiguration> advisorConfigs, final boolean
isEnhancedForProxy) {
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggingListener.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/LoggingListener.java
similarity index 91%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggingListener.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/LoggingListener.java
index 218f353d7c7..8bf2d6008d2 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggingListener.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/LoggingListener.java
@@ -15,16 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.logging;
+package org.apache.shardingsphere.agent.core.builder;
import net.bytebuddy.agent.builder.AgentBuilder.Listener;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.utility.JavaModule;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
/**
- * Logging listener for ByteBuddy lifecycle.
+ * Logging listener.
*/
@SuppressWarnings("NullableProblems")
public final class LoggingListener implements Listener {
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilder.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilder.java
index 9f53f4bd6d8..cb346051811 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilder.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/MethodAdvisorBuilder.java
@@ -25,8 +25,8 @@ import org.apache.shardingsphere.agent.api.advice.AgentAdvice;
import org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.api.advice.type.StaticMethodAdvice;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import
org.apache.shardingsphere.agent.core.plugin.executor.type.ConstructorAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.executor.type.InstanceMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.executor.type.StaticMethodAdviceExecutor;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggerFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/LoggerFactory.java
similarity index 98%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggerFactory.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/LoggerFactory.java
index eee14c77ad7..9781e0e4789 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/logging/LoggerFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/LoggerFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.logging;
+package org.apache.shardingsphere.agent.core.log;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
index 71f94292894..80ddeafb03e 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.agent.core.plugin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.spi.AgentServiceLoader;
import org.apache.shardingsphere.agent.spi.PluginBootService;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
index 90cf6106dcf..6862e7850ec 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/ConstructorAdviceExecutor.java
@@ -28,8 +28,8 @@ import net.bytebuddy.implementation.bind.annotation.This;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
index d762227e096..eb136a230a6 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/InstanceMethodAdviceExecutor.java
@@ -31,8 +31,8 @@ import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import java.lang.reflect.Method;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
index e1c146cc10a..73ce9565542 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/executor/type/StaticMethodAdviceExecutor.java
@@ -28,8 +28,8 @@ import
net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.SuperCall;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.type.StaticMethodAdvice;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import org.apache.shardingsphere.agent.core.plugin.executor.AdviceExecutor;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
index 5a2f2592475..01cca670f27 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.agent.core.plugin.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.core.plugin.yaml.advisor.loader.YamlAdvisorsConfigurationLoader;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java
index 5db242e78e0..d22cd9619f6 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.agent.core.plugin.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
-import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory;
+import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import java.io.File;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
index 54db10faa52..cd641363750 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/builder/AgentTransformerTest.java
@@ -25,7 +25,6 @@ import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.logging.LoggingListener;
import org.apache.shardingsphere.agent.core.builder.fixture.advice.BarAdvice;
import org.apache.shardingsphere.agent.core.builder.fixture.advice.FooAdvice;
import
org.apache.shardingsphere.agent.core.builder.fixture.targeted.TargetObjectFixture;
