You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by yx...@apache.org on 2022/04/28 15:58:11 UTC
[shardingsphere] branch master updated: Rename StaticReadwriteSplittingDataSourceProcessor to ReadwriteSplittingStrategy (#17188)
This is an automated email from the ASF dual-hosted git repository.
yx9o 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 966722d74d5 Rename StaticReadwriteSplittingDataSourceProcessor to ReadwriteSplittingStrategy (#17188)
966722d74d5 is described below
commit 966722d74d53dc3e21762ba8ad894eb7aafafd41
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Apr 28 23:58:03 2022 +0800
Rename StaticReadwriteSplittingDataSourceProcessor to ReadwriteSplittingStrategy (#17188)
---
.../impl/ReadwriteSplittingDataSourceRouter.java | 2 +-
.../rule/ReadwriteSplittingDataSourceRule.java | 16 ++++++-------
.../rule/ReadwriteSplittingRule.java | 14 ++++++------
.../ReadwriteSplittingStrategy.java} | 6 ++---
.../ReadwriteSplittingStrategyFactory.java} | 26 +++++++++++-----------
.../type/DynamicReadwriteSplittingStrategy.java} | 8 +++----
.../type/StaticReadwriteSplittingStrategy.java} | 8 +++----
.../rule/ReadwriteSplittingRuleTest.java | 6 ++---
.../spring/boot/SpringBootStarterTest.java | 4 ++--
.../namespace/AbstractSpringNamespaceTest.java | 6 ++---
10 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
index b3f5721f6ee..d9042bb8fcc 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
@@ -43,7 +43,7 @@ public final class ReadwriteSplittingDataSourceRouter {
*/
public String route(final SQLStatementContext<?> sqlStatementContext) {
if (isPrimaryRoute(sqlStatementContext)) {
- return rule.getDataSourceProcessor().getWriteDataSource();
+ return rule.getReadwriteSplittingStrategy().getWriteDataSource();
}
if (1 == rule.getReadDataSourceNames().size()) {
return rule.getReadDataSourceNames().get(0);
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java
index e78cfd392c1..91754a9c76a 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java
@@ -24,8 +24,8 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.distsql.constant.ExportableConstants;
import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.spi.ReplicaLoadBalanceAlgorithm;
-import org.apache.shardingsphere.readwritesplitting.type.ReadwriteSplittingDataSourceProcessor;
-import org.apache.shardingsphere.readwritesplitting.type.ReadwriteSplittingDataSourceProcessorFactory;
+import org.apache.shardingsphere.readwritesplitting.strategy.ReadwriteSplittingStrategy;
+import org.apache.shardingsphere.readwritesplitting.strategy.ReadwriteSplittingStrategyFactory;
import java.util.Collection;
import java.util.HashSet;
@@ -45,7 +45,7 @@ public final class ReadwriteSplittingDataSourceRule {
private final ReplicaLoadBalanceAlgorithm loadBalancer;
- private final ReadwriteSplittingDataSourceProcessor dataSourceProcessor;
+ private final ReadwriteSplittingStrategy readwriteSplittingStrategy;
@Getter(AccessLevel.NONE)
private final Collection<String> disabledDataSourceNames = new HashSet<>();
@@ -54,7 +54,7 @@ public final class ReadwriteSplittingDataSourceRule {
Preconditions.checkArgument(!Strings.isNullOrEmpty(config.getName()), "Name is required.");
name = config.getName();
this.loadBalancer = loadBalancer;
- dataSourceProcessor = ReadwriteSplittingDataSourceProcessorFactory.newInstance(config.getType(), config.getProps());
+ readwriteSplittingStrategy = ReadwriteSplittingStrategyFactory.newInstance(config.getType(), config.getProps());
}
/**
@@ -63,7 +63,7 @@ public final class ReadwriteSplittingDataSourceRule {
* @return write data source name
*/
public String getWriteDataSource() {
- return dataSourceProcessor.getWriteDataSource();
+ return readwriteSplittingStrategy.getWriteDataSource();
}
/**
@@ -72,7 +72,7 @@ public final class ReadwriteSplittingDataSourceRule {
* @return available read data source names
*/
public List<String> getReadDataSourceNames() {
- return dataSourceProcessor.getReadDataSources().stream().filter(each -> !disabledDataSourceNames.contains(each)).collect(Collectors.toList());
+ return readwriteSplittingStrategy.getReadDataSources().stream().filter(each -> !disabledDataSourceNames.contains(each)).collect(Collectors.toList());
}
/**
@@ -97,11 +97,11 @@ public final class ReadwriteSplittingDataSourceRule {
*/
public Map<String, String> getDataSources(final boolean removeDisabled) {
Map<String, String> result = new LinkedHashMap<>(2, 1);
- String writeDataSourceName = dataSourceProcessor.getWriteDataSource();
+ String writeDataSourceName = readwriteSplittingStrategy.getWriteDataSource();
if (null != writeDataSourceName) {
result.put(ExportableConstants.PRIMARY_DATA_SOURCE_NAME, writeDataSourceName);
}
- List<String> readDataSourceNames = dataSourceProcessor.getReadDataSources();
+ List<String> readDataSourceNames = readwriteSplittingStrategy.getReadDataSources();
if (readDataSourceNames.isEmpty()) {
return result;
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
index d64543bed0d..e7e54f17e69 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
@@ -31,8 +31,8 @@ import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleCo
import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
import org.apache.shardingsphere.readwritesplitting.spi.ReplicaLoadBalanceAlgorithm;
-import org.apache.shardingsphere.readwritesplitting.type.impl.DynamicReadwriteSplittingDataSourceProcessor;
-import org.apache.shardingsphere.readwritesplitting.type.impl.StaticReadwriteSplittingDataSourceProcessor;
+import org.apache.shardingsphere.readwritesplitting.strategy.type.DynamicReadwriteSplittingStrategy;
+import org.apache.shardingsphere.readwritesplitting.strategy.type.StaticReadwriteSplittingStrategy;
import java.util.ArrayList;
import java.util.Collection;
@@ -101,7 +101,7 @@ public final class ReadwriteSplittingRule implements SchemaRule, DataSourceConta
public Map<String, Collection<String>> getDataSourceMapper() {
Map<String, Collection<String>> result = new HashMap<>();
for (Entry<String, ReadwriteSplittingDataSourceRule> entry : dataSourceRules.entrySet()) {
- result.put(entry.getValue().getName(), entry.getValue().getDataSourceProcessor().getAllDataSources());
+ result.put(entry.getValue().getName(), entry.getValue().getReadwriteSplittingStrategy().getAllDataSources());
}
return result;
}
@@ -129,7 +129,7 @@ public final class ReadwriteSplittingRule implements SchemaRule, DataSourceConta
private Map<String, Map<String, String>> exportDynamicDataSources() {
Map<String, Map<String, String>> result = new LinkedHashMap<>(dataSourceRules.size(), 1);
for (ReadwriteSplittingDataSourceRule each : dataSourceRules.values()) {
- if (each.getDataSourceProcessor() instanceof DynamicReadwriteSplittingDataSourceProcessor) {
+ if (each.getReadwriteSplittingStrategy() instanceof DynamicReadwriteSplittingStrategy) {
Map<String, String> dataSources = each.getDataSources(false);
if (!dataSources.isEmpty()) {
result.put(each.getName(), dataSources);
@@ -142,8 +142,8 @@ public final class ReadwriteSplittingRule implements SchemaRule, DataSourceConta
private Collection<String> exportAutoAwareDataSourceNames() {
Collection<String> result = new ArrayList<>();
for (ReadwriteSplittingDataSourceRule each : dataSourceRules.values()) {
- if (each.getDataSourceProcessor() instanceof DynamicReadwriteSplittingDataSourceProcessor) {
- result.add(((DynamicReadwriteSplittingDataSourceProcessor) each.getDataSourceProcessor()).getAutoAwareDataSourceName());
+ if (each.getReadwriteSplittingStrategy() instanceof DynamicReadwriteSplittingStrategy) {
+ result.add(((DynamicReadwriteSplittingStrategy) each.getReadwriteSplittingStrategy()).getAutoAwareDataSourceName());
}
}
return result;
@@ -152,7 +152,7 @@ public final class ReadwriteSplittingRule implements SchemaRule, DataSourceConta
private Map<String, Map<String, String>> exportStaticDataSources() {
Map<String, Map<String, String>> result = new LinkedHashMap<>(dataSourceRules.size(), 1);
for (ReadwriteSplittingDataSourceRule each : dataSourceRules.values()) {
- if (each.getDataSourceProcessor() instanceof StaticReadwriteSplittingDataSourceProcessor) {
+ if (each.getReadwriteSplittingStrategy() instanceof StaticReadwriteSplittingStrategy) {
Map<String, String> dataSources = each.getDataSources(true);
if (!dataSources.isEmpty()) {
result.put(each.getName(), dataSources);
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/ReadwriteSplittingDataSourceProcessor.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategy.java
similarity index 88%
rename from shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/ReadwriteSplittingDataSourceProcessor.java
rename to shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategy.java
index b0508c8275d..f12e8826e13 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/ReadwriteSplittingDataSourceProcessor.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategy.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.readwritesplitting.type;
+package org.apache.shardingsphere.readwritesplitting.strategy;
import java.util.Collection;
import java.util.List;
/**
- * Readwrite splitting data source processor.
+ * Readwrite splitting strategy.
*/
-public interface ReadwriteSplittingDataSourceProcessor {
+public interface ReadwriteSplittingStrategy {
/**
* Get write data source.
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/ReadwriteSplittingDataSourceProcessorFactory.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategyFactory.java
similarity index 63%
rename from shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/ReadwriteSplittingDataSourceProcessorFactory.java
rename to shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategyFactory.java
index df8d765448b..2f2731e1f0d 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/ReadwriteSplittingDataSourceProcessorFactory.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/ReadwriteSplittingStrategyFactory.java
@@ -15,47 +15,47 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.readwritesplitting.type;
+package org.apache.shardingsphere.readwritesplitting.strategy;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.readwritesplitting.type.impl.DynamicReadwriteSplittingDataSourceProcessor;
-import org.apache.shardingsphere.readwritesplitting.type.impl.StaticReadwriteSplittingDataSourceProcessor;
+import org.apache.shardingsphere.readwritesplitting.strategy.type.DynamicReadwriteSplittingStrategy;
+import org.apache.shardingsphere.readwritesplitting.strategy.type.StaticReadwriteSplittingStrategy;
import java.util.List;
import java.util.Properties;
/**
- * Readwrite splitting data source processor factory.
+ * Readwrite splitting strategy factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ReadwriteSplittingDataSourceProcessorFactory {
+public final class ReadwriteSplittingStrategyFactory {
/**
- * Create new instance of readwrite splitting data source processor.
+ * Create new instance of readwrite splitting strategy.
*
* @param type type of readwrite splitting method
- * @param props properties of readwrite splitting data source processor
- * @return readwrite splitting data source processor
+ * @param props properties of readwrite splitting strategy
+ * @return readwrite splitting strategy
*/
- public static ReadwriteSplittingDataSourceProcessor newInstance(final String type, final Properties props) {
+ public static ReadwriteSplittingStrategy newInstance(final String type, final Properties props) {
return "STATIC".equalsIgnoreCase(type) ? createStaticDataSourceProcessor(props) : createDynamicDataSourceProcessor(props);
}
- private static StaticReadwriteSplittingDataSourceProcessor createStaticDataSourceProcessor(final Properties props) {
+ private static StaticReadwriteSplittingStrategy createStaticDataSourceProcessor(final Properties props) {
String writeDataSourceName = props.getProperty("write-data-source-name");
Preconditions.checkArgument(!Strings.isNullOrEmpty(writeDataSourceName), "Write data source name is required.");
Preconditions.checkArgument(!Strings.isNullOrEmpty(props.getProperty("read-data-source-names")), "Read data source names are required.");
List<String> readDataSourceNames = Splitter.on(",").trimResults().splitToList(props.getProperty("read-data-source-names"));
- return new StaticReadwriteSplittingDataSourceProcessor(writeDataSourceName, readDataSourceNames);
+ return new StaticReadwriteSplittingStrategy(writeDataSourceName, readDataSourceNames);
}
- private static DynamicReadwriteSplittingDataSourceProcessor createDynamicDataSourceProcessor(final Properties props) {
+ private static DynamicReadwriteSplittingStrategy createDynamicDataSourceProcessor(final Properties props) {
String autoAwareDataSourceName = props.getProperty("auto-aware-data-source-name");
Preconditions.checkArgument(!Strings.isNullOrEmpty(autoAwareDataSourceName), "Auto aware data source name is required.");
- return new DynamicReadwriteSplittingDataSourceProcessor(autoAwareDataSourceName);
+ return new DynamicReadwriteSplittingStrategy(autoAwareDataSourceName);
}
}
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/impl/DynamicReadwriteSplittingDataSourceProcessor.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategy.java
similarity index 88%
rename from shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/impl/DynamicReadwriteSplittingDataSourceProcessor.java
rename to shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategy.java
index 91bee49ffb6..ddaa0198f87 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/impl/DynamicReadwriteSplittingDataSourceProcessor.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/DynamicReadwriteSplittingStrategy.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.readwritesplitting.type.impl;
+package org.apache.shardingsphere.readwritesplitting.strategy.type;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.aware.DataSourceNameAware;
import org.apache.shardingsphere.infra.aware.DataSourceNameAwareFactory;
-import org.apache.shardingsphere.readwritesplitting.type.ReadwriteSplittingDataSourceProcessor;
+import org.apache.shardingsphere.readwritesplitting.strategy.ReadwriteSplittingStrategy;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,11 +31,11 @@ import java.util.List;
import java.util.Optional;
/**
- * Dynamic readwrite splitting data source processor.
+ * Dynamic readwrite splitting strategy.
*/
@RequiredArgsConstructor
@Getter
-public final class DynamicReadwriteSplittingDataSourceProcessor implements ReadwriteSplittingDataSourceProcessor {
+public final class DynamicReadwriteSplittingStrategy implements ReadwriteSplittingStrategy {
private final String autoAwareDataSourceName;
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/impl/StaticReadwriteSplittingDataSourceProcessor.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/StaticReadwriteSplittingStrategy.java
similarity index 82%
rename from shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/impl/StaticReadwriteSplittingDataSourceProcessor.java
rename to shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/StaticReadwriteSplittingStrategy.java
index 44f709c903a..0e530efaff7 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/type/impl/StaticReadwriteSplittingDataSourceProcessor.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/strategy/type/StaticReadwriteSplittingStrategy.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.readwritesplitting.type.impl;
+package org.apache.shardingsphere.readwritesplitting.strategy.type;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.readwritesplitting.type.ReadwriteSplittingDataSourceProcessor;
+import org.apache.shardingsphere.readwritesplitting.strategy.ReadwriteSplittingStrategy;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
/**
- * Static readwrite splitting data source processor.
+ * Static readwrite splitting strategy.
*/
@RequiredArgsConstructor
-public final class StaticReadwriteSplittingDataSourceProcessor implements ReadwriteSplittingDataSourceProcessor {
+public final class StaticReadwriteSplittingStrategy implements ReadwriteSplittingStrategy {
private final String writeDataSourceName;
diff --git a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
index e4c16414a11..1848b1367f0 100644
--- a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
+++ b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRuleTest.java
@@ -68,9 +68,9 @@ public final class ReadwriteSplittingRuleTest {
private void assertDataSourceRule(final ReadwriteSplittingDataSourceRule actual) {
assertThat(actual.getName(), is("test_pr"));
- assertNotNull(actual.getDataSourceProcessor().getWriteDataSource());
- assertThat(actual.getDataSourceProcessor().getWriteDataSource(), is("write_ds"));
- assertThat(actual.getDataSourceProcessor().getReadDataSources(), is(Arrays.asList("read_ds_0", "read_ds_1")));
+ assertNotNull(actual.getReadwriteSplittingStrategy().getWriteDataSource());
+ assertThat(actual.getReadwriteSplittingStrategy().getWriteDataSource(), is("write_ds"));
+ assertThat(actual.getReadwriteSplittingStrategy().getReadDataSources(), is(Arrays.asList("read_ds_0", "read_ds_1")));
assertThat(actual.getLoadBalancer().getType(), is("RANDOM"));
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
index f6e724356fd..21202f9df31 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.datanode.DataNodeUtil;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
-import org.apache.shardingsphere.readwritesplitting.type.impl.StaticReadwriteSplittingDataSourceProcessor;
+import org.apache.shardingsphere.readwritesplitting.strategy.type.StaticReadwriteSplittingStrategy;
import org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReplicaLoadBalanceAlgorithm;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceRule;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
@@ -123,7 +123,7 @@ public class SpringBootStarterTest {
assertThat(actual.getDataSourceMapper(), is(Collections.singletonMap("readwrite_ds", Arrays.asList("write_ds", "read_ds_0", "read_ds_1"))));
ReadwriteSplittingDataSourceRule dataSourceRule = actual.getSingleDataSourceRule();
assertThat(dataSourceRule.getName(), is("readwrite_ds"));
- StaticReadwriteSplittingDataSourceProcessor staticReadwriteSplittingType = (StaticReadwriteSplittingDataSourceProcessor) dataSourceRule.getDataSourceProcessor();
+ StaticReadwriteSplittingStrategy staticReadwriteSplittingType = (StaticReadwriteSplittingStrategy) dataSourceRule.getReadwriteSplittingStrategy();
assertThat(staticReadwriteSplittingType.getWriteDataSource(), is("write_ds"));
assertThat(staticReadwriteSplittingType.getReadDataSources(), is(Arrays.asList("read_ds_0", "read_ds_1")));
assertThat(dataSourceRule.getLoadBalancer(), instanceOf(RandomReplicaLoadBalanceAlgorithm.class));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java
index 52cf032c281..a3e78d39e37 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
-import org.apache.shardingsphere.readwritesplitting.type.impl.StaticReadwriteSplittingDataSourceProcessor;
+import org.apache.shardingsphere.readwritesplitting.strategy.type.StaticReadwriteSplittingStrategy;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.spring.transaction.TransactionTypeScanner;
@@ -86,10 +86,10 @@ public abstract class AbstractSpringNamespaceTest extends AbstractJUnit4SpringCo
private void assertReadwriteSplittingRule(final ReadwriteSplittingRule actual) {
assertTrue(actual.findDataSourceRule("ds_0").isPresent());
- StaticReadwriteSplittingDataSourceProcessor readwriteSplittingType = (StaticReadwriteSplittingDataSourceProcessor) actual.findDataSourceRule("ds_0").get().getDataSourceProcessor();
+ StaticReadwriteSplittingStrategy readwriteSplittingType = (StaticReadwriteSplittingStrategy) actual.findDataSourceRule("ds_0").get().getReadwriteSplittingStrategy();
assertThat(readwriteSplittingType.getReadDataSources(), is(Arrays.asList("ds_0_read_0", "ds_0_read_1")));
assertTrue(actual.findDataSourceRule("ds_1").isPresent());
- readwriteSplittingType = (StaticReadwriteSplittingDataSourceProcessor) actual.findDataSourceRule("ds_1").get().getDataSourceProcessor();
+ readwriteSplittingType = (StaticReadwriteSplittingStrategy) actual.findDataSourceRule("ds_1").get().getReadwriteSplittingStrategy();
assertThat(readwriteSplittingType.getReadDataSources(), is(Arrays.asList("ds_1_read_0", "ds_1_read_1")));
}