未验证 提交 9061a1dd 编写于 作者: J Juan Pan(Trista) 提交者: GitHub

Merge pull request #7069 from menghaoranss/dev0825

Remove name of ConfigCenterNode & RegistryCenterNode & MetaDataCenterNode
......@@ -68,8 +68,8 @@ public final class ConfigCenter {
private final ConfigurationRepository repository;
public ConfigCenter(final String name, final ConfigurationRepository repository) {
node = new ConfigCenterNode(name);
public ConfigCenter(final ConfigurationRepository repository) {
node = new ConfigCenterNode();
this.repository = repository;
DataSourceCallback.getInstance().register(this::persistDataSourceConfiguration);
RuleCallback.getInstance().register(this::persistRuleConfigurations);
......
......@@ -54,15 +54,13 @@ public final class ConfigCenterNode {
private static final String PATH_SEPARATOR = "/";
private final String name;
/**
* Get schema path.
*
* @return schema path
*/
public String getSchemaPath() {
return Joiner.on(PATH_SEPARATOR).join("", name, ROOT, SCHEMA_NODE);
return Joiner.on(PATH_SEPARATOR).join("", ROOT, SCHEMA_NODE);
}
/**
......@@ -72,7 +70,7 @@ public final class ConfigCenterNode {
* @return schema name path
*/
public String getSchemaNamePath(final String schemaName) {
return Joiner.on(PATH_SEPARATOR).join("", name, ROOT, SCHEMA_NODE, schemaName);
return Joiner.on(PATH_SEPARATOR).join("", ROOT, SCHEMA_NODE, schemaName);
}
/**
......@@ -114,11 +112,11 @@ public final class ConfigCenterNode {
}
private String getFullPath(final String schemaName, final String node) {
return Joiner.on(PATH_SEPARATOR).join("", name, ROOT, SCHEMA_NODE, schemaName, node);
return Joiner.on(PATH_SEPARATOR).join("", ROOT, SCHEMA_NODE, schemaName, node);
}
private String getFullPath(final String node) {
return Joiner.on(PATH_SEPARATOR).join("", name, ROOT, node);
return Joiner.on(PATH_SEPARATOR).join("", ROOT, node);
}
/**
......
......@@ -33,8 +33,8 @@ import java.util.Collections;
*/
public final class AuthenticationChangedListener extends PostOrchestrationRepositoryEventListener {
public AuthenticationChangedListener(final String name, final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode(name).getAuthenticationPath()));
public AuthenticationChangedListener(final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode().getAuthenticationPath()));
}
@Override
......
......@@ -33,8 +33,8 @@ import java.util.Collections;
*/
public final class ClusterConfigurationChangedListener extends PostOrchestrationRepositoryEventListener {
public ClusterConfigurationChangedListener(final String name, final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode(name).getClusterPath()));
public ClusterConfigurationChangedListener(final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode().getClusterPath()));
}
@Override
......
......@@ -37,12 +37,12 @@ public final class ConfigurationListenerManager {
private final ClusterConfigurationChangedListener clusterConfigurationChangedListener;
public ConfigurationListenerManager(final String name, final ConfigurationRepository configurationRepository, final Collection<String> schemaNames) {
schemaChangedListener = new SchemaChangedListener(name, configurationRepository, schemaNames);
propertiesChangedListener = new PropertiesChangedListener(name, configurationRepository);
authenticationChangedListener = new AuthenticationChangedListener(name, configurationRepository);
metricsConfigurationChangedListener = new MetricsConfigurationChangedListener(name, configurationRepository);
clusterConfigurationChangedListener = new ClusterConfigurationChangedListener(name, configurationRepository);
public ConfigurationListenerManager(final ConfigurationRepository configurationRepository, final Collection<String> schemaNames) {
schemaChangedListener = new SchemaChangedListener(configurationRepository, schemaNames);
propertiesChangedListener = new PropertiesChangedListener(configurationRepository);
authenticationChangedListener = new AuthenticationChangedListener(configurationRepository);
metricsConfigurationChangedListener = new MetricsConfigurationChangedListener(configurationRepository);
clusterConfigurationChangedListener = new ClusterConfigurationChangedListener(configurationRepository);
}
/**
......
......@@ -33,8 +33,8 @@ import java.util.Collections;
*/
public final class MetricsConfigurationChangedListener extends PostOrchestrationRepositoryEventListener {
public MetricsConfigurationChangedListener(final String name, final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode(name).getMetricsPath()));
public MetricsConfigurationChangedListener(final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode().getMetricsPath()));
}
@Override
......
......@@ -31,8 +31,8 @@ import java.util.Collections;
*/
public final class PropertiesChangedListener extends PostOrchestrationRepositoryEventListener {
public PropertiesChangedListener(final String name, final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode(name).getPropsPath()));
public PropertiesChangedListener(final ConfigurationRepository configurationRepository) {
super(configurationRepository, Collections.singletonList(new ConfigCenterNode().getPropsPath()));
}
@Override
......
......@@ -59,10 +59,10 @@ public final class SchemaChangedListener extends PostOrchestrationRepositoryEven
private final Collection<String> existedSchemaNames = new LinkedHashSet<>();
public SchemaChangedListener(final String name, final ConfigurationRepository configurationRepository, final Collection<String> schemaNames) {
super(configurationRepository, new ConfigCenterNode(name).getAllSchemaConfigPaths(schemaNames));
configurationService = new ConfigCenter(name, configurationRepository);
configurationNode = new ConfigCenterNode(name);
public SchemaChangedListener(final ConfigurationRepository configurationRepository, final Collection<String> schemaNames) {
super(configurationRepository, new ConfigCenterNode().getAllSchemaConfigPaths(schemaNames));
configurationService = new ConfigCenter(configurationRepository);
configurationNode = new ConfigCenterNode();
existedSchemaNames.addAll(schemaNames);
}
......
......@@ -30,60 +30,60 @@ import static org.junit.Assert.assertTrue;
public final class ConfigCenterNodeTest {
private final ConfigCenterNode configurationNode = new ConfigCenterNode("test");
private final ConfigCenterNode configurationNode = new ConfigCenterNode();
@Test
public void assertGetSchemaPath() {
assertThat(configurationNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/test/config/schema/logic_db/rule"));
assertThat(configurationNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/config/schema/logic_db/rule"));
}
@Test
public void assertGetDataSourcePath() {
assertThat(configurationNode.getDataSourcePath(DefaultSchema.LOGIC_NAME), is("/test/config/schema/logic_db/datasource"));
assertThat(configurationNode.getDataSourcePath(DefaultSchema.LOGIC_NAME), is("/config/schema/logic_db/datasource"));
}
@Test
public void assertGetRulePath() {
assertThat(configurationNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/test/config/schema/logic_db/rule"));
assertThat(configurationNode.getRulePath(DefaultSchema.LOGIC_NAME), is("/config/schema/logic_db/rule"));
}
@Test
public void assertGetAuthenticationPath() {
assertThat(configurationNode.getAuthenticationPath(), is("/test/config/authentication"));
assertThat(configurationNode.getAuthenticationPath(), is("/config/authentication"));
}
@Test
public void assertGetPropsPath() {
assertThat(configurationNode.getPropsPath(), is("/test/config/props"));
assertThat(configurationNode.getPropsPath(), is("/config/props"));
}
@Test
public void assertGetSchemaName() {
assertThat(configurationNode.getSchemaName("/test/config/schema/logic_db/rule"), is(DefaultSchema.LOGIC_NAME));
assertThat(configurationNode.getSchemaName("/config/schema/logic_db/rule"), is(DefaultSchema.LOGIC_NAME));
}
@Test
public void assertGetAllSchemaConfigPaths() {
Collection<String> actual = configurationNode.getAllSchemaConfigPaths(Collections.singletonList(DefaultSchema.LOGIC_NAME));
assertThat(actual.size(), is(4));
assertThat(actual, hasItems("/test/config/schema"));
assertThat(actual, hasItems("/test/config/schema/logic_db"));
assertThat(actual, hasItems("/test/config/schema/logic_db/rule"));
assertThat(actual, hasItems("/test/config/schema/logic_db/datasource"));
assertThat(actual, hasItems("/config/schema"));
assertThat(actual, hasItems("/config/schema/logic_db"));
assertThat(actual, hasItems("/config/schema/logic_db/rule"));
assertThat(actual, hasItems("/config/schema/logic_db/datasource"));
}
@Test
public void assertGetClusterPath() {
assertThat(configurationNode.getClusterPath(), is("/test/config/cluster"));
assertThat(configurationNode.getClusterPath(), is("/config/cluster"));
}
@Test
public void assertGetMetricsPath() {
assertTrue(configurationNode.getMetricsPath().contains("/test/config/metrics"));
assertTrue(configurationNode.getMetricsPath().contains("/config/metrics"));
}
@Test
public void assertGetSchemaNamePath() {
assertThat(configurationNode.getSchemaNamePath("sharding_db"), is("/test/config/schema/sharding_db"));
assertThat(configurationNode.getSchemaNamePath("sharding_db"), is("/config/schema/sharding_db"));
}
}
......@@ -42,7 +42,7 @@ public final class AuthenticationChangedListenerTest {
@Before
public void setUp() {
authenticationChangedListener = new AuthenticationChangedListener("test", configurationRepository);
authenticationChangedListener = new AuthenticationChangedListener(configurationRepository);
}
@Test
......
......@@ -46,7 +46,7 @@ public final class ClusterConfigurationChangedListenerTest {
@Before
public void setUp() {
clusterConfigurationChangedListener = new ClusterConfigurationChangedListener("test", configurationRepository);
clusterConfigurationChangedListener = new ClusterConfigurationChangedListener(configurationRepository);
}
@Test
......
......@@ -47,7 +47,7 @@ public final class ConfigurationListenerManagerTest {
@Test
public void assertInitListeners() {
ConfigurationListenerManager actual = new ConfigurationListenerManager("test", configurationRepository, Arrays.asList("sharding_db", "masterslave_db"));
ConfigurationListenerManager actual = new ConfigurationListenerManager(configurationRepository, Arrays.asList("sharding_db", "masterslave_db"));
setField(actual, "schemaChangedListener", schemaChangedListener);
setField(actual, "propertiesChangedListener", propertiesChangedListener);
setField(actual, "authenticationChangedListener", authenticationChangedListener);
......
......@@ -48,7 +48,7 @@ public final class MetricsConfigurationChangedListenerTest {
@Before
public void setUp() {
metricsConfigurationChangedListener = new MetricsConfigurationChangedListener("test", configurationRepository);
metricsConfigurationChangedListener = new MetricsConfigurationChangedListener(configurationRepository);
}
@Test
......
......@@ -41,7 +41,7 @@ public final class PropertiesChangedListenerTest {
@Before
public void setUp() {
propertiesChangedListener = new PropertiesChangedListener("test", configurationRepository);
propertiesChangedListener = new PropertiesChangedListener(configurationRepository);
}
@Test
......
......@@ -67,21 +67,21 @@ public final class SchemaChangedListenerTest {
@Before
public void setUp() {
schemaChangedListener = new SchemaChangedListener("test", configurationRepository, Arrays.asList("sharding_db", "masterslave_db", "encrypt_db"));
schemaChangedListener = new SchemaChangedListener(configurationRepository, Arrays.asList("sharding_db", "masterslave_db", "encrypt_db"));
}
@Test
public void assertCreateIgnoredEvent() {
assertThat(schemaChangedListener.createOrchestrationEvent(new DataChangedEvent("/test/config/schema/encrypt_db", "test", ChangedType.UPDATED)),
assertThat(schemaChangedListener.createOrchestrationEvent(new DataChangedEvent("/config/schema/encrypt_db", "test", ChangedType.UPDATED)),
instanceOf(IgnoredOrchestrationEvent.class));
assertThat(schemaChangedListener.createOrchestrationEvent(new DataChangedEvent("/test/config/schema/encrypt_db/rule", "test", ChangedType.IGNORED)),
assertThat(schemaChangedListener.createOrchestrationEvent(new DataChangedEvent("/config/schema/encrypt_db/rule", "test", ChangedType.IGNORED)),
instanceOf(IgnoredOrchestrationEvent.class));
}
@Test
public void assertCreateDataSourceChangedEventForExistedSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/sharding_db/datasource", dataSource, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/sharding_db/datasource", dataSource, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(DataSourceChangedEvent.class));
assertThat(((DataSourceChangedEvent) actual).getShardingSchemaName(), is("sharding_db"));
......@@ -90,7 +90,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateRuleConfigurationsChangedEventForExistedSchema() {
String shardingRule = readYAML(SHARDING_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/sharding_db/rule", shardingRule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/sharding_db/rule", shardingRule, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(RuleConfigurationsChangedEvent.class));
assertThat(((RuleConfigurationsChangedEvent) actual).getShardingSchemaName(), is("sharding_db"));
......@@ -102,7 +102,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateMasterSlaveRuleChangedEventForExistedSchema() {
String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/masterslave_db/rule", masterSlaveRule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/masterslave_db/rule", masterSlaveRule, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(RuleConfigurationsChangedEvent.class));
RuleConfigurationsChangedEvent event = (RuleConfigurationsChangedEvent) actual;
......@@ -115,7 +115,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateEncryptRuleChangedEventForExistedSchema() {
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/encrypt_db/rule", encryptRule, ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/encrypt_db/rule", encryptRule, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(RuleConfigurationsChangedEvent.class));
RuleConfigurationsChangedEvent event = (RuleConfigurationsChangedEvent) actual;
......@@ -130,8 +130,8 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateIgnoredOrchestrationEventForNewSchema() {
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn("");
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/rule", "rule", ChangedType.UPDATED);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn("");
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/rule", "rule", ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
}
......@@ -140,11 +140,11 @@ public final class SchemaChangedListenerTest {
public void assertCreateShardingSchemaAddedEventForNewSchema() {
String shardingRule = readYAML(SHARDING_RULE_FILE);
String dataSource = readYAML(DATA_SOURCE_FILE);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/datasource", dataSource, ChangedType.UPDATED);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/datasource", dataSource, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getRuleConfigurations().iterator().next(), instanceOf(ShardingRuleConfiguration.class));
......@@ -154,11 +154,11 @@ public final class SchemaChangedListenerTest {
public void assertCreateMasterSlaveSchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/datasource", dataSource, ChangedType.UPDATED);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/datasource", dataSource, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getRuleConfigurations().iterator().next(), instanceOf(MasterSlaveRuleConfiguration.class));
......@@ -168,11 +168,11 @@ public final class SchemaChangedListenerTest {
public void assertCreateEncryptSchemaAddedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/datasource", dataSource, ChangedType.UPDATED);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/datasource", dataSource, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getRuleConfigurations().iterator().next(), instanceOf(EncryptRuleConfiguration.class));
......@@ -181,7 +181,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaDeletedEventForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/datasource", dataSource, ChangedType.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/datasource", dataSource, ChangedType.DELETED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaDeletedEvent.class));
assertThat(((SchemaDeletedEvent) actual).getShardingSchemaName(), is("logic_db"));
......@@ -190,7 +190,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithSchemaDeletedEvent() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db", dataSource, ChangedType.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db", dataSource, ChangedType.DELETED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaDeletedEvent.class));
}
......@@ -198,7 +198,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateWithSchemaDeletedEventWithDataSourceNode() {
String dataSource = readYAML(DATA_SOURCE_FILE);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/datasource", dataSource, ChangedType.DELETED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/datasource", dataSource, ChangedType.DELETED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaDeletedEvent.class));
}
......@@ -207,9 +207,9 @@ public final class SchemaChangedListenerTest {
public void assertCreateAddedEventWithEncryptRuleConfigurationForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/rule", encryptRule, ChangedType.UPDATED);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(encryptRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/rule", encryptRule, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getRuleConfigurations().iterator().next(), instanceOf(EncryptRuleConfiguration.class));
......@@ -219,9 +219,9 @@ public final class SchemaChangedListenerTest {
public void assertCreateAddedEventWithShardingRuleConfigurationForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
String shardingRule = readYAML(SHARDING_RULE_FILE);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/rule", shardingRule, ChangedType.UPDATED);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(shardingRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/rule", shardingRule, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getRuleConfigurations().iterator().next(), instanceOf(ShardingRuleConfiguration.class));
......@@ -231,9 +231,9 @@ public final class SchemaChangedListenerTest {
public void assertCreateAddedEventWithMasterSlaveRuleConfigurationForNewSchema() {
String dataSource = readYAML(DATA_SOURCE_FILE);
String masterSlaveRule = readYAML(MASTER_SLAVE_RULE_FILE);
when(configurationRepository.get("/test/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configurationRepository.get("/test/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/logic_db/rule", masterSlaveRule, ChangedType.UPDATED);
when(configurationRepository.get("/config/schema/logic_db/rule")).thenReturn(masterSlaveRule);
when(configurationRepository.get("/config/schema/logic_db/datasource")).thenReturn(dataSource);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/logic_db/rule", masterSlaveRule, ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getRuleConfigurations().iterator().next(), instanceOf(MasterSlaveRuleConfiguration.class));
......@@ -241,7 +241,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForAdd() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema", "sharding_db,masterslave_db,encrypt_db,shadow_db", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema", "sharding_db,masterslave_db,encrypt_db,shadow_db", ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getShardingSchemaName(), is("shadow_db"));
......@@ -249,7 +249,7 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForDelete() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema", "sharding_db,masterslave_db", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema", "sharding_db,masterslave_db", ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaDeletedEvent.class));
assertThat(((SchemaDeletedEvent) actual).getShardingSchemaName(), is("encrypt_db"));
......@@ -257,14 +257,14 @@ public final class SchemaChangedListenerTest {
@Test
public void assertCreateSchemaNamesUpdatedEventForIgnore() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema", "sharding_db,masterslave_db,encrypt_db", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema", "sharding_db,masterslave_db,encrypt_db", ChangedType.UPDATED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(IgnoredOrchestrationEvent.class));
}
@Test
public void assertCreateSchemaNameAddEvent() {
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/config/schema/shadow_db", "", ChangedType.ADDED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/config/schema/shadow_db", "", ChangedType.ADDED);
OrchestrationEvent actual = schemaChangedListener.createOrchestrationEvent(dataChangedEvent);
assertThat(actual, instanceOf(SchemaAddedEvent.class));
assertThat(((SchemaAddedEvent) actual).getShardingSchemaName(), is("shadow_db"));
......
......@@ -66,11 +66,11 @@ public final class OrchestrationFacade implements AutoCloseable {
public void init(final OrchestrationConfiguration config, final Collection<String> schemaNames) {
isOverwrite = config.isOverwrite();
repositoryFacade = new OrchestrationRepositoryFacade(config);
registryCenter = new RegistryCenter(config.getName(), repositoryFacade.getRegistryRepository());
configCenter = new ConfigCenter(config.getName(), repositoryFacade.getConfigurationRepository());
metaDataCenter = new MetaDataCenter(config.getName(), repositoryFacade.getConfigurationRepository());
listenerManager = new OrchestrationListenerManager(config.getName(),
repositoryFacade.getRegistryRepository(), repositoryFacade.getConfigurationRepository(), schemaNames.isEmpty() ? configCenter.getAllSchemaNames() : schemaNames);
registryCenter = new RegistryCenter(repositoryFacade.getRegistryRepository());
configCenter = new ConfigCenter(repositoryFacade.getConfigurationRepository());
metaDataCenter = new MetaDataCenter(repositoryFacade.getConfigurationRepository());
listenerManager = new OrchestrationListenerManager(repositoryFacade.getRegistryRepository(),
repositoryFacade.getConfigurationRepository(), schemaNames.isEmpty() ? configCenter.getAllSchemaNames() : schemaNames);
}
/**
......
......@@ -36,10 +36,10 @@ public final class OrchestrationListenerManager {
private final MetaDataListenerManager metaDataListenerManager;
public OrchestrationListenerManager(final String name, final RegistryRepository registryRepository, final ConfigurationRepository configurationRepository, final Collection<String> schemaNames) {
configurationListenerManager = new ConfigurationListenerManager(name, configurationRepository, schemaNames);
registryListenerManager = new RegistryListenerManager(name, registryRepository);
metaDataListenerManager = new MetaDataListenerManager(name, configurationRepository, schemaNames);
public OrchestrationListenerManager(final RegistryRepository registryRepository, final ConfigurationRepository configurationRepository, final Collection<String> schemaNames) {
configurationListenerManager = new ConfigurationListenerManager(configurationRepository, schemaNames);
registryListenerManager = new RegistryListenerManager(registryRepository);
metaDataListenerManager = new MetaDataListenerManager(configurationRepository, schemaNames);
}
/**
......
......@@ -52,7 +52,7 @@ public final class OrchestrationListenerManagerTest {
@Test
public void assertInit() {
OrchestrationListenerManager actual = new OrchestrationListenerManager("test_name", registryRepository, configurationRepository, Collections.emptyList());
OrchestrationListenerManager actual = new OrchestrationListenerManager(registryRepository, configurationRepository, Collections.emptyList());
FieldUtil.setField(actual, "configurationListenerManager", configurationListenerManager);
FieldUtil.setField(actual, "registryListenerManager", registryListenerManager);
FieldUtil.setField(actual, "metaDataListenerManager", metaDataListenerManager);
......
......@@ -36,8 +36,8 @@ public final class MetaDataCenter {
private final OrchestrationRepository repository;
public MetaDataCenter(final String name, final OrchestrationRepository orchestrationRepository) {
node = new MetaDataCenterNode(name);
public MetaDataCenter(final OrchestrationRepository orchestrationRepository) {
node = new MetaDataCenterNode();
repository = orchestrationRepository;
MetaDataCallback.getInstance().register(this::persistMetaDataCenterNode);
}
......
......@@ -31,8 +31,6 @@ public final class MetaDataCenterNode {
private static final String ROOT = "metadata";
private final String name;
/**
* Get meta data node full path.
*
......@@ -40,7 +38,7 @@ public final class MetaDataCenterNode {
* @return meta data node full path
*/
public String getMetaDataCenterNodeFullPath(final String schemaName) {
return Joiner.on("/").join("", name, ROOT, schemaName);
return Joiner.on("/").join("", ROOT, schemaName);
}
/**
......
......@@ -37,8 +37,8 @@ public final class MetaDataChangedListener extends PostOrchestrationRepositoryEv
private final Collection<String> schemaNames;
public MetaDataChangedListener(final String name, final OrchestrationRepository orchestrationRepository, final Collection<String> schemaNames) {
super(orchestrationRepository, new MetaDataCenterNode(name).getAllSchemaMetadataPaths(schemaNames));
public MetaDataChangedListener(final OrchestrationRepository orchestrationRepository, final Collection<String> schemaNames) {
super(orchestrationRepository, new MetaDataCenterNode().getAllSchemaMetadataPaths(schemaNames));
this.schemaNames = schemaNames;
}
......
......@@ -29,8 +29,8 @@ public final class MetaDataListenerManager {
private final MetaDataChangedListener metaDataChangedListener;
public MetaDataListenerManager(final String name, final OrchestrationRepository orchestrationRepository, final Collection<String> schemaNames) {
metaDataChangedListener = new MetaDataChangedListener(name, orchestrationRepository, schemaNames);
public MetaDataListenerManager(final OrchestrationRepository orchestrationRepository, final Collection<String> schemaNames) {
metaDataChangedListener = new MetaDataChangedListener(orchestrationRepository, schemaNames);
}
/**
......
......@@ -24,11 +24,11 @@ import static org.junit.Assert.assertThat;
public final class MetaDataCenterNodeTest {
private final MetaDataCenterNode metaDataCenterNode = new MetaDataCenterNode("test");
private final MetaDataCenterNode metaDataCenterNode = new MetaDataCenterNode();
@Test
public void assertGetMetaDataCenterNodeFullPath() {
assertThat(metaDataCenterNode.getMetaDataCenterNodeFullPath("schema"),
is("/test/metadata/schema"));
is("/metadata/schema"));
}
}
......@@ -50,25 +50,25 @@ public final class MetaDataCenterTest {
@Before
public void setUp() {
metaDataCenter = new MetaDataCenter("test", repository);
metaDataCenter = new MetaDataCenter(repository);
}
@Test
public void assertPersistMetaDataCenterNode() {
RuleSchemaMetaData ruleSchemaMetaData = new RuleSchemaMetaDataYamlSwapper().swapToObject(YamlEngine.unmarshal(MetaDataJson.META_DATA, YamlRuleSchemaMetaData.class));
metaDataCenter.persistMetaDataCenterNode("schema", ruleSchemaMetaData);
verify(repository).persist(eq("/test/metadata/schema"), anyString());
verify(repository).persist(eq("/metadata/schema"), anyString());
}
@Test
public void assertLoadRuleSchemaMetaData() {
when(repository.get("/test/metadata/schema")).thenReturn(MetaDataJson.META_DATA);
when(repository.get("/metadata/schema")).thenReturn(MetaDataJson.META_DATA);
Optional<RuleSchemaMetaData> optionalRuleSchemaMetaData = metaDataCenter.loadRuleSchemaMetaData("schema");
assertTrue(optionalRuleSchemaMetaData.isPresent());
Optional<RuleSchemaMetaData> empty = metaDataCenter.loadRuleSchemaMetaData("test");
assertThat(empty, is(Optional.empty()));
RuleSchemaMetaData ruleSchemaMetaData = optionalRuleSchemaMetaData.get();
verify(repository).get(eq("/test/metadata/schema"));
verify(repository).get(eq("/metadata/schema"));
assertNotNull(ruleSchemaMetaData);
assertNotNull(ruleSchemaMetaData.getConfiguredSchemaMetaData());
assertNotNull(ruleSchemaMetaData.getUnconfiguredSchemaMetaDataMap());
......
......@@ -41,12 +41,12 @@ public final class MetaDataChangedListenerTest {
@Before
public void setUp() {
metaDataChangedListener = new MetaDataChangedListener("test", orchestrationRepository, Collections.singleton("schema"));
metaDataChangedListener = new MetaDataChangedListener(orchestrationRepository, Collections.singleton("schema"));
}
@Test
public void createOrchestrationEvent() {
DataChangedEvent event = new DataChangedEvent("/test/metadata/schema", MetaDataJson.META_DATA, ChangedType.UPDATED);
DataChangedEvent event = new DataChangedEvent("/metadata/schema", MetaDataJson.META_DATA, ChangedType.UPDATED);
MetaDataChangedEvent metaDataChangedEvent = (MetaDataChangedEvent) metaDataChangedListener.createOrchestrationEvent(event);
assertNotNull(metaDataChangedEvent);
assertThat(metaDataChangedEvent.getSchemaNames(), is(Collections.singleton("schema")));
......
......@@ -40,7 +40,7 @@ public final class MetaDataListenerManagerTest {
@Test
public void assertInitListeners() {
MetaDataListenerManager actual = new MetaDataListenerManager("test", orchestrationRepository, Collections.singleton("sharding_db"));
MetaDataListenerManager actual = new MetaDataListenerManager(orchestrationRepository, Collections.singleton("sharding_db"));
FieldUtil.setField(actual, "metaDataChangedListener", metaDataChangedListener);
actual.initListeners();
verify(metaDataChangedListener).watch(ChangedType.UPDATED);
......
......@@ -35,8 +35,8 @@ public final class RegistryCenter {
private final OrchestrationInstance instance;
public RegistryCenter(final String name, final RegistryRepository registryRepository) {
node = new RegistryCenterNode(name);
public RegistryCenter(final RegistryRepository registryRepository) {
node = new RegistryCenterNode();
repository = registryRepository;
instance = OrchestrationInstance.getInstance();
}
......
......@@ -33,8 +33,6 @@ public final class RegistryCenterNode {
private static final String DATA_SOURCES_NODE_PATH = "datasources";
private final String name;
/**
* Get instance node full path.
*
......@@ -42,7 +40,7 @@ public final class RegistryCenterNode {
* @return instance node full path
*/
public String getInstancesNodeFullPath(final String instanceId) {
return Joiner.on("/").join("", name, ROOT, INSTANCES_NODE_PATH, instanceId);
return Joiner.on("/").join("", ROOT, INSTANCES_NODE_PATH, instanceId);
}
/**
......@@ -51,7 +49,7 @@ public final class RegistryCenterNode {
* @return data source node full root path
*/
public String getDataSourcesNodeFullRootPath() {
return Joiner.on("/").join("", name, ROOT, DATA_SOURCES_NODE_PATH);
return Joiner.on("/").join("", ROOT, DATA_SOURCES_NODE_PATH);
}
/**
......@@ -61,7 +59,7 @@ public final class RegistryCenterNode {
* @return data source node full path
*/
public String getDataSourcesNodeFullPath(final String schemaDataSourceName) {
return Joiner.on("/").join("", name, ROOT, DATA_SOURCES_NODE_PATH, schemaDataSourceName);
return Joiner.on("/").join("", ROOT, DATA_SOURCES_NODE_PATH, schemaDataSourceName);
}
/**
......
......@@ -35,9 +35,9 @@ public final class DataSourceStateChangedListener extends PostOrchestrationRepos
private final RegistryCenterNode registryCenterNode;
public DataSourceStateChangedListener(final String name, final RegistryRepository registryRepository) {
super(registryRepository, Collections.singleton(new RegistryCenterNode(name).getDataSourcesNodeFullRootPath()));
registryCenterNode = new RegistryCenterNode(name);
public DataSourceStateChangedListener(final RegistryRepository registryRepository) {
super(registryRepository, Collections.singleton(new RegistryCenterNode().getDataSourcesNodeFullRootPath()));
registryCenterNode = new RegistryCenterNode();
}
@Override
......
......@@ -35,8 +35,8 @@ import java.util.Collections;
*/
public final class InstanceStateChangedListener extends PostOrchestrationRepositoryEventListener {
public InstanceStateChangedListener(final String name, final RegistryRepository registryRepository) {
super(registryRepository, Collections.singleton(new RegistryCenterNode(name).getInstancesNodeFullPath(OrchestrationInstance.getInstance().getInstanceId())));
public InstanceStateChangedListener(final RegistryRepository registryRepository) {
super(registryRepository, Collections.singleton(new RegistryCenterNode().getInstancesNodeFullPath(OrchestrationInstance.getInstance().getInstanceId())));
}
@Override
......
......@@ -29,9 +29,9 @@ public final class RegistryListenerManager {
private final DataSourceStateChangedListener dataSourceStateChangedListener;
public RegistryListenerManager(final String name, final RegistryRepository registryRepository) {
instanceStateChangedListener = new InstanceStateChangedListener(name, registryRepository);
dataSourceStateChangedListener = new DataSourceStateChangedListener(name, registryRepository);
public RegistryListenerManager(final RegistryRepository registryRepository) {
instanceStateChangedListener = new InstanceStateChangedListener(registryRepository);
dataSourceStateChangedListener = new DataSourceStateChangedListener(registryRepository);
}
/**
......
......@@ -24,25 +24,25 @@ import static org.junit.Assert.assertThat;
public final class RegistryCenterNodeTest {
private final RegistryCenterNode registryCenterNode = new RegistryCenterNode("test");
private final RegistryCenterNode registryCenterNode = new RegistryCenterNode();
@Test
public void assertGetInstancesNodeFullPath() {
assertThat(registryCenterNode.getInstancesNodeFullPath("testId"), is("/test/registry/instances/testId"));
assertThat(registryCenterNode.getInstancesNodeFullPath("testId"), is("/registry/instances/testId"));
}
@Test
public void assertGetDataSourcesNodeFullRootPath() {
assertThat(registryCenterNode.getDataSourcesNodeFullRootPath(), is("/test/registry/datasources"));
assertThat(registryCenterNode.getDataSourcesNodeFullRootPath(), is("/registry/datasources"));
}
@Test
public void assertGetDataSourcesNodeFullPath() {
assertThat(registryCenterNode.getDataSourcesNodeFullPath("sharding_db"), is("/test/registry/datasources/sharding_db"));
assertThat(registryCenterNode.getDataSourcesNodeFullPath("sharding_db"), is("/registry/datasources/sharding_db"));
}
@Test
public void assertGetOrchestrationShardingSchema() {
assertThat(registryCenterNode.getOrchestrationShardingSchema("/test/registry/datasources/master_slave_db.slave_ds_0").getSchemaName(), is("master_slave_db"));
assertThat(registryCenterNode.getOrchestrationShardingSchema("/registry/datasources/master_slave_db.slave_ds_0").getSchemaName(), is("master_slave_db"));
}
}
......@@ -42,7 +42,7 @@ public final class RegistryCenterTest {
@Before
public void setUp() throws ReflectiveOperationException {
registryCenter = new RegistryCenter("test", registryRepository);
registryCenter = new RegistryCenter(registryRepository);
Field field = registryCenter.getClass().getDeclaredField("repository");
field.setAccessible(true);
field.set(registryCenter, registryRepository);
......@@ -57,7 +57,7 @@ public final class RegistryCenterTest {
@Test
public void assertPersistDataSourcesNode() {
registryCenter.persistDataSourcesNode();
verify(registryRepository).persist("/test/registry/datasources", "");
verify(registryRepository).persist("/registry/datasources", "");
}
@Test
......
......@@ -40,13 +40,13 @@ public final class DataSourceStateChangedListenerTest {
@Before
public void setUp() {
dataSourceStateChangedListener = new DataSourceStateChangedListener("test", registryRepository);
dataSourceStateChangedListener = new DataSourceStateChangedListener(registryRepository);
}
@Test
public void assertCreateOrchestrationEvent() {
OrchestrationSchema expected = new OrchestrationSchema("master_slave_db", "slave_ds_0");
DataChangedEvent dataChangedEvent = new DataChangedEvent("/test/registry/datasources/master_slave_db.slave_ds_0", "disabled", ChangedType.UPDATED);
DataChangedEvent dataChangedEvent = new DataChangedEvent("/registry/datasources/master_slave_db.slave_ds_0", "disabled", ChangedType.UPDATED);
assertThat(dataSourceStateChangedListener.createOrchestrationEvent(dataChangedEvent).getOrchestrationSchema().getSchemaName(), is(expected.getSchemaName()));
}
}
......@@ -40,17 +40,17 @@ public final class InstanceStateChangedListenerTest {
@Before
public void setUp() {
instanceStateChangedListener = new InstanceStateChangedListener("test", registryRepository);
instanceStateChangedListener = new InstanceStateChangedListener(registryRepository);
}
@Test
public void assertCreateOrchestrationEventWhenEnabled() {
assertFalse(instanceStateChangedListener.createOrchestrationEvent(new DataChangedEvent("test/test_ds", "", ChangedType.UPDATED)).isCircuitBreak());
assertFalse(instanceStateChangedListener.createOrchestrationEvent(new DataChangedEvent("/test_ds", "", ChangedType.UPDATED)).isCircuitBreak());
}
@Test
public void assertCreateOrchestrationEventWhenDisabled() {
assertTrue(instanceStateChangedListener.createOrchestrationEvent(new DataChangedEvent("test/test_ds",
assertTrue(instanceStateChangedListener.createOrchestrationEvent(new DataChangedEvent("/test_ds",
"state: " + RegistryCenterNodeStatus.DISABLED.name(), ChangedType.UPDATED)).isCircuitBreak());
}
}
......@@ -41,7 +41,7 @@ public final class RegistryListenerManagerTest {
@Test
public void assertInitListeners() {
RegistryListenerManager actual = new RegistryListenerManager("test", registryRepository);
RegistryListenerManager actual = new RegistryListenerManager(registryRepository);
FieldUtil.setField(actual, "instanceStateChangedListener", instanceStateChangedListener);
FieldUtil.setField(actual, "dataSourceStateChangedListener", dataSourceStateChangedListener);
actual.initListeners();
......
......@@ -59,7 +59,7 @@ public final class EtcdRepository implements ConfigurationRepository, RegistryRe
@Override
public void init(final String name, final OrchestrationCenterConfiguration config) {
etcdProperties = new EtcdProperties(props);
client = Client.builder().endpoints(Util.toURIs(Splitter.on(",").trimResults().splitToList(config.getServerLists()))).build();
client = Client.builder().endpoints(Util.toURIs(Splitter.on(",").trimResults().splitToList(config.getServerLists()))).namespace(ByteSequence.from(name, Charsets.UTF_8)).build();
}
@SneakyThrows({InterruptedException.class, ExecutionException.class})
......
......@@ -69,11 +69,11 @@ public final class CuratorZookeeperRepository implements ConfigurationRepository
@Override
public void init(final String name, final OrchestrationCenterConfiguration config) {
ZookeeperProperties zookeeperProperties = new ZookeeperProperties(props);
client = buildCuratorClient(config, zookeeperProperties);
client = buildCuratorClient(name, config, zookeeperProperties);
initCuratorClient(zookeeperProperties);
}
private CuratorFramework buildCuratorClient(final OrchestrationCenterConfiguration config, final ZookeeperProperties zookeeperProperties) {
private CuratorFramework buildCuratorClient(final String namespace, final OrchestrationCenterConfiguration config, final ZookeeperProperties zookeeperProperties) {
int retryIntervalMilliseconds = zookeeperProperties.getValue(ZookeeperPropertyKey.RETRY_INTERVAL_MILLISECONDS);
int maxRetries = zookeeperProperties.getValue(ZookeeperPropertyKey.MAX_RETRIES);
int timeToLiveSeconds = zookeeperProperties.getValue(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS);
......@@ -81,7 +81,8 @@ public final class CuratorZookeeperRepository implements ConfigurationRepository
String digest = zookeeperProperties.getValue(ZookeeperPropertyKey.DIGEST);
CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
.connectString(config.getServerLists())
.retryPolicy(new ExponentialBackoffRetry(retryIntervalMilliseconds, maxRetries, retryIntervalMilliseconds * maxRetries));
.retryPolicy(new ExponentialBackoffRetry(retryIntervalMilliseconds, maxRetries, retryIntervalMilliseconds * maxRetries))
.namespace(namespace);
if (0 != timeToLiveSeconds) {
builder.sessionTimeoutMs(timeToLiveSeconds * 1000);
}
......
......@@ -65,7 +65,7 @@ public class OrchestrationSpringBootMasterSlaveTest {
ShardingSphereDataSource shardingSphereDataSource = (ShardingSphereDataSource) field.get(dataSource);
for (DataSource each : shardingSphereDataSource.getDataSourceMap().values()) {
assertThat(((BasicDataSource) each).getMaxTotal(), is(16));
assertThat(((BasicDataSource) each).getUsername(), is("root"));
assertThat(((BasicDataSource) each).getUsername(), is("sa"));
}
Collection<ShardingSphereRule> rules = shardingSphereDataSource.getSchemaContexts().getDefaultSchemaContext().getSchema().getRules();
assertThat(rules.size(), is(1));
......
......@@ -64,10 +64,10 @@ public class OrchestrationSpringBootRegistryEncryptTest {
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
TestOrchestrationRepository repository = new TestOrchestrationRepository();
repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/datasource", dataSource);
repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/rule", encryptRule);
repository.persist("/orchestration-spring-boot-test/config/props", "sql.show: 'true'\n");
repository.persist("/orchestration-spring-boot-test/registry/datasources", "");
repository.persist("/config/schema/logic_db/datasource", dataSource);
repository.persist("/config/schema/logic_db/rule", encryptRule);
repository.persist("/config/props", "sql.show: 'true'\n");
repository.persist("/registry/datasources", "");
}
@Test
......
......@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = OrchestrationSpringBootRegistryMasterSlaveTest.class)
@SpringBootApplication
@ActiveProfiles("registry")
@ActiveProfiles("registry-masterslave")
public class OrchestrationSpringBootRegistryMasterSlaveTest {
@Resource
......@@ -53,29 +53,29 @@ public class OrchestrationSpringBootRegistryMasterSlaveTest {
public static void init() {
EmbedTestingServer.start();
TestOrchestrationRepository repository = new TestOrchestrationRepository();
repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/datasource", ""
repository.persist("/config/schema/logic_db/datasource", ""
+ "ds_master: !!" + YamlDataSourceConfiguration.class.getName() + "\n"
+ " dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource\n"
+ " props:\n"
+ " url: jdbc:h2:mem:ds_master;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL\n"
+ " maxTotal: 16\n"
+ " password: ''\n"
+ " username: root\n"
+ " password: \n"
+ " username: sa\n"
+ "ds_slave_0: !!" + YamlDataSourceConfiguration.class.getName() + "\n"
+ " dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource\n"
+ " props:\n"
+ " url: jdbc:h2:mem:demo_ds_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL\n"
+ " maxTotal: 16\n"
+ " password: ''\n"
+ " username: root\n"
+ " password: \n"
+ " username: sa\n"
+ "ds_slave_1: !!" + YamlDataSourceConfiguration.class.getName() + "\n"
+ " dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource\n"
+ " props:\n"
+ " url: jdbc:h2:mem:demo_ds_slave_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL\n"
+ " maxTotal: 16\n"
+ " password: ''\n"
+ " username: root\n");
repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/rule", ""
+ " password: \n"
+ " username: sa\n");
repository.persist("/config/schema/logic_db/rule", ""
+ "rules:\n"
+ "- !MASTER_SLAVE\n"
+ " loadBalancers:\n"
......@@ -89,8 +89,8 @@ public class OrchestrationSpringBootRegistryMasterSlaveTest {
+ " slaveDataSourceNames: \n"
+ " - ds_slave_0\n"
+ " - ds_slave_1\n");
repository.persist("/orchestration-spring-boot-test/config/props", "{}\n");
repository.persist("/orchestration-spring-boot-test/registry/datasources", "");
repository.persist("/config/props", "{}\n");
repository.persist("/registry/datasources", "");
}
@Test
......@@ -102,7 +102,7 @@ public class OrchestrationSpringBootRegistryMasterSlaveTest {
ShardingSphereDataSource shardingSphereDataSource = (ShardingSphereDataSource) field.get(dataSource);
for (DataSource each : shardingSphereDataSource.getDataSourceMap().values()) {
assertThat(((BasicDataSource) each).getMaxTotal(), is(16));
assertThat(((BasicDataSource) each).getUsername(), is("root"));
assertThat(((BasicDataSource) each).getUsername(), is("sa"));
}
}
}
......@@ -68,12 +68,12 @@ public class OrchestrationSpringBootRegistryShardingTest {
String shardingDatabases = readYAML(SHARDING_DATABASES_FILE);
String shardingRule = readYAML(SHARDING_RULE_FILE);
TestOrchestrationRepository repository = new TestOrchestrationRepository();
repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/datasource", shardingDatabases);
repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/rule", shardingRule);
repository.persist("/orchestration-spring-boot-test/config/props", ""
repository.persist("/config/schema/logic_db/datasource", shardingDatabases);
repository.persist("/config/schema/logic_db/rule", shardingRule);
repository.persist("/config/props", ""
+ "executor.size: '100'\n"
+ "sql.show: 'true'\n");
repository.persist("/orchestration-spring-boot-test/registry/datasources", "");
repository.persist("/registry/datasources", "");
}
@Test
......@@ -86,7 +86,6 @@ public class OrchestrationSpringBootRegistryShardingTest {
}
assertTrue(schemaContexts.getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW));
assertTrue(schemaContexts.getProps().getValue(ConfigurationPropertyKey.SQL_SHOW));
assertThat(schemaContexts.getProps().getValue(ConfigurationPropertyKey.EXECUTOR_SIZE), is(100));
}
@Test
......
......@@ -32,7 +32,7 @@ spring.shardingsphere.rules.encrypt.tables.t_order.columns.order_id.encryptor-na
spring.shardingsphere.props.sql.show=true
spring.shardingsphere.orchestration.name=orchestration-spring-boot-master-slave-test
spring.shardingsphere.orchestration.name=orchestration-spring-boot-encrypt-test
spring.shardingsphere.orchestration.overwrite=true
spring.shardingsphere.orchestration.registry-center.type=TestRegistry
......
......@@ -21,21 +21,21 @@ spring.shardingsphere.datasource.names=${spring.example.datasource.name},ds_slav
spring.shardingsphere.datasource.ds_master.type=org.apache.commons.dbcp2.BasicDataSource
spring.shardingsphere.datasource.ds_master.driver-class-name=org.h2.Driver
spring.shardingsphere.datasource.ds_master.url=jdbc:h2:mem:ds_master;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
spring.shardingsphere.datasource.ds_master.username=root
spring.shardingsphere.datasource.ds_master.username=sa
spring.shardingsphere.datasource.ds_master.password=
spring.shardingsphere.datasource.ds_master.max-total=16
spring.shardingsphere.datasource.ds_slave_0.type=org.apache.commons.dbcp2.BasicDataSource
spring.shardingsphere.datasource.ds_slave_0.driver-class-name=org.h2.Driver
spring.shardingsphere.datasource.ds_slave_0.url=jdbc:h2:mem:demo_ds_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
spring.shardingsphere.datasource.ds_slave_0.username=root
spring.shardingsphere.datasource.ds_slave_0.username=sa
spring.shardingsphere.datasource.ds_slave_0.password=
spring.shardingsphere.datasource.ds_slave_0.max-total=16
spring.shardingsphere.datasource.ds_slave_1.type=org.apache.commons.dbcp2.BasicDataSource
spring.shardingsphere.datasource.ds_slave_1.driver-class-name=org.h2.Driver
spring.shardingsphere.datasource.ds_slave_1.url=jdbc:h2:mem:demo_ds_slave_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
spring.shardingsphere.datasource.ds_slave_1.username=root
spring.shardingsphere.datasource.ds_slave_1.username=sa
spring.shardingsphere.datasource.ds_slave_1.password=
spring.shardingsphere.datasource.ds_slave_1.max-total=16
......
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring.shardingsphere.orchestration.name=orchestration-spring-boot-registry-master-slave-test
spring.shardingsphere.orchestration.overwrite=true
spring.shardingsphere.orchestration.registry-center.type=TestRegistry
spring.shardingsphere.orchestration.registry-center.server-lists=localhost:3181
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册