This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 0a8ae81 Move ProxyConfiguration into shardingsphere-proxy-bootstrap
module (#12824)
0a8ae81 is described below
commit 0a8ae8144d5ec0f4d0600b684ebbe84e84613b51
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Sep 29 19:44:32 2021 +0800
Move ProxyConfiguration into shardingsphere-proxy-bootstrap module (#12824)
---
.../java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java | 0
.../apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java | 0
.../org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java | 0
.../shardingsphere/proxy/config/util/DataSourceParameterConverter.java | 0
.../shardingsphere/proxy/config/yaml/YamlDataSourceParameter.java | 0
.../shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java | 0
.../shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java | 0
.../proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java | 0
.../shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java | 2 +-
.../proxy/config/util/DataSourceParameterConverterTest.java | 0
.../proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java | 0
.../src/test/resources/conf/config_loader}/config-empty.yaml | 0
.../src/test/resources/conf/config_loader}/config-encrypt.yaml | 0
.../test/resources/conf/config_loader}/config-readwrite-splitting.yaml | 0
.../src/test/resources/conf/config_loader}/config-sharding.yaml | 0
.../src/test/resources/conf/config_loader}/server.yaml | 0
16 files changed, 1 insertion(+), 1 deletion(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoader.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/YamlProxyConfiguration.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverter.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlDataSourceParameter.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlDataSourceParameter.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlDataSourceParameter.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlDataSourceParameter.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyRuleConfiguration.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapper.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
similarity index 99%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
index ae6b5bf..3933fe4 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
@@ -42,7 +42,7 @@ public final class ProxyConfigurationLoaderTest {
@Test
public void assertLoad() throws IOException {
- YamlProxyConfiguration actual =
ProxyConfigurationLoader.load("/conf/");
+ YamlProxyConfiguration actual =
ProxyConfigurationLoader.load("/conf/config_loader/");
Iterator<YamlRuleConfiguration> actualGlobalRules =
actual.getServerConfiguration().getRules().iterator();
// TODO assert mode
// TODO assert authority rule
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/util/DataSourceParameterConverterTest.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-empty.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-empty.yaml
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-empty.yaml
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-empty.yaml
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-encrypt.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-encrypt.yaml
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-encrypt.yaml
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-encrypt.yaml
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-readwrite-splitting.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-readwrite-splitting.yaml
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-readwrite-splitting.yaml
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-readwrite-splitting.yaml
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-sharding.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-sharding.yaml
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-sharding.yaml
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/config-sharding.yaml
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/server.yaml
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/config_loader/server.yaml
