This is an automated email from the ASF dual-hosted git repository.
totalo 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 e3f0835c09d Rename YamlPluginsConfiguration to YamlAgentConfiguration
(#23312)
e3f0835c09d is described below
commit e3f0835c09d873123eff5455a5ffd17e9528e311
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jan 4 08:31:31 2023 +0800
Rename YamlPluginsConfiguration to YamlAgentConfiguration (#23312)
---
.../apache/shardingsphere/agent/core/ShardingSphereAgent.java | 4 ++--
...nConfigurationLoader.java => AgentConfigurationLoader.java} | 10 +++++-----
...mlPluginsConfiguration.java => YamlAgentConfiguration.java} | 4 ++--
.../config/yaml/swapper/YamlPluginsConfigurationSwapper.java | 4 ++--
...rationLoaderTest.java => AgentConfigurationLoaderTest.java} | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
index d61398c9c01..153d1a3d2ab 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
@@ -23,7 +23,7 @@ import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.matcher.ElementMatchers;
-import
org.apache.shardingsphere.agent.core.config.loader.PluginConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.config.loader.AgentConfigurationLoader;
import org.apache.shardingsphere.agent.core.logging.LoggingListener;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import
org.apache.shardingsphere.agent.core.plugin.loader.AdvisorConfigurationLoader;
@@ -52,7 +52,7 @@ public final class ShardingSphereAgent {
* @throws IOException IO exception
*/
public static void premain(final String args, final Instrumentation
instrumentation) throws IOException {
- Map<String, PluginConfiguration> pluginConfigs =
PluginConfigurationLoader.load();
+ Map<String, PluginConfiguration> pluginConfigs =
AgentConfigurationLoader.load();
boolean isEnhancedForProxy = isEnhancedForProxy();
Collection<PluginJar> pluginJars = AgentPluginLoader.load();
Map<String, AdvisorConfiguration> advisorConfigs =
AdvisorConfigurationLoader.load(pluginJars, pluginConfigs.keySet(),
isEnhancedForProxy);
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/AgentConfigurationLoader.java
similarity index 88%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/AgentConfigurationLoader.java
index dabedaba486..9f039d3ec80 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/AgentConfigurationLoader.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.core.config.loader;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginsConfiguration;
+import
org.apache.shardingsphere.agent.core.config.yaml.entity.YamlAgentConfiguration;
import
org.apache.shardingsphere.agent.core.config.yaml.swapper.YamlPluginsConfigurationSwapper;
import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
@@ -33,10 +33,10 @@ import java.io.InputStreamReader;
import java.util.Map;
/**
- * Plugin configuration loader.
+ * Agent configuration loader.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class PluginConfigurationLoader {
+public final class AgentConfigurationLoader {
private static final String CONFIG_PATH = "/conf/agent.yaml";
@@ -51,11 +51,11 @@ public final class PluginConfigurationLoader {
return YamlPluginsConfigurationSwapper.swap(load(configFile));
}
- private static YamlPluginsConfiguration load(final File yamlFile) throws
IOException {
+ private static YamlAgentConfiguration load(final File yamlFile) throws
IOException {
try (
FileInputStream fileInputStream = new
FileInputStream(yamlFile);
InputStreamReader inputStreamReader = new
InputStreamReader(fileInputStream)) {
- YamlPluginsConfiguration result = new
Yaml().loadAs(inputStreamReader, YamlPluginsConfiguration.class);
+ YamlAgentConfiguration result = new
Yaml().loadAs(inputStreamReader, YamlAgentConfiguration.class);
Preconditions.checkNotNull(result, "Agent configuration file `%s`
is invalid.", yamlFile.getName());
return result;
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginsConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlAgentConfiguration.java
similarity index 92%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginsConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlAgentConfiguration.java
index 24f10644057..062f93402fe 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlPluginsConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/entity/YamlAgentConfiguration.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.Setter;
/**
- * YAML plugins configuration.
+ * YAML agent configuration.
*/
@Getter
@Setter
-public final class YamlPluginsConfiguration {
+public final class YamlAgentConfiguration {
private YamlPluginCategoryConfiguration plugins;
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
index 0ccc6e80439..3b68e70cf96 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginCategoryConfiguration;
import
org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginConfiguration;
-import
org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginsConfiguration;
+import
org.apache.shardingsphere.agent.core.config.yaml.entity.YamlAgentConfiguration;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
import java.util.LinkedHashMap;
@@ -40,7 +40,7 @@ public final class YamlPluginsConfigurationSwapper {
* @param yamlConfig YAML agent configuration
* @return plugin configurations
*/
- public static Map<String, PluginConfiguration> swap(final
YamlPluginsConfiguration yamlConfig) {
+ public static Map<String, PluginConfiguration> swap(final
YamlAgentConfiguration yamlConfig) {
Map<String, PluginConfiguration> result = new LinkedHashMap<>();
YamlPluginCategoryConfiguration plugins = yamlConfig.getPlugins();
if (null != plugins) {
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/AgentConfigurationLoaderTest.java
similarity index 89%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoaderTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/config/loader/AgentConfigurationLoaderTest.java
index 01780be94c2..6f959b64a24 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/AgentConfigurationLoaderTest.java
@@ -29,18 +29,18 @@ import java.net.URLDecoder;
import static org.junit.Assert.assertNotNull;
-public final class PluginConfigurationLoaderTest {
+public final class AgentConfigurationLoaderTest {
private static final String DEFAULT_CONFIG_PATH = "/conf/agent.yaml";
@Test
public void assertLoad() throws IOException, ReflectiveOperationException {
Plugins.getMemberAccessor().set(AgentPathBuilder.class.getDeclaredField("agentPath"),
AgentPathBuilder.class, new File(getResourceUrl()));
- assertNotNull(PluginConfigurationLoader.load());
+ assertNotNull(AgentConfigurationLoader.load());
}
private String getResourceUrl() throws UnsupportedEncodingException {
- URL url =
PluginConfigurationLoader.class.getClassLoader().getResource("");
+ URL url =
AgentConfigurationLoader.class.getClassLoader().getResource("");
return null == url ? DEFAULT_CONFIG_PATH :
URLDecoder.decode(url.getFile(), "UTF8");
}
}
