This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 c6d72a32323 Add agent.core.plugin.config package (#23427)
c6d72a32323 is described below
commit c6d72a323232e0858d01a3fa595457989fe0b126
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 9 13:26:15 2023 +0800
Add agent.core.plugin.config package (#23427)
---
.../org/apache/shardingsphere/agent/core/ShardingSphereAgent.java | 2 +-
.../agent/core/plugin/{ => config}/PluginConfigurationLoader.java | 6 +++---
.../plugin/{ => config}/yaml/entity/YamlAgentConfiguration.java | 2 +-
.../{ => config}/yaml/entity/YamlPluginCategoryConfiguration.java | 2 +-
.../plugin/{ => config}/yaml/entity/YamlPluginConfiguration.java | 2 +-
.../{ => config}/yaml/loader/YamlPluginConfigurationLoader.java | 4 ++--
.../yaml/swapper/YamlPluginsConfigurationSwapper.java | 8 ++++----
.../core/plugin/{ => config}/PluginConfigurationLoaderTest.java | 2 +-
8 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 488b9ea9ef6..8060c0acdd6 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
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.agent.core.plugin.jar.PluginJar;
import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
import org.apache.shardingsphere.agent.core.advisor.AdvisorConfigurationLoader;
import org.apache.shardingsphere.agent.core.plugin.jar.PluginJarLoader;
-import org.apache.shardingsphere.agent.core.plugin.PluginConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.plugin.config.PluginConfigurationLoader;
import java.io.File;
import java.io.IOException;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/PluginConfigurationLoader.java
similarity index 86%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/PluginConfigurationLoader.java
index 2fb834ba456..05aa741a5a1 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/PluginConfigurationLoader.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin;
+package org.apache.shardingsphere.agent.core.plugin.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.loader.YamlPluginConfigurationLoader;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlPluginsConfigurationSwapper;
+import
org.apache.shardingsphere.agent.core.plugin.config.yaml.loader.YamlPluginConfigurationLoader;
+import
org.apache.shardingsphere.agent.core.plugin.config.yaml.swapper.YamlPluginsConfigurationSwapper;
import java.io.File;
import java.io.IOException;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAgentConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlAgentConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAgentConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlAgentConfiguration.java
index eeed554b9e9..2037447cf16 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAgentConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlAgentConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginCategoryConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlPluginCategoryConfiguration.java
similarity index 94%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginCategoryConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlPluginCategoryConfiguration.java
index 4dd8a8686e3..ddc8e51f64e 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginCategoryConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlPluginCategoryConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginConfiguration.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlPluginConfiguration.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginConfiguration.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlPluginConfiguration.java
index 8f870bcbcfb..a2cf98c163b 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPluginConfiguration.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/entity/YamlPluginConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.config.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlPluginConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/loader/YamlPluginConfigurationLoader.java
similarity index 91%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlPluginConfigurationLoader.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/loader/YamlPluginConfigurationLoader.java
index 6f0f4c0d8a3..a5f1e0062db 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlPluginConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/loader/YamlPluginConfigurationLoader.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.loader;
+package org.apache.shardingsphere.agent.core.plugin.config.yaml.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAgentConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.config.yaml.entity.YamlAgentConfiguration;
import org.yaml.snakeyaml.Yaml;
import java.io.File;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPluginsConfigurationSwapper.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
similarity index 87%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPluginsConfigurationSwapper.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
index be1045e10ec..4f3b535e827 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlPluginsConfigurationSwapper.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
+package org.apache.shardingsphere.agent.core.plugin.config.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAgentConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPluginCategoryConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPluginConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.config.yaml.entity.YamlAgentConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.config.yaml.entity.YamlPluginCategoryConfiguration;
+import
org.apache.shardingsphere.agent.core.plugin.config.yaml.entity.YamlPluginConfiguration;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/PluginConfigurationLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/config/PluginConfigurationLoaderTest.java
similarity index 98%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/PluginConfigurationLoaderTest.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/config/PluginConfigurationLoaderTest.java
index 2d49645e715..5ec460c9006 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/PluginConfigurationLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/config/PluginConfigurationLoaderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin;
+package org.apache.shardingsphere.agent.core.plugin.config;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
import org.junit.Test;