This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 ba5f03f Rename YamlRuleConfigurationSwapperFixture with proxy module
(#10744)
ba5f03f is described below
commit ba5f03fb9843e13958b941f63bf662ae24fd4b5d
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jun 9 23:13:37 2021 +0800
Rename YamlRuleConfigurationSwapperFixture with proxy module (#10744)
* Rename YamlRuleConfigurationFixture with proxy module
* Rename YamlRuleConfigurationSwapperFixture with proxy module
* Rename YamlRuleConfigurationSwapperFixture with proxy module
---
...guration.java => RuleConfigurationFixture.java} | 2 +-
...tion.java => YamlRuleConfigurationFixture.java} | 4 ++--
...va => YamlRuleConfigurationSwapperFixture.java} | 26 +++++++++++-----------
.../impl/StandardBootstrapInitializerTest.java | 10 ++++-----
...e.shardingsphere.infra.config.RuleConfiguration | 2 +-
...infra.yaml.swapper.YamlRuleConfigurationSwapper | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRuleConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixture.java
similarity index 94%
rename from
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRuleConfiguration.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixture.java
index acf6f56..7c8c8cd 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRuleConfiguration.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/RuleConfigurationFixture.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.config.RuleConfiguration;
@RequiredArgsConstructor
@Getter
-public final class FixtureRuleConfiguration implements RuleConfiguration {
+public final class RuleConfigurationFixture implements RuleConfiguration {
private final String name;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureYamlRuleConfiguration.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationFixture.java
similarity index 91%
rename from
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureYamlRuleConfiguration.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationFixture.java
index 75221b0..e817174 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureYamlRuleConfiguration.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationFixture.java
@@ -24,12 +24,12 @@ import
org.apache.shardingsphere.infra.yaml.config.YamlRuleConfiguration;
@Getter
@Setter
-public final class FixtureYamlRuleConfiguration implements
YamlRuleConfiguration {
+public final class YamlRuleConfigurationFixture implements
YamlRuleConfiguration {
private String name;
@Override
public Class<? extends RuleConfiguration> getRuleConfigurationType() {
- return FixtureRuleConfiguration.class;
+ return RuleConfigurationFixture.class;
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureConfigurationYamlSwapper.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationSwapperFixture.java
similarity index 67%
rename from
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureConfigurationYamlSwapper.java
rename to
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationSwapperFixture.java
index 87ee475..fcddff3 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureConfigurationYamlSwapper.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/YamlRuleConfigurationSwapperFixture.java
@@ -19,32 +19,32 @@ package org.apache.shardingsphere.proxy.fixture;
import
org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper;
-public final class FixtureConfigurationYamlSwapper implements
YamlRuleConfigurationSwapper<FixtureYamlRuleConfiguration,
FixtureRuleConfiguration> {
+public final class YamlRuleConfigurationSwapperFixture implements
YamlRuleConfigurationSwapper<YamlRuleConfigurationFixture,
RuleConfigurationFixture> {
@Override
- public String getRuleTagName() {
- return "FIXTURE";
+ public Class<RuleConfigurationFixture> getTypeClass() {
+ return RuleConfigurationFixture.class;
}
@Override
- public int getOrder() {
- return -1;
+ public YamlRuleConfigurationFixture swapToYamlConfiguration(final
RuleConfigurationFixture data) {
+ YamlRuleConfigurationFixture result = new
YamlRuleConfigurationFixture();
+ result.setName(data.getName());
+ return result;
}
@Override
- public Class<FixtureRuleConfiguration> getTypeClass() {
- return FixtureRuleConfiguration.class;
+ public RuleConfigurationFixture swapToObject(final
YamlRuleConfigurationFixture yamlConfig) {
+ return new RuleConfigurationFixture(yamlConfig.getName());
}
@Override
- public FixtureYamlRuleConfiguration swapToYamlConfiguration(final
FixtureRuleConfiguration data) {
- FixtureYamlRuleConfiguration result = new
FixtureYamlRuleConfiguration();
- result.setName(data.getName());
- return result;
+ public String getRuleTagName() {
+ return "FIXTURE";
}
@Override
- public FixtureRuleConfiguration swapToObject(final
FixtureYamlRuleConfiguration yamlConfig) {
- return new FixtureRuleConfiguration(yamlConfig.getName());
+ public int getOrder() {
+ return -1;
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
index 3f84346..a25b024 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
@@ -34,8 +34,8 @@ import
org.apache.shardingsphere.proxy.config.YamlProxyConfiguration;
import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
import
org.apache.shardingsphere.proxy.config.yaml.YamlProxyServerConfiguration;
-import org.apache.shardingsphere.proxy.fixture.FixtureRuleConfiguration;
-import org.apache.shardingsphere.proxy.fixture.FixtureYamlRuleConfiguration;
+import org.apache.shardingsphere.proxy.fixture.RuleConfigurationFixture;
+import org.apache.shardingsphere.proxy.fixture.YamlRuleConfigurationFixture;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.junit.Test;
@@ -83,7 +83,7 @@ public final class StandardBootstrapInitializerTest extends
AbstractBootstrapIni
}
private Collection<YamlRuleConfiguration> createYamlRuleConfigurations() {
- FixtureYamlRuleConfiguration result = new
FixtureYamlRuleConfiguration();
+ YamlRuleConfigurationFixture result = new
YamlRuleConfigurationFixture();
result.setName("testRule");
return Collections.singletonList(result);
}
@@ -155,8 +155,8 @@ public final class StandardBootstrapInitializerTest extends
AbstractBootstrapIni
}
private void assertRuleConfiguration(final RuleConfiguration actual) {
- assertThat(actual, instanceOf(FixtureRuleConfiguration.class));
- assertThat(((FixtureRuleConfiguration) actual).getName(),
is("testRule"));
+ assertThat(actual, instanceOf(RuleConfigurationFixture.class));
+ assertThat(((RuleConfigurationFixture) actual).getName(),
is("testRule"));
}
private void assertUsers(final ShardingSphereUsers actual) {
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.config.RuleConfiguration
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.config.RuleConfiguration
index ab31aa8..cc15380 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.config.RuleConfiguration
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.config.RuleConfiguration
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.fixture.FixtureRuleConfiguration
+org.apache.shardingsphere.proxy.fixture.RuleConfigurationFixture
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
index 4b11339..61ab4c8e 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapper
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.fixture.FixtureConfigurationYamlSwapper
+org.apache.shardingsphere.proxy.fixture.YamlRuleConfigurationSwapperFixture
