You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/15 16:57:27 UTC
[shardingsphere] branch master updated: Move package of AgentPathBuilder (#22897)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 2a1c5d973c3 Move package of AgentPathBuilder (#22897)
2a1c5d973c3 is described below
commit 2a1c5d973c35f8c267eaeec9627e91d3e9e4b267
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 16 00:57:21 2022 +0800
Move package of AgentPathBuilder (#22897)
* Move package of AgentPathBuilder
* Refactor AgentTransformer
---
.../agent/core/config/loader/PluginConfigurationLoader.java | 6 +++---
.../agent/core/{config => }/path/AgentPathBuilder.java | 2 +-
.../shardingsphere/agent/core/plugin/loader/AgentPluginLoader.java | 2 +-
.../shardingsphere/agent/core/transformer/AgentTransformer.java | 2 +-
.../agent/core/config/loader/PluginConfigurationLoaderTest.java | 7 ++++---
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
index bc10c6ca44a..9bc0a241ea9 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
-import org.apache.shardingsphere.agent.core.config.path.AgentPathBuilder;
+import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginsConfiguration;
import org.apache.shardingsphere.agent.core.config.yaml.swapper.YamlPluginsConfigurationSwapper;
import org.apache.shardingsphere.agent.core.yaml.YamlEngine;
@@ -36,7 +36,7 @@ import java.util.Map;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PluginConfigurationLoader {
- private static final String DEFAULT_CONFIG_PATH = "/conf/agent.yaml";
+ private static final String CONFIG_PATH = "/conf/agent.yaml";
/**
* Load plugin configurations.
@@ -45,7 +45,7 @@ public final class PluginConfigurationLoader {
* @throws IOException IO exception
*/
public static Map<String, PluginConfiguration> load() throws IOException {
- File configFile = new File(AgentPathBuilder.getAgentPath(), DEFAULT_CONFIG_PATH);
+ File configFile = new File(AgentPathBuilder.getAgentPath(), CONFIG_PATH);
return YamlPluginsConfigurationSwapper.swap(load(configFile));
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/path/AgentPathBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/path/AgentPathBuilder.java
similarity index 98%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/path/AgentPathBuilder.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/path/AgentPathBuilder.java
index f89989285a6..3f4edfc2d44 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/path/AgentPathBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/path/AgentPathBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.config.path;
+package org.apache.shardingsphere.agent.core.path;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
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 46688498490..ee0a53166e4 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,7 +19,7 @@ package org.apache.shardingsphere.agent.core.plugin.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.core.config.path.AgentPathBuilder;
+import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
index d70f6f45bd9..4d82a6ae22c 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
@@ -83,7 +83,7 @@ public final class AgentTransformer implements Transformer {
return builder;
}
Builder<?> result = builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE).implement(TargetAdviceObject.class).intercept(FieldAccessor.ofField(EXTRA_DATA));
- AdvisorConfiguration advisorConfig = advisorConfigs.getOrDefault(typeDescription.getTypeName(), new AdvisorConfiguration(""));
+ AdvisorConfiguration advisorConfig = advisorConfigs.get(typeDescription.getTypeName());
result = interceptConstructor(typeDescription, advisorConfig.getConstructorAdvisors(), result, classLoader);
result = interceptStaticMethod(typeDescription, advisorConfig.getStaticMethodAdvisors(), result, classLoader);
result = interceptInstanceMethod(typeDescription, advisorConfig.getInstanceMethodAdvisors(), result, classLoader);
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java
index 5d2b7660f12..96211da34d0 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java
@@ -17,12 +17,13 @@
package org.apache.shardingsphere.agent.core.config.loader;
-import org.apache.shardingsphere.agent.core.config.path.AgentPathBuilder;
+import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
import org.apache.shardingsphere.infra.util.reflect.ReflectiveUtil;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLDecoder;
@@ -38,8 +39,8 @@ public final class PluginConfigurationLoaderTest {
assertNotNull(PluginConfigurationLoader.load());
}
- private String getResourceUrl() {
+ private String getResourceUrl() throws UnsupportedEncodingException {
URL url = PluginConfigurationLoader.class.getClassLoader().getResource("");
- return null == url ? DEFAULT_CONFIG_PATH : URLDecoder.decode(url.getFile());
+ return null == url ? DEFAULT_CONFIG_PATH : URLDecoder.decode(url.getFile(), "UTF8");
}
}