You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/09/23 22:58:41 UTC
[shardingsphere] branch master updated: Rename
PrimaryReplicaReplication in code - part 2 (#7582)
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 a0d6901 Rename PrimaryReplicaReplication in code - part 2 (#7582)
a0d6901 is described below
commit a0d6901ac45bf4c02a20e6c8fbbfec618af58ab1
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Sep 24 06:58:16 2020 +0800
Rename PrimaryReplicaReplication in code - part 2 (#7582)
---
.../PrimaryReplicaReplicationRouteDecorator.java | 6 +--
.../governance/core/config/ConfigCenterTest.java | 50 +++++++++++-----------
.../config/listener/SchemaChangedListenerTest.java | 38 ++++++++--------
.../data-primary-replica-replication-rule.yaml} | 0
....yaml => primary-replica-replication-rule.yaml} | 0
.../schema/GovernanceSchemaContextsTest.java | 6 +--
.../infra/database/type/DatabaseTypesTest.java | 2 +-
...DataSourceForPrimaryReplicaReplicationTest.java | 2 +-
.../connection/ShardingSphereConnectionTest.java | 18 ++++----
.../datasource/ShardingSphereDataSourceTest.java | 14 +++---
...ryReplicaReplicationPreparedStatementTest.java} | 8 ++--
...=> PrimaryReplicaReplicationStatementTest.java} | 6 +--
...ancePrimaryReplicaReplicationIntegrateTest.java | 10 ++---
...ithPrimaryReplicaReplicationIntegrateTest.java} | 4 +-
...maryReplicaReplicationDataSourceWithProps.yaml} | 0
...yReplicaReplicationDataSourceWithoutProps.yaml} | 0
.../shardingsphere/spring/SpringNamespaceTest.java | 12 +++---
.../META-INF/spring/application-context.xml | 12 +++---
...ancePrimaryReplicaReplicationNamespaceTest.java | 50 +++++++++++-----------
...dingPrimaryReplicaReplicationNamespaceTest.java | 4 +-
.../rdb/primary-replica-replication-governance.xml | 8 ++--
...ding-primary-replica-replication-governance.xml | 4 +-
.../proxy/config/ProxyConfigurationLoaderTest.java | 6 +--
23 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/PrimaryReplicaReplicationRouteDecorator.java b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/PrimaryReplicaReplicationRouteDecorator.java
index 49cd495..a5c4e75 100644
--- a/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/PrimaryReplicaReplicationRouteDecorator.java
+++ b/shardingsphere-features/shardingsphere-primary-replica-replication/shardingsphere-primary-replica-replication-route/src/main/java/org/apache/shardingsphere/replication/primaryreplica/route/engine/PrimaryReplicaReplicationRouteDecorator.java
@@ -42,9 +42,9 @@ import java.util.Optional;
public final class PrimaryReplicaReplicationRouteDecorator implements RouteDecorator<PrimaryReplicaReplicationRule> {
@Override
- public RouteContext decorate(final RouteContext routeContext, final ShardingSphereMetaData metaData, final PrimaryReplicaReplicationRule masterSlaveRule, final ConfigurationProperties props) {
+ public RouteContext decorate(final RouteContext routeContext, final ShardingSphereMetaData metaData, final PrimaryReplicaReplicationRule rule, final ConfigurationProperties props) {
if (routeContext.getRouteResult().getRouteUnits().isEmpty()) {
- String dataSourceName = new PrimaryReplicaReplicationDataSourceRouter(masterSlaveRule.getSingleDataSourceRule()).route(routeContext.getSqlStatementContext().getSqlStatement());
+ String dataSourceName = new PrimaryReplicaReplicationDataSourceRouter(rule.getSingleDataSourceRule()).route(routeContext.getSqlStatementContext().getSqlStatement());
RouteResult routeResult = new RouteResult();
routeResult.getRouteUnits().add(new RouteUnit(new RouteMapper(DefaultSchema.LOGIC_NAME, dataSourceName), Collections.emptyList()));
return new RouteContext(routeContext, routeResult, new DefaultRouteStageContext(), getTypeClass());
@@ -53,7 +53,7 @@ public final class PrimaryReplicaReplicationRouteDecorator implements RouteDecor
Collection<RouteUnit> toBeAdded = new LinkedList<>();
for (RouteUnit each : routeContext.getRouteResult().getRouteUnits()) {
String dataSourceName = each.getDataSourceMapper().getLogicName();
- Optional<PrimaryReplicaReplicationDataSourceRule> dataSourceRule = masterSlaveRule.findDataSourceRule(dataSourceName);
+ Optional<PrimaryReplicaReplicationDataSourceRule> dataSourceRule = rule.findDataSourceRule(dataSourceName);
if (dataSourceRule.isPresent() && dataSourceRule.get().getName().equalsIgnoreCase(each.getDataSourceMapper().getActualName())) {
toBeRemoved.add(each);
String actualDataSourceName = new PrimaryReplicaReplicationDataSourceRouter(dataSourceRule.get()).route(routeContext.getSqlStatementContext().getSqlStatement());
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java
index 36a172a..082af2b 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/ConfigCenterTest.java
@@ -80,7 +80,7 @@ public final class ConfigCenterTest {
private static final String SHARDING_AND_ENCRYPT_RULE_YAML = "yaml/configCenter/data-sharding-encrypt-rule.yaml";
- private static final String MASTER_SLAVE_RULE_YAML = "yaml/configCenter/data-master-slave-rule.yaml";
+ private static final String PRIMARY_REPLICA_REPLICATION_RULE_YAML = "yaml/configCenter/data-primary-replica-replication-rule.yaml";
private static final String ENCRYPT_RULE_YAML = "yaml/configCenter/data-encrypt-rule.yaml";
@@ -136,27 +136,27 @@ public final class ConfigCenterTest {
}
@Test
- public void assertPersistConfigurationForMasterSlaveRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
+ public void assertPersistConfigurationForPrimaryReplicaReplicationRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
- configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), false);
+ configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createPrimaryReplicaReplicationRuleConfiguration(), false);
verify(configurationRepository).persist(eq("/schemas/sharding_db/datasource"), ArgumentMatchers.any());
verify(configurationRepository).persist(eq("/schemas/sharding_db/rule"), ArgumentMatchers.any());
}
@Test
- public void assertPersistConfigurationForMasterSlaveRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
+ public void assertPersistConfigurationForPrimaryReplicaReplicationRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
- configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), false);
+ configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createPrimaryReplicaReplicationRuleConfiguration(), false);
verify(configurationRepository).persist(eq("/schemas/sharding_db/datasource"), ArgumentMatchers.any());
verify(configurationRepository).persist(eq("/schemas/sharding_db/rule"), ArgumentMatchers.any());
}
@Test
- public void assertPersistConfigurationForMasterSlaveRuleWithoutAuthenticationAndIsOverwrite() {
+ public void assertPersistConfigurationForPrimaryReplicaReplicationRuleWithoutAuthenticationAndIsOverwrite() {
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
- configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), true);
+ configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createPrimaryReplicaReplicationRuleConfiguration(), true);
verify(configurationRepository).persist(eq("/schemas/sharding_db/datasource"), ArgumentMatchers.any());
- verify(configurationRepository, times(0)).persist("/schemas/sharding_db/rule", readYAML(MASTER_SLAVE_RULE_YAML));
+ verify(configurationRepository, times(0)).persist("/schemas/sharding_db/rule", readYAML(PRIMARY_REPLICA_REPLICATION_RULE_YAML));
}
@Test
@@ -184,27 +184,27 @@ public final class ConfigCenterTest {
}
@Test
- public void assertPersistConfigurationForMasterSlaveRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
+ public void assertPersistConfigurationForPrimaryReplicaReplicationRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
- configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), false);
+ configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createPrimaryReplicaReplicationRuleConfiguration(), false);
verify(configurationRepository).persist(eq("/schemas/sharding_db/datasource"), ArgumentMatchers.any());
verify(configurationRepository).persist(eq("/schemas/sharding_db/rule"), ArgumentMatchers.any());
}
@Test
- public void assertPersistConfigurationForMasterSlaveRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
+ public void assertPersistConfigurationForPrimaryReplicaReplicationRuleWithAuthenticationAndIsNotOverwriteAndConfigurationIsNotExisted() {
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
- configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), false);
+ configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createPrimaryReplicaReplicationRuleConfiguration(), false);
verify(configurationRepository).persist(eq("/schemas/sharding_db/datasource"), ArgumentMatchers.any());
verify(configurationRepository).persist(eq("/schemas/sharding_db/rule"), ArgumentMatchers.any());
}
@Test
- public void assertPersistConfigurationForMasterSlaveRuleWithAuthenticationAndIsOverwrite() {
+ public void assertPersistConfigurationForPrimaryReplicaReplicationRuleWithAuthenticationAndIsOverwrite() {
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
- configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), true);
+ configCenter.persistConfigurations("sharding_db", createDataSourceConfigurations(), createPrimaryReplicaReplicationRuleConfiguration(), true);
verify(configurationRepository).persist(eq("/schemas/sharding_db/datasource"), ArgumentMatchers.any());
- verify(configurationRepository, times(0)).persist("/schemas/sharding_db/rule", readYAML(MASTER_SLAVE_RULE_YAML));
+ verify(configurationRepository, times(0)).persist("/schemas/sharding_db/rule", readYAML(PRIMARY_REPLICA_REPLICATION_RULE_YAML));
}
@Test
@@ -265,8 +265,8 @@ public final class ConfigCenterTest {
return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(readYAML(SHARDING_RULE_YAML), YamlRootRuleConfigurations.class).getRules());
}
- private Collection<RuleConfiguration> createMasterSlaveRuleConfiguration() {
- return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(readYAML(MASTER_SLAVE_RULE_YAML), YamlRootRuleConfigurations.class).getRules());
+ private Collection<RuleConfiguration> createPrimaryReplicaReplicationRuleConfiguration() {
+ return new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(YamlEngine.unmarshal(readYAML(PRIMARY_REPLICA_REPLICATION_RULE_YAML), YamlRootRuleConfigurations.class).getRules());
}
private Collection<RuleConfiguration> createEncryptRuleConfiguration() {
@@ -345,14 +345,14 @@ public final class ConfigCenterTest {
}
@Test
- public void assertLoadMasterSlaveRuleConfiguration() {
- when(configurationRepository.get("/schemas/sharding_db/rule")).thenReturn(readYAML(MASTER_SLAVE_RULE_YAML));
+ public void assertLoadPrimaryReplicaReplicationRuleConfiguration() {
+ when(configurationRepository.get("/schemas/sharding_db/rule")).thenReturn(readYAML(PRIMARY_REPLICA_REPLICATION_RULE_YAML));
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
Collection<RuleConfiguration> actual = configCenter.loadRuleConfigurations("sharding_db");
- PrimaryReplicaReplicationRuleConfiguration masterSlaveRuleConfiguration = (PrimaryReplicaReplicationRuleConfiguration) actual.iterator().next();
- assertThat(masterSlaveRuleConfiguration.getDataSources().size(), is(1));
- assertThat(masterSlaveRuleConfiguration.getDataSources().iterator().next().getPrimaryDataSourceName(), is("primary_ds"));
- assertThat(masterSlaveRuleConfiguration.getDataSources().iterator().next().getReplicaDataSourceNames().size(), is(2));
+ PrimaryReplicaReplicationRuleConfiguration config = (PrimaryReplicaReplicationRuleConfiguration) actual.iterator().next();
+ assertThat(config.getDataSources().size(), is(1));
+ assertThat(config.getDataSources().iterator().next().getPrimaryDataSourceName(), is("primary_ds"));
+ assertThat(config.getDataSources().iterator().next().getReplicaDataSourceNames().size(), is(2));
}
@Test
@@ -395,12 +395,12 @@ public final class ConfigCenterTest {
@Test
public void assertGetAllSchemaNames() {
- when(configurationRepository.get("/schemas")).thenReturn("sharding_db,masterslave_db");
+ when(configurationRepository.get("/schemas")).thenReturn("sharding_db,primary_replica_replication_db");
ConfigCenter configCenter = new ConfigCenter(configurationRepository);
Collection<String> actual = configCenter.getAllSchemaNames();
assertThat(actual.size(), is(2));
assertThat(actual, hasItems("sharding_db"));
- assertThat(actual, hasItems("masterslave_db"));
+ assertThat(actual, hasItems("primary_replica_replication_db"));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java
index de2ad20..22173ce 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java
@@ -59,7 +59,7 @@ public final class SchemaChangedListenerTest {
private static final String SHARDING_RULE_FILE = "yaml/sharding-rule.yaml";
- private static final String MASTER_SLAVE_RULE_FILE = "yaml/master-slave-rule.yaml";
+ private static final String PRIMARY_REPLICA_REPLICATION_RULE_FILE = "yaml/primary-replica-replication-rule.yaml";
private static final String ENCRYPT_RULE_FILE = "yaml/encrypt-rule.yaml";
@@ -72,7 +72,7 @@ public final class SchemaChangedListenerTest {
@Before
public void setUp() {
- schemaChangedListener = new SchemaChangedListener(configurationRepository, Arrays.asList("sharding_db", "masterslave_db", "encrypt_db"));
+ schemaChangedListener = new SchemaChangedListener(configurationRepository, Arrays.asList("sharding_db", "primary_replica_replication_db", "encrypt_db"));
}
@Test
@@ -104,16 +104,16 @@ public final class SchemaChangedListenerTest {
}
@Test
- public void assertCreateMasterSlaveRuleChangedEventForExistedSchema() {
- String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
- DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/masterslave_db/rule", masterSlaveRule, ChangedType.UPDATED);
+ public void assertCreatePrimaryReplicaReplicationRuleChangedEventForExistedSchema() {
+ String rule = readYAML(PRIMARY_REPLICA_REPLICATION_RULE_FILE);
+ DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/primary_replica_replication_db/rule", rule, ChangedType.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
RuleConfigurationsChangedEvent event = (RuleConfigurationsChangedEvent) actual.get();
- assertThat(event.getSchemaName(), is("masterslave_db"));
+ assertThat(event.getSchemaName(), is("primary_replica_replication_db"));
assertThat(event.getRuleConfigurations().iterator().next(), instanceOf(PrimaryReplicaReplicationRuleConfiguration.class));
- PrimaryReplicaReplicationRuleConfiguration masterSlaveRuleConfig = (PrimaryReplicaReplicationRuleConfiguration) event.getRuleConfigurations().iterator().next();
- assertThat(masterSlaveRuleConfig.getDataSources().iterator().next().getPrimaryDataSourceName(), is("primary_ds"));
+ PrimaryReplicaReplicationRuleConfiguration ruleConfig = (PrimaryReplicaReplicationRuleConfiguration) event.getRuleConfigurations().iterator().next();
+ assertThat(ruleConfig.getDataSources().iterator().next().getPrimaryDataSourceName(), is("primary_ds"));
}
@Test
@@ -156,12 +156,12 @@ public final class SchemaChangedListenerTest {
}
@Test
- public void assertCreateMasterSlaveSchemaAddedEventForNewSchema() {
+ public void assertCreatePrimaryReplicaReplicationSchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
- String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
- when(configurationRepository.get("/schemas/logic_db/rule")).thenReturn(masterSlaveRule);
+ String rule = readYAML(PRIMARY_REPLICA_REPLICATION_RULE_FILE);
+ when(configurationRepository.get("/schemas/logic_db/rule")).thenReturn(rule);
when(configurationRepository.get("/schemas/logic_db/datasource")).thenReturn(dataSource);
- when(configurationRepository.get("/schemas/logic_db/rule")).thenReturn(masterSlaveRule);
+ when(configurationRepository.get("/schemas/logic_db/rule")).thenReturn(rule);
when(configurationRepository.get("/schemas/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/datasource", dataSource, ChangedType.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
@@ -235,12 +235,12 @@ public final class SchemaChangedListenerTest {
}
@Test
- public void assertCreateAddedEventWithMasterSlaveRuleConfigurationForNewSchema() {
+ public void assertCreateAddedEventWithPrimaryReplicaReplicationRuleConfigurationForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
- String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
- when(configurationRepository.get("/schemas/logic_db/rule")).thenReturn(masterSlaveRule);
+ String rule = readYAML(PRIMARY_REPLICA_REPLICATION_RULE_FILE);
+ when(configurationRepository.get("/schemas/logic_db/rule")).thenReturn(rule);
when(configurationRepository.get("/schemas/logic_db/datasource")).thenReturn(dataSource);
- DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", masterSlaveRule, ChangedType.UPDATED);
+ DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas/logic_db/rule", rule, ChangedType.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getRuleConfigurations().iterator().next(), instanceOf(PrimaryReplicaReplicationRuleConfiguration.class));
@@ -248,7 +248,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForAdd() {
- DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,masterslave_db,encrypt_db,shadow_db", ChangedType.UPDATED);
+ DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,primary_replica_replication_db,encrypt_db,shadow_db", ChangedType.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaAddedEvent) actual.get()).getSchemaName(), is("shadow_db"));
@@ -256,7 +256,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForDelete() {
- DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,masterslave_db", ChangedType.UPDATED);
+ DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,primary_replica_replication_db", ChangedType.UPDATED);
Optional<GovernanceEvent> actual = schemaChangedListener.createGovernanceEvent(dataChangedEvent);
assertTrue(actual.isPresent());
assertThat(((SchemaDeletedEvent) actual.get()).getSchemaName(), is("encrypt_db"));
@@ -264,7 +264,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForIgnore() {
- DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,masterslave_db,encrypt_db", ChangedType.UPDATED);
+ DataChangedEvent dataChangedEvent = new DataChangedEvent("/schemas", "sharding_db,primary_replica_replication_db,encrypt_db", ChangedType.UPDATED);
assertFalse(schemaChangedListener.createGovernanceEvent(dataChangedEvent).isPresent());
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/master-slave-rule.yaml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-primary-replica-replication-rule.yaml
similarity index 100%
rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/master-slave-rule.yaml
rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-primary-replica-replication-rule.yaml
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-master-slave-rule.yaml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/primary-replica-replication-rule.yaml
similarity index 100%
rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-master-slave-rule.yaml
rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/primary-replica-replication-rule.yaml
diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java
index d964999..70bacab 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java
@@ -90,7 +90,7 @@ public final class GovernanceSchemaContextsTest {
private SchemaContext schemaContext;
@Mock
- private PrimaryReplicaReplicationRule masterSlaveRule;
+ private PrimaryReplicaReplicationRule primaryReplicaReplicationRule;
private Authentication authentication = new Authentication();
@@ -117,7 +117,7 @@ public final class GovernanceSchemaContextsTest {
when(schemaContext.getSchema()).thenReturn(shardingSphereSchema);
when(schemaContext.getRuntimeContext()).thenReturn(runtimeContext);
when(shardingSphereSchema.getMetaData()).thenReturn(shardingSphereMetaData);
- when(shardingSphereSchema.getRules()).thenReturn(Collections.singletonList(masterSlaveRule));
+ when(shardingSphereSchema.getRules()).thenReturn(Collections.singletonList(primaryReplicaReplicationRule));
return Collections.singletonMap("schema", schemaContext);
}
@@ -220,7 +220,7 @@ public final class GovernanceSchemaContextsTest {
public void assertDisableStateChanged() {
DisabledStateChangedEvent event = new DisabledStateChangedEvent(new GovernanceSchema("schema.ds_0"), true);
governanceSchemaContexts.renew(event);
- verify(masterSlaveRule, times(2)).updateRuleStatus(any(RuleChangedEvent.class));
+ verify(primaryReplicaReplicationRule, times(2)).updateRuleStatus(any(RuleChangedEvent.class));
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypesTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypesTest.java
index 3c4e1b0..b3ee961 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypesTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/database/type/DatabaseTypesTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat;
public final class DatabaseTypesTest {
@Test
- public void assertGetTrunkDatabaseTypeNameWithMasterDatabaseType() {
+ public void assertGetTrunkDatabaseTypeNameWithTrunkDatabaseType() {
assertThat(DatabaseTypes.getTrunkDatabaseTypeName(new MySQLDatabaseType()), is("MySQL"));
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest.java
index 1e2c5cb..b253bbe 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/common/base/AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest.java
@@ -57,7 +57,7 @@ public abstract class AbstractShardingSphereDataSourceForPrimaryReplicaReplicati
AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest.class.getClassLoader().getResource(fileName), "file resource `%s` must not be null.", fileName).getFile());
}
- protected final ShardingSphereDataSource getMasterSlaveDataSource() {
+ protected final ShardingSphereDataSource getPrimaryReplicaReplicationDataSource() {
return dataSource;
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
index fc5ce47..172d999 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
@@ -138,16 +138,16 @@ public final class ShardingSphereConnectionTest {
@Test
public void assertIsValid() throws SQLException {
- Connection masterConnection = mock(Connection.class);
- Connection upSlaveConnection = mock(Connection.class);
- Connection downSlaveConnection = mock(Connection.class);
- when(masterConnection.isValid(anyInt())).thenReturn(true);
- when(upSlaveConnection.isValid(anyInt())).thenReturn(true);
- when(downSlaveConnection.isValid(anyInt())).thenReturn(false);
- connection.getCachedConnections().put("test_master", masterConnection);
- connection.getCachedConnections().put("test_replica_up", upSlaveConnection);
+ Connection primaryConnection = mock(Connection.class);
+ Connection upReplicaConnection = mock(Connection.class);
+ Connection downReplicaConnection = mock(Connection.class);
+ when(primaryConnection.isValid(anyInt())).thenReturn(true);
+ when(upReplicaConnection.isValid(anyInt())).thenReturn(true);
+ when(downReplicaConnection.isValid(anyInt())).thenReturn(false);
+ connection.getCachedConnections().put("test_primary", primaryConnection);
+ connection.getCachedConnections().put("test_replica_up", upReplicaConnection);
assertTrue(connection.isValid(0));
- connection.getCachedConnections().put("test_replica_down", downSlaveConnection);
+ connection.getCachedConnections().put("test_replica_down", downReplicaConnection);
assertFalse(connection.isValid(0));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
index 1a3b954..7cc8b21 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
@@ -84,17 +84,17 @@ public final class ShardingSphereDataSourceTest {
}
@Test
- public void assertGetDatabaseProductNameForMasterSlave() throws SQLException {
+ public void assertGetDatabaseProductNameForPrimaryReplicaReplication() throws SQLException {
DataSource dataSource1 = mockDataSource(DatabaseTypes.getActualDatabaseType("H2"));
- DataSource masterDataSource = mockDataSource(DatabaseTypes.getActualDatabaseType("H2"));
- DataSource slaveDataSource = mockDataSource(DatabaseTypes.getActualDatabaseType("H2"));
+ DataSource primaryDataSource = mockDataSource(DatabaseTypes.getActualDatabaseType("H2"));
+ DataSource replicaDataSource = mockDataSource(DatabaseTypes.getActualDatabaseType("H2"));
DataSource dataSource3 = mockDataSource(DatabaseTypes.getActualDatabaseType("H2"));
Map<String, DataSource> dataSourceMap = new HashMap<>(4, 1);
dataSourceMap.put("ds1", dataSource1);
- dataSourceMap.put("masterDataSource", masterDataSource);
- dataSourceMap.put("slaveDataSource", slaveDataSource);
+ dataSourceMap.put("primaryDataSource", primaryDataSource);
+ dataSourceMap.put("replicaDataSource", replicaDataSource);
dataSourceMap.put("ds3", dataSource3);
- assertDatabaseProductName(dataSourceMap, dataSource1.getConnection(), masterDataSource.getConnection(), slaveDataSource.getConnection());
+ assertDatabaseProductName(dataSourceMap, dataSource1.getConnection(), primaryDataSource.getConnection(), replicaDataSource.getConnection());
}
private void assertDatabaseProductName(final Map<String, DataSource> dataSourceMap, final Connection... connections) throws SQLException {
@@ -185,7 +185,7 @@ public final class ShardingSphereDataSourceTest {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
List<String> orderActualDataNodes = new LinkedList<>();
for (String each : dataSourceMap.keySet()) {
- orderActualDataNodes.add(each + ".table_${0..2}");
+ orderActualDataNodes.add(String.format("%s.table_${0..2}", each));
}
ShardingTableRuleConfiguration tableRuleConfig = new ShardingTableRuleConfiguration("logicTable", Joiner.on(",").join(orderActualDataNodes));
result.getTables().add(tableRuleConfig);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/MasterSlavePreparedStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/PrimaryReplicaReplicationPreparedStatementTest.java
similarity index 74%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/MasterSlavePreparedStatementTest.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/PrimaryReplicaReplicationPreparedStatementTest.java
index 43eb9ff..afa382a 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/MasterSlavePreparedStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/PrimaryReplicaReplicationPreparedStatementTest.java
@@ -26,25 +26,25 @@ import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class MasterSlavePreparedStatementTest extends AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest {
+public final class PrimaryReplicaReplicationPreparedStatementTest extends AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest {
@Test(expected = SQLException.class)
public void assertQueryWithNull() throws SQLException {
- try (PreparedStatement preparedStatement = getMasterSlaveDataSource().getConnection().prepareStatement(null)) {
+ try (PreparedStatement preparedStatement = getPrimaryReplicaReplicationDataSource().getConnection().prepareStatement(null)) {
preparedStatement.executeQuery();
}
}
@Test(expected = SQLException.class)
public void assertQueryWithEmptyString() throws SQLException {
- try (PreparedStatement preparedStatement = getMasterSlaveDataSource().getConnection().prepareStatement("")) {
+ try (PreparedStatement preparedStatement = getPrimaryReplicaReplicationDataSource().getConnection().prepareStatement("")) {
preparedStatement.executeQuery();
}
}
@Test
public void assertGetParameterMetaData() throws SQLException {
- try (PreparedStatement preparedStatement = getMasterSlaveDataSource().getConnection().prepareStatement("SELECT * FROM t_global where id = ?")) {
+ try (PreparedStatement preparedStatement = getPrimaryReplicaReplicationDataSource().getConnection().prepareStatement("SELECT * FROM t_global where id = ?")) {
assertThat(preparedStatement.getParameterMetaData().getParameterCount(), is(1));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/MasterSlaveStatementTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/PrimaryReplicaReplicationStatementTest.java
similarity index 79%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/MasterSlaveStatementTest.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/PrimaryReplicaReplicationStatementTest.java
index 6c6383a..e680479 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/MasterSlaveStatementTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/PrimaryReplicaReplicationStatementTest.java
@@ -23,18 +23,18 @@ import org.junit.Test;
import java.sql.SQLException;
import java.sql.Statement;
-public final class MasterSlaveStatementTest extends AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest {
+public final class PrimaryReplicaReplicationStatementTest extends AbstractShardingSphereDataSourceForPrimaryReplicaReplicationTest {
@Test(expected = SQLException.class)
public void assertQueryWithNull() throws SQLException {
- try (Statement statement = getMasterSlaveDataSource().getConnection().createStatement()) {
+ try (Statement statement = getPrimaryReplicaReplicationDataSource().getConnection().createStatement()) {
statement.executeQuery(null);
}
}
@Test(expected = SQLException.class)
public void assertQueryWithEmptyString() throws SQLException {
- try (Statement statement = getMasterSlaveDataSource().getConnection().createStatement()) {
+ try (Statement statement = getPrimaryReplicaReplicationDataSource().getConnection().createStatement()) {
statement.executeQuery("");
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/masterslave/YamlGovernancePrimaryReplicaReplicationIntegrateTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/primaryreplica/YamlGovernancePrimaryReplicaReplicationIntegrateTest.java
similarity index 88%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/masterslave/YamlGovernancePrimaryReplicaReplicationIntegrateTest.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/primaryreplica/YamlGovernancePrimaryReplicaReplicationIntegrateTest.java
index 9f718b2..6a0bb56 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/masterslave/YamlGovernancePrimaryReplicaReplicationIntegrateTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/primaryreplica/YamlGovernancePrimaryReplicaReplicationIntegrateTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.masterslave;
+package org.apache.shardingsphere.driver.governance.api.yaml.primaryreplica;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -46,10 +46,10 @@ public final class YamlGovernancePrimaryReplicaReplicationIntegrateTest extends
@Parameters(name = "{index}:{0}-{1}")
public static Collection<?> init() {
return Arrays.asList(new Object[][]{
- {"/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml", true},
- {"/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml", false},
- {"/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml", true},
- {"/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml", false},
+ {"/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithoutProps.yaml", true},
+ {"/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithoutProps.yaml", false},
+ {"/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithProps.yaml", true},
+ {"/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithProps.yaml", false},
});
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithMasterSlaveIntegrateTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithPrimaryReplicaReplicationIntegrateTest.java
similarity index 93%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithMasterSlaveIntegrateTest.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithPrimaryReplicaReplicationIntegrateTest.java
index 40f7c3d..3afbb2e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithMasterSlaveIntegrateTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithPrimaryReplicaReplicationIntegrateTest.java
@@ -40,7 +40,7 @@ import java.util.Map.Entry;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class YamlGovernanceShardingWithMasterSlaveIntegrateTest extends AbstractYamlDataSourceTest {
+public final class YamlGovernanceShardingWithPrimaryReplicaReplicationIntegrateTest extends AbstractYamlDataSourceTest {
private final String filePath;
@@ -58,7 +58,7 @@ public final class YamlGovernanceShardingWithMasterSlaveIntegrateTest extends Ab
@Test
public void assertWithDataSource() throws Exception {
- File yamlFile = new File(YamlGovernanceShardingWithMasterSlaveIntegrateTest.class.getResource(filePath).toURI());
+ File yamlFile = new File(YamlGovernanceShardingWithPrimaryReplicaReplicationIntegrateTest.class.getResource(filePath).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource = YamlGovernanceShardingSphereDataSourceFactory.createDataSource(yamlFile);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithProps.yaml
similarity index 100%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithProps.yaml
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithoutProps.yaml
similarity index 100%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
rename to shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/ms/configWithPrimaryReplicaReplicationDataSourceWithoutProps.yaml
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java
index c54f686..e738745 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java
@@ -52,7 +52,7 @@ public final class SpringNamespaceTest extends AbstractJUnit4SpringContextTests
if (each instanceof ShardingRule) {
assertShardingRule((ShardingRule) each);
} else if (each instanceof PrimaryReplicaReplicationRule) {
- assertMasterSlaveRule((PrimaryReplicaReplicationRule) each);
+ assertPrimaryReplicaReplicationRule((PrimaryReplicaReplicationRule) each);
} else if (each instanceof EncryptRule) {
assertEncryptRule((EncryptRule) each);
}
@@ -61,10 +61,10 @@ public final class SpringNamespaceTest extends AbstractJUnit4SpringContextTests
private void assertDataSourceMap() {
assertThat(dataSource.getDataSourceMap().size(), is(6));
- assertTrue(dataSource.getDataSourceMap().containsKey("ds_0_master"));
+ assertTrue(dataSource.getDataSourceMap().containsKey("ds_0_primary"));
assertTrue(dataSource.getDataSourceMap().containsKey("ds_0_replica_0"));
assertTrue(dataSource.getDataSourceMap().containsKey("ds_0_replica_1"));
- assertTrue(dataSource.getDataSourceMap().containsKey("ds_1_master"));
+ assertTrue(dataSource.getDataSourceMap().containsKey("ds_1_primary"));
assertTrue(dataSource.getDataSourceMap().containsKey("ds_1_replica_0"));
assertTrue(dataSource.getDataSourceMap().containsKey("ds_1_replica_1"));
}
@@ -78,12 +78,12 @@ public final class SpringNamespaceTest extends AbstractJUnit4SpringContextTests
assertThat(rule.getTableRule("t_order").getTableShardingStrategy().getShardingAlgorithm().getProps().getProperty("algorithm-expression"), is("t_order_$->{order_id % 4}"));
}
- private void assertMasterSlaveRule(final PrimaryReplicaReplicationRule rule) {
+ private void assertPrimaryReplicaReplicationRule(final PrimaryReplicaReplicationRule rule) {
assertTrue(rule.findDataSourceRule("ds_0").isPresent());
- assertThat(rule.findDataSourceRule("ds_0").get().getPrimaryDataSourceName(), is("ds_0_master"));
+ assertThat(rule.findDataSourceRule("ds_0").get().getPrimaryDataSourceName(), is("ds_0_primary"));
assertThat(rule.findDataSourceRule("ds_0").get().getReplicaDataSourceNames(), is(Arrays.asList("ds_0_replica_0", "ds_0_replica_1")));
assertTrue(rule.findDataSourceRule("ds_1").isPresent());
- assertThat(rule.findDataSourceRule("ds_1").get().getPrimaryDataSourceName(), is("ds_1_master"));
+ assertThat(rule.findDataSourceRule("ds_1").get().getPrimaryDataSourceName(), is("ds_1_primary"));
assertThat(rule.findDataSourceRule("ds_1").get().getReplicaDataSourceNames(), is(Arrays.asList("ds_1_replica_0", "ds_1_replica_1")));
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
index aecdbf7..3d6d708 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml
@@ -38,10 +38,10 @@
">
<context:property-placeholder location="classpath:conf/conf.properties" />
- <bean id="ds_0_master" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
+ <bean id="ds_0_primary" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
<bean id="ds_0_replica_0" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
<bean id="ds_0_replica_1" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
- <bean id="ds_1_master" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
+ <bean id="ds_1_primary" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
<bean id="ds_1_replica_0" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
<bean id="ds_1_replica_1" class="org.apache.shardingsphere.jdbc.test.MockedDataSource" />
@@ -77,12 +77,12 @@
</encrypt:table>
</encrypt:rule>
- <primary-replica-replication:rule id="masterSlaveRule">
- <primary-replica-replication:data-source-rule id="ds_0" primary-data-source-name="ds_0_master" replica-data-source-names="ds_0_replica_0,ds_0_replica_1" />
- <primary-replica-replication:data-source-rule id="ds_1" primary-data-source-name="ds_1_master" replica-data-source-names="ds_1_replica_0,ds_1_replica_1" />
+ <primary-replica-replication:rule id="primaryReplicaReplicationRule">
+ <primary-replica-replication:data-source-rule id="ds_0" primary-data-source-name="ds_0_primary" replica-data-source-names="ds_0_replica_0,ds_0_replica_1" />
+ <primary-replica-replication:data-source-rule id="ds_1" primary-data-source-name="ds_1_primary" replica-data-source-names="ds_1_replica_0,ds_1_replica_1" />
</primary-replica-replication:rule>
- <shardingsphere:data-source id="dataSource" data-source-names="ds_0_master,ds_0_replica_0,ds_0_replica_1,ds_1_master,ds_1_replica_0,ds_1_replica_1" rule-refs="shardingRule, masterSlaveRule, encryptRule">
+ <shardingsphere:data-source id="dataSource" data-source-names="ds_0_primary,ds_0_replica_0,ds_0_replica_1,ds_1_primary,ds_1_replica_0,ds_1_replica_1" rule-refs="shardingRule, primaryReplicaReplicationRule, encryptRule">
<props>
<prop key="sql-show">false</prop>
<prop key="executor-size">${executor-size}</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernancePrimaryReplicaReplicationNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernancePrimaryRepli [...]
index 6d29759..55b3818 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernancePrimaryReplicaReplicationNamespaceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernancePrimaryReplicaReplicationNamespaceTest.java
@@ -51,57 +51,57 @@ public class GovernancePrimaryReplicaReplicationNamespaceTest extends AbstractJU
@Test
public void assertPrimaryReplicaReplicationDataSourceType() {
- assertNotNull(applicationContext.getBean("defaultMasterSlaveDataSourceGovernance", GovernanceShardingSphereDataSource.class));
+ assertNotNull(applicationContext.getBean("defaultGovernanceDataSource", GovernanceShardingSphereDataSource.class));
}
@Test
public void assertDefaultPrimaryReplicaReplicationDataSource() {
- PrimaryReplicaReplicationRule masterSlaveRule = getPrimaryReplicaReplicationRule("defaultMasterSlaveDataSourceGovernance");
- Optional<PrimaryReplicaReplicationDataSourceRule> masterSlaveDataSourceRule = masterSlaveRule.findDataSourceRule("default_dbtbl_0");
- assertTrue(masterSlaveDataSourceRule.isPresent());
- assertThat(masterSlaveDataSourceRule.get().getPrimaryDataSourceName(), is("dbtbl_primary_0"));
- assertTrue(masterSlaveDataSourceRule.get().getReplicaDataSourceNames().contains("dbtbl_0_replica_0"));
- assertTrue(masterSlaveDataSourceRule.get().getReplicaDataSourceNames().contains("dbtbl_0_replica_1"));
+ PrimaryReplicaReplicationRule rule = getPrimaryReplicaReplicationRule("defaultGovernanceDataSource");
+ Optional<PrimaryReplicaReplicationDataSourceRule> dataSourceRule = rule.findDataSourceRule("default_dbtbl_0");
+ assertTrue(dataSourceRule.isPresent());
+ assertThat(dataSourceRule.get().getPrimaryDataSourceName(), is("dbtbl_primary_0"));
+ assertTrue(dataSourceRule.get().getReplicaDataSourceNames().contains("dbtbl_0_replica_0"));
+ assertTrue(dataSourceRule.get().getReplicaDataSourceNames().contains("dbtbl_0_replica_1"));
}
@Test
public void assertTypePrimaryReplicaReplicationDataSource() {
- PrimaryReplicaReplicationRule randomSlaveRule = getPrimaryReplicaReplicationRule("randomMasterSlaveDataSourceGovernance");
- Optional<PrimaryReplicaReplicationDataSourceRule> randomMasterSlaveDataSourceRule = randomSlaveRule.findDataSourceRule("random_dbtbl_0");
- assertTrue(randomMasterSlaveDataSourceRule.isPresent());
- assertTrue(randomMasterSlaveDataSourceRule.get().getLoadBalancer() instanceof RandomReplicaLoadBalanceAlgorithm);
- PrimaryReplicaReplicationRule roundRobinSlaveRule = getPrimaryReplicaReplicationRule("roundRobinMasterSlaveDataSourceGovernance");
- Optional<PrimaryReplicaReplicationDataSourceRule> roundRobinMasterSlaveDataSourceRule = roundRobinSlaveRule.findDataSourceRule("roundRobin_dbtbl_0");
- assertTrue(roundRobinMasterSlaveDataSourceRule.isPresent());
- assertTrue(roundRobinMasterSlaveDataSourceRule.get().getLoadBalancer() instanceof RoundRobinReplicaLoadBalanceAlgorithm);
+ PrimaryReplicaReplicationRule randomRule = getPrimaryReplicaReplicationRule("randomGovernanceDataSource");
+ Optional<PrimaryReplicaReplicationDataSourceRule> randomDataSourceRule = randomRule.findDataSourceRule("random_dbtbl_0");
+ assertTrue(randomDataSourceRule.isPresent());
+ assertTrue(randomDataSourceRule.get().getLoadBalancer() instanceof RandomReplicaLoadBalanceAlgorithm);
+ PrimaryReplicaReplicationRule roundRobinRule = getPrimaryReplicaReplicationRule("roundRobinGovernanceDataSource");
+ Optional<PrimaryReplicaReplicationDataSourceRule> roundRobinDataSourceRule = roundRobinRule.findDataSourceRule("roundRobin_dbtbl_0");
+ assertTrue(roundRobinDataSourceRule.isPresent());
+ assertTrue(roundRobinDataSourceRule.get().getLoadBalancer() instanceof RoundRobinReplicaLoadBalanceAlgorithm);
}
@Test
@Ignore
- // TODO load balance algorithm have been construct twice for SpringMasterDatasource extends PrimaryReplicaReplicationDatasource.
+ // TODO load balance algorithm have been construct twice for SpringDatasource extends PrimaryReplicaReplicationDatasource.
public void assertRefPrimaryReplicaReplicationDataSource() {
ReplicaLoadBalanceAlgorithm randomLoadBalanceAlgorithm = applicationContext.getBean("randomLoadBalanceAlgorithm", ReplicaLoadBalanceAlgorithm.class);
- PrimaryReplicaReplicationRule masterSlaveRule = getPrimaryReplicaReplicationRule("refMasterSlaveDataSourceGovernance");
- Optional<PrimaryReplicaReplicationDataSourceRule> masterSlaveDataSourceRule = masterSlaveRule.findDataSourceRule("randomLoadBalanceAlgorithm");
- assertTrue(masterSlaveDataSourceRule.isPresent());
- assertThat(masterSlaveDataSourceRule.get().getLoadBalancer(), is(randomLoadBalanceAlgorithm));
+ PrimaryReplicaReplicationRule rule = getPrimaryReplicaReplicationRule("refGovernanceDataSource");
+ Optional<PrimaryReplicaReplicationDataSourceRule> dataSourceRule = rule.findDataSourceRule("randomLoadBalanceAlgorithm");
+ assertTrue(dataSourceRule.isPresent());
+ assertThat(dataSourceRule.get().getLoadBalancer(), is(randomLoadBalanceAlgorithm));
}
private PrimaryReplicaReplicationRule getPrimaryReplicaReplicationRule(final String dataSourceName) {
- GovernanceShardingSphereDataSource masterSlaveDataSource = applicationContext.getBean(dataSourceName, GovernanceShardingSphereDataSource.class);
- SchemaContexts schemaContexts = (SchemaContexts) FieldValueUtil.getFieldValue(masterSlaveDataSource, "schemaContexts");
+ GovernanceShardingSphereDataSource dataSource = applicationContext.getBean(dataSourceName, GovernanceShardingSphereDataSource.class);
+ SchemaContexts schemaContexts = (SchemaContexts) FieldValueUtil.getFieldValue(dataSource, "schemaContexts");
return (PrimaryReplicaReplicationRule) schemaContexts.getDefaultSchemaContext().getSchema().getRules().iterator().next();
}
@Test
public void assertProperties() {
- boolean showSQL = getProperties("defaultMasterSlaveDataSourceGovernance").getValue(ConfigurationPropertyKey.SQL_SHOW);
+ boolean showSQL = getProperties("defaultGovernanceDataSource").getValue(ConfigurationPropertyKey.SQL_SHOW);
assertTrue(showSQL);
}
private ConfigurationProperties getProperties(final String dataSourceName) {
- GovernanceShardingSphereDataSource masterSlaveDataSource = applicationContext.getBean(dataSourceName, GovernanceShardingSphereDataSource.class);
- SchemaContexts schemaContexts = (SchemaContexts) FieldValueUtil.getFieldValue(masterSlaveDataSource, "schemaContexts");
+ GovernanceShardingSphereDataSource dataSource = applicationContext.getBean(dataSourceName, GovernanceShardingSphereDataSource.class);
+ SchemaContexts schemaContexts = (SchemaContexts) FieldValueUtil.getFieldValue(dataSource, "schemaContexts");
return schemaContexts.getProps();
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceShardingPrimaryReplicaReplicationNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceShar [...]
index 9bdf828..fb0908e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceShardingPrimaryReplicaReplicationNamespaceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/governance/GovernanceShardingPrimaryReplicaReplicationNamespaceTest.java
@@ -44,14 +44,14 @@ public class GovernanceShardingPrimaryReplicaReplicationNamespaceTest extends Ab
@Test
public void assertPrimaryReplicaReplicationShardingDataSourceByUserStrategy() {
- Map<String, DataSource> dataSourceMap = getDataSourceMap("masterSlaveShardingDataSourceByUserStrategyGovernance");
+ Map<String, DataSource> dataSourceMap = getDataSourceMap("dataSourceByUserStrategyGovernance");
assertNotNull(dataSourceMap.get("dbtbl_primary_0"));
assertNotNull(dataSourceMap.get("dbtbl_0_replica_0"));
assertNotNull(dataSourceMap.get("dbtbl_0_replica_1"));
assertNotNull(dataSourceMap.get("dbtbl_primary_1"));
assertNotNull(dataSourceMap.get("dbtbl_1_replica_0"));
assertNotNull(dataSourceMap.get("dbtbl_1_replica_1"));
- ShardingRule shardingRule = getShardingRule("masterSlaveShardingDataSourceByUserStrategyGovernance");
+ ShardingRule shardingRule = getShardingRule("dataSourceByUserStrategyGovernance");
assertThat(shardingRule.getTableRules().size(), is(1));
assertThat(shardingRule.getTableRules().iterator().next().getLogicTable(), is("t_order"));
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/primary-replica-replication-governance.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/primary-replica-replication-governance.xml
index fd23d89..281a366 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/primary-replica-replication-governance.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/primary-replica-replication-governance.xml
@@ -33,14 +33,14 @@
</props>
</governance:reg-center>
- <governance:data-source id="defaultMasterSlaveDataSourceGovernance" data-source-names="dbtbl_primary_0, dbtbl_0_replica_0, dbtbl_0_replica_1" rule-refs="defaultPrimaryReplicaReplicationRule" reg-center-ref="regCenter">
+ <governance:data-source id="defaultGovernanceDataSource" data-source-names="dbtbl_primary_0, dbtbl_0_replica_0, dbtbl_0_replica_1" rule-refs="defaultPrimaryReplicaReplicationRule" reg-center-ref="regCenter">
<props>
<prop key="sql-show">${sql_show}</prop>
<prop key="executor-size">10</prop>
<prop key="foo">bar</prop>
</props>
</governance:data-source>
- <governance:data-source id="randomMasterSlaveDataSourceGovernance" data-source-names="dbtbl_primary_0, dbtbl_0_replica_0, dbtbl_0_replica_1" rule-refs="randomPrimaryReplicaReplicationRule" reg-center-ref="regCenter" />
- <governance:data-source id="roundRobinMasterSlaveDataSourceGovernance" data-source-names="dbtbl_primary_0, dbtbl_0_replica_0, dbtbl_0_replica_1" rule-refs="roundRobinPrimaryReplicaReplicationRule" reg-center-ref="regCenter" />
- <governance:data-source id="refMasterSlaveDataSourceGovernance" data-source-names="dbtbl_primary_1, dbtbl_1_replica_0, dbtbl_1_replica_1" rule-refs="refPrimaryReplicaReplicationRule" reg-center-ref="regCenter" />
+ <governance:data-source id="randomGovernanceDataSource" data-source-names="dbtbl_primary_0, dbtbl_0_replica_0, dbtbl_0_replica_1" rule-refs="randomPrimaryReplicaReplicationRule" reg-center-ref="regCenter" />
+ <governance:data-source id="roundRobinGovernanceDataSource" data-source-names="dbtbl_primary_0, dbtbl_0_replica_0, dbtbl_0_replica_1" rule-refs="roundRobinPrimaryReplicaReplicationRule" reg-center-ref="regCenter" />
+ <governance:data-source id="refGovernanceDataSource" data-source-names="dbtbl_primary_1, dbtbl_1_replica_0, dbtbl_1_replica_1" rule-refs="refPrimaryReplicaReplicationRule" reg-center-ref="regCenter" />
</beans>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml
index ff21c19..27505cb 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/META-INF/rdb/sharding-primary-replica-replication-governance.xml
@@ -33,6 +33,6 @@
</props>
</governance:reg-center>
- <governance:data-source id="masterSlaveShardingDataSourceByDefaultStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="masterSlaveShardingDataSourceByDefaultStrategyShardingRule, masterSlaveShardingDataSourceByDefaultStrategyMasterSlaveRule" reg-center-ref="regCenter" />
- <governance:data-source id="masterSlaveShardingDataSourceByUserStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="masterSlaveShardingDataSourceByUserStrategyShardingRule, masterSlaveShardingDataSourceByUserStrategyMasterSlaveRule" reg-center-ref="regCenter" />
+ <governance:data-source id="dataSourceByDefaultStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="masterSlaveShardingDataSourceByDefaultStrategyShardingRule, masterSlaveShardingDataSourceByDefaultStrategyMasterSlaveRule" reg-center-ref="regCenter" />
+ <governance:data-source id="dataSourceByUserStrategyGovernance" data-source-names="dbtbl_primary_0,dbtbl_0_replica_0,dbtbl_0_replica_1,dbtbl_primary_1,dbtbl_1_replica_0,dbtbl_1_replica_1" rule-refs="masterSlaveShardingDataSourceByUserStrategyShardingRule, masterSlaveShardingDataSourceByUserStrategyMasterSlaveRule" reg-center-ref="regCenter" />
</beans>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
index 0c9077c..6a3f161 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ProxyConfigurationLoaderTest.java
@@ -84,10 +84,10 @@ public final class ProxyConfigurationLoaderTest {
each -> each instanceof YamlShardingRuleConfiguration).findFirst().map(configuration -> (YamlShardingRuleConfiguration) configuration).isPresent());
assertFalse(actual.getRules().stream().filter(
each -> each instanceof YamlEncryptRuleConfiguration).findFirst().map(configuration -> (YamlEncryptRuleConfiguration) configuration).isPresent());
- Optional<YamlPrimaryReplicaReplicationRuleConfiguration> masterSlaveRuleConfiguration = actual.getRules().stream().filter(
+ Optional<YamlPrimaryReplicaReplicationRuleConfiguration> ruleConfig = actual.getRules().stream().filter(
each -> each instanceof YamlPrimaryReplicaReplicationRuleConfiguration).findFirst().map(configuration -> (YamlPrimaryReplicaReplicationRuleConfiguration) configuration);
- assertTrue(masterSlaveRuleConfiguration.isPresent());
- for (YamlPrimaryReplicaReplicationDataSourceRuleConfiguration each : masterSlaveRuleConfiguration.get().getDataSources().values()) {
+ assertTrue(ruleConfig.isPresent());
+ for (YamlPrimaryReplicaReplicationDataSourceRuleConfiguration each : ruleConfig.get().getDataSources().values()) {
assertPrimaryReplicaReplicationRuleConfiguration(each);
}
}