You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/07/25 08:55:59 UTC
[shardingsphere] branch master updated: Remove METADATA_CENTER type
(#6436)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 7abf03e Remove METADATA_CENTER type (#6436)
7abf03e is described below
commit 7abf03e491f3313e0cb47883c2dddc52d7fc8596
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Jul 25 16:55:44 2020 +0800
Remove METADATA_CENTER type (#6436)
* Refactor OrchestrationRepository
* Remove METADATA_CENTER type
* Remove useless test fixture
* Remove useless test fixture
* Remove useless test fixture
* Rename fixture name
* Rename fixture name
* Remove useless fixture
* Remove useless fixture
---
.../orchestration/core/common/CenterType.java | 3 +-
.../orchestration/core/common/CenterTypeTest.java | 4 --
.../fixture/FirstTestConfigurationRepository.java | 70 ------------------
...stration.repository.api.ConfigurationRepository | 18 -----
.../core/facade/OrchestrationFacade.java | 15 +---
.../listener/OrchestrationListenerManager.java | 8 +--
.../core/facade/OrchestrationFacadeTest.java | 6 +-
.../facade/OrchestrationListenerManagerTest.java | 3 +-
...itory.java => TestConfigurationRepository.java} | 4 +-
...Repository.java => TestRegistryRepository.java} | 4 +-
...stration.repository.api.ConfigurationRepository | 2 +-
...orchestration.repository.api.RegistryRepository | 2 +-
.../core/metadata/MetaDataCenter.java | 2 +-
.../fixture/FirstTestRegistryRepository.java | 74 -------------------
.../fixture/SecondTestRegistryRepository.java | 74 -------------------
...orchestration.repository.api.RegistryRepository | 19 -----
.../repository/api/OrchestrationRepository.java | 10 +--
...itory.java => TestConfigurationRepository.java} | 2 +-
.../api/listener/DataChangedEventListenerTest.java | 12 ++--
.../fixture/FirstTestConfigurationRepository.java | 76 --------------------
.../fixture/FourthTestConfigurationRepository.java | 76 --------------------
.../fixture/FourthTestRegistryRepository.java | 82 ----------------------
.../fixture/SecondTestConfigurationRepository.java | 76 --------------------
.../fixture/SecondTestRegistryRepository.java | 82 ----------------------
...itory.java => TestConfigurationRepository.java} | 4 +-
...Repository.java => TestRegistryRepository.java} | 4 +-
.../fixture/ThirdTestConfigurationRepository.java | 76 --------------------
.../fixture/ThirdTestRegistryRepository.java | 82 ----------------------
.../OrchestrationShardingSphereDataSourceTest.java | 15 +---
...stration.repository.api.ConfigurationRepository | 6 +-
...orchestration.repository.api.RegistryRepository | 5 +-
.../configWithMasterSlaveDataSourceWithProps.yaml | 6 +-
...onfigWithMasterSlaveDataSourceWithoutProps.yaml | 6 +-
.../sharding/configWithDataSourceWithProps.yaml | 6 +-
.../sharding/configWithDataSourceWithoutProps.yaml | 6 +-
.../sharding/configWithoutDataSourceWithProps.yaml | 6 +-
.../configWithoutDataSourceWithoutProps.yaml | 6 +-
.../sharding_ms/configWithDataSourceWithProps.yaml | 6 +-
.../configWithDataSourceWithoutProps.yaml | 6 +-
.../configWithDataSourceWithoutRules.yaml | 6 +-
.../configWithoutDataSourceWithProps.yaml | 6 +-
.../configWithoutDataSourceWithoutProps.yaml | 6 +-
.../yaml/unit/encryptWithRegistryCenter.yaml | 6 +-
.../src/test/resources/yaml/unit/sharding.yaml | 2 +-
44 files changed, 75 insertions(+), 915 deletions(-)
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/main/java/org/apache/shardingsphere/orchestration/core/common/CenterType.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/main/java/org/apache/shardingsphere/orchestration/core/common/CenterType.java
index 8e08699..76308a4 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/main/java/org/apache/shardingsphere/orchestration/core/common/CenterType.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/main/java/org/apache/shardingsphere/orchestration/core/common/CenterType.java
@@ -47,7 +47,6 @@ public enum CenterType {
public static CenterType findByValue(final String value) {
return Arrays.stream(CenterType.values())
.filter(each -> each.getValue().equals(value)).findFirst()
- .orElseThrow(() -> new OrchestrationException("now only support :{}, {}, {}",
- CenterType.CONFIG_CENTER.getValue(), CenterType.REGISTRY_CENTER.getValue(), CenterType.METADATA_CENTER));
+ .orElseThrow(() -> new OrchestrationException("now only support :{}, {}, {}", CenterType.CONFIG_CENTER.getValue(), CenterType.REGISTRY_CENTER.getValue()));
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/test/java/org/apache/shardingsphere/orchestration/core/common/CenterTypeTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/test/java/org/apache/shardingsphere/orchestration/core/common/CenterTypeTest.java
index 38af440..a72d411 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/test/java/org/apache/shardingsphere/orchestration/core/common/CenterTypeTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-common/src/test/java/org/apache/shardingsphere/orchestration/core/common/CenterTypeTest.java
@@ -31,8 +31,6 @@ public final class CenterTypeTest {
assertThat(CenterType.CONFIG_CENTER.name(), is("CONFIG_CENTER"));
assertThat(CenterType.REGISTRY_CENTER.getValue(), is("registry_center"));
assertThat(CenterType.REGISTRY_CENTER.name(), is("REGISTRY_CENTER"));
- assertThat(CenterType.METADATA_CENTER.getValue(), is("metadata_center"));
- assertThat(CenterType.METADATA_CENTER.name(), is("METADATA_CENTER"));
}
@Test
@@ -41,8 +39,6 @@ public final class CenterTypeTest {
assertThat(configCenter, is(CenterType.CONFIG_CENTER));
CenterType registryCenter = CenterType.findByValue("registry_center");
assertThat(registryCenter, is(CenterType.REGISTRY_CENTER));
- CenterType metadataCenter = CenterType.findByValue("metadata_center");
- assertThat(metadataCenter, is(CenterType.METADATA_CENTER));
}
@Test(expected = OrchestrationException.class)
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/java/org/apache/shardingsphere/orchestration/core/config/fixture/FirstTestConfigurationRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/java/org/apache/shardingsphere/orchestration/core/config/fixture/FirstTestConfigurationRepo [...]
deleted file mode 100644
index 4777fd7..0000000
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/java/org/apache/shardingsphere/orchestration/core/config/fixture/FirstTestConfigurationRepository.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.orchestration.core.config.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class FirstTestConfigurationRepository implements ConfigurationRepository {
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return "";
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- }
-
- @Override
- public String getType() {
- return "FirstTestConfigCenter";
- }
-}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.Conf [...]
deleted file mode 100644
index 27a626f..0000000
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-config/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# 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.
-#
-
-org.apache.shardingsphere.orchestration.core.config.fixture.FirstTestConfigurationRepository
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java
index 03a1bb2..4b1fd13 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java
@@ -62,8 +62,6 @@ public final class OrchestrationFacade implements AutoCloseable {
private RegistryRepository registryRepository;
- private ConfigurationRepository metaDataRepository;
-
private boolean isOverwrite;
@Getter
@@ -81,8 +79,6 @@ public final class OrchestrationFacade implements AutoCloseable {
private String registryCenterName;
- private String metaDataCenterName;
-
/**
* Initialize orchestration facade.
*
@@ -118,13 +114,9 @@ public final class OrchestrationFacade implements AutoCloseable {
}
private void initMetaDataCenter(final OrchestrationConfiguration orchestrationConfig) {
- metaDataCenterName = getInstanceName(orchestrationConfig.getInstanceConfigurationMap(), CenterType.METADATA_CENTER.getValue());
- OrchestrationRepositoryConfiguration orchestrationRepositoryConfiguration = orchestrationConfig.getInstanceConfigurationMap().get(metaDataCenterName);
+ OrchestrationRepositoryConfiguration orchestrationRepositoryConfiguration = orchestrationConfig.getInstanceConfigurationMap().get(configCenterName);
Preconditions.checkNotNull(orchestrationRepositoryConfiguration, "MetaData center configuration cannot be null.");
- metaDataRepository = TypedSPIRegistry.getRegisteredService(
- ConfigurationRepository.class, orchestrationRepositoryConfiguration.getType(), orchestrationRepositoryConfiguration.getProps());
- metaDataRepository.init(orchestrationRepositoryConfiguration);
- metaDataCenter = new MetaDataCenter(metaDataCenterName, metaDataRepository);
+ metaDataCenter = new MetaDataCenter(configCenterName, configurationRepository);
}
private String getInstanceName(final Map<String, OrchestrationRepositoryConfiguration> orchestrationRepositoryConfigurations, final String type) {
@@ -139,7 +131,7 @@ public final class OrchestrationFacade implements AutoCloseable {
private void initListenerManager(final Collection<String> shardingSchemaNames) {
listenerManager = new OrchestrationListenerManager(
- registryCenterName, registryRepository, configCenterName, configurationRepository, metaDataCenterName, metaDataRepository,
+ registryCenterName, registryRepository, configCenterName, configurationRepository,
shardingSchemaNames.isEmpty() ? configCenter.getAllShardingSchemaNames() : shardingSchemaNames);
}
@@ -192,7 +184,6 @@ public final class OrchestrationFacade implements AutoCloseable {
try {
configurationRepository.close();
registryRepository.close();
- metaDataRepository.close();
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java
index 8bdc15d..88b3b59 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java
@@ -17,12 +17,11 @@
package org.apache.shardingsphere.orchestration.core.facade.listener;
+import org.apache.shardingsphere.orchestration.core.config.listener.ConfigurationChangedListenerManager;
import org.apache.shardingsphere.orchestration.core.metadata.listener.MetaDataListenerManager;
-import org.apache.shardingsphere.orchestration.repository.api.OrchestrationRepository;
+import org.apache.shardingsphere.orchestration.core.registry.listener.RegistryListenerManager;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.core.config.listener.ConfigurationChangedListenerManager;
-import org.apache.shardingsphere.orchestration.core.registry.listener.RegistryListenerManager;
import java.util.Collection;
@@ -39,11 +38,10 @@ public final class OrchestrationListenerManager {
public OrchestrationListenerManager(final String registryRepositoryName, final RegistryRepository registryRepository,
final String configurationRepositoryName, final ConfigurationRepository configurationRepository,
- final String metadataRepositoryName, final OrchestrationRepository metaDataRepository,
final Collection<String> shardingSchemaNames) {
configurationChangedListenerManager = new ConfigurationChangedListenerManager(configurationRepositoryName, configurationRepository, shardingSchemaNames);
registryListenerManager = new RegistryListenerManager(registryRepositoryName, registryRepository);
- metaDataListenerManager = new MetaDataListenerManager(metadataRepositoryName, metaDataRepository, shardingSchemaNames);
+ metaDataListenerManager = new MetaDataListenerManager(configurationRepositoryName, configurationRepository, shardingSchemaNames);
}
/**
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java
index 7a27a17..6ad6527 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java
@@ -70,15 +70,15 @@ public final class OrchestrationFacadeTest {
@Before
public void setUp() {
Map<String, OrchestrationRepositoryConfiguration> instanceConfigurationMap = new HashMap<>();
- OrchestrationRepositoryConfiguration configuration1 = new OrchestrationRepositoryConfiguration("SecondTestRegistryCenter", new Properties());
+ OrchestrationRepositoryConfiguration configuration1 = new OrchestrationRepositoryConfiguration("REG_TEST", new Properties());
configuration1.setOrchestrationType("registry_center");
configuration1.setNamespace("namespace_1");
instanceConfigurationMap.put("test_name_1", configuration1);
- OrchestrationRepositoryConfiguration configuration2 = new OrchestrationRepositoryConfiguration("FirstTestConfigCenter", new Properties());
+ OrchestrationRepositoryConfiguration configuration2 = new OrchestrationRepositoryConfiguration("CONFIG_TEST", new Properties());
configuration2.setOrchestrationType("config_center");
configuration2.setNamespace("namespace_2");
instanceConfigurationMap.put("test_name_2", configuration2);
- OrchestrationRepositoryConfiguration configuration3 = new OrchestrationRepositoryConfiguration("FirstTestConfigCenter", new Properties());
+ OrchestrationRepositoryConfiguration configuration3 = new OrchestrationRepositoryConfiguration("CONFIG_TEST", new Properties());
configuration3.setOrchestrationType("metadata_center");
configuration3.setNamespace("namespace_3");
instanceConfigurationMap.put("test_name_3", configuration3);
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java
index 386094b..d7b5d5d 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java
@@ -54,8 +54,7 @@ public final class OrchestrationListenerManagerTest {
@Test
public void assertInitListeners() {
- OrchestrationListenerManager actual = new OrchestrationListenerManager("testRegCenter", registryRepository,
- "FirstTestConfigCenter", configurationRepository, "FirstTestConfigCenter", configurationRepository, Collections.emptyList());
+ OrchestrationListenerManager actual = new OrchestrationListenerManager("testRegCenter", registryRepository, "FirstTestConfigCenter", configurationRepository, Collections.emptyList());
FieldUtil.setField(actual, "configurationChangedListenerManager", configurationChangedListenerManager);
FieldUtil.setField(actual, "registryListenerManager", registryListenerManager);
FieldUtil.setField(actual, "metaDataListenerManager", metaDataListenerManager);
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/FirstTestConfigurationRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestConfigurationRepository.java
similarity index 94%
rename from shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/FirstTestConfigurationRepository.java
rename to shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestConfigurationRepository.java
index 3102ad2..0324574 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/FirstTestConfigurationRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestConfigurationRepository.java
@@ -29,7 +29,7 @@ import java.util.Properties;
@Getter
@Setter
-public final class FirstTestConfigurationRepository implements ConfigurationRepository {
+public final class TestConfigurationRepository implements ConfigurationRepository {
private Properties props = new Properties();
@@ -65,6 +65,6 @@ public final class FirstTestConfigurationRepository implements ConfigurationRepo
@Override
public String getType() {
- return "FirstTestConfigCenter";
+ return "CONFIG_TEST";
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/SecondTestRegistryRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestRegistryRepository.java
similarity index 94%
rename from shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/SecondTestRegistryRepository.java
rename to shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestRegistryRepository.java
index b8b4bc8..cf88792 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/SecondTestRegistryRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestRegistryRepository.java
@@ -29,7 +29,7 @@ import java.util.Properties;
@Getter
@Setter
-public final class SecondTestRegistryRepository implements RegistryRepository {
+public final class TestRegistryRepository implements RegistryRepository {
private Properties props = new Properties();
@@ -69,6 +69,6 @@ public final class SecondTestRegistryRepository implements RegistryRepository {
@Override
public String getType() {
- return "SecondTestRegistryCenter";
+ return "REG_TEST";
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.Conf [...]
index 62fea51..32e104b 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.orchestration.core.facade.fixture.FirstTestConfigurationRepository
+org.apache.shardingsphere.orchestration.core.facade.fixture.TestConfigurationRepository
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryR [...]
index fc4122e..4492fb8 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.orchestration.core.facade.fixture.SecondTestRegistryRepository
+org.apache.shardingsphere.orchestration.core.facade.fixture.TestRegistryRepository
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadata/src/main/java/org/apache/shardingsphere/orchestration/core/metadata/MetaDataCenter.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadata/src/main/java/org/apache/shardingsphere/orchestration/core/metadata/MetaDataCenter.java
index cfce8fc..cb52a86 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadata/src/main/java/org/apache/shardingsphere/orchestration/core/metadata/MetaDataCenter.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadata/src/main/java/org/apache/shardingsphere/orchestration/core/metadata/MetaDataCenter.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import java.util.Optional;
/**
- * Read/Write meta data from center repository.
+ * Read and write meta data from center repository.
*/
public final class MetaDataCenter {
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/FirstTestRegistryRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/FirstTestRegistryReposi [...]
deleted file mode 100644
index 7ab9be3..0000000
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/FirstTestRegistryRepository.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.orchestration.core.registry.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class FirstTestRegistryRepository implements RegistryRepository {
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return "";
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- }
-
- @Override
- public void persistEphemeral(final String key, final String value) {
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- }
-
- @Override
- public String getType() {
- return "FirstTestRegistryCenter";
- }
-}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/SecondTestRegistryRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/SecondTestRegistryRepo [...]
deleted file mode 100644
index c587453..0000000
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/java/org/apache/shardingsphere/orchestration/core/registry/fixture/SecondTestRegistryRepository.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.orchestration.core.registry.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class SecondTestRegistryRepository implements RegistryRepository {
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return "";
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- }
-
- @Override
- public void persistEphemeral(final String key, final String value) {
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- }
-
- @Override
- public String getType() {
- return "SecondTestRegistryCenter";
- }
-}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.Regis [...]
deleted file mode 100644
index 9e991a8..0000000
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registry/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-
-org.apache.shardingsphere.orchestration.core.registry.fixture.FirstTestRegistryRepository
-org.apache.shardingsphere.orchestration.core.registry.fixture.SecondTestRegistryRepository
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java
index 27c7355..b95cd40 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java
@@ -54,11 +54,6 @@ public interface OrchestrationRepository extends TypedSPI {
void persist(String key, String value);
/**
- * Close.
- */
- void close();
-
- /**
* Get node's sub-nodes list.
*
* @param key key of data
@@ -80,4 +75,9 @@ public interface OrchestrationRepository extends TypedSPI {
* @param key key of data
*/
void delete(String key);
+
+ /**
+ * Close.
+ */
+ void close();
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/FirstTestRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/TestConfigurati [...]
similarity index 96%
rename from shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/FirstTestRepository.java
rename to shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/TestConfigurationRepository.java
index b1f93fc..e0890e2 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/FirstTestRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/TestConfigurationRepository.java
@@ -30,7 +30,7 @@ import java.util.Properties;
@Getter
@Setter
-public final class FirstTestRepository implements ConfigurationRepository {
+public final class TestConfigurationRepository implements ConfigurationRepository {
private Properties props = new Properties();
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/listener/DataChangedEventListenerTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/listener/Data [...]
index 11c9350..749d924 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/listener/DataChangedEventListenerTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/listener/DataChangedEventListenerTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.orchestration.repository.api.listener;
-import org.apache.shardingsphere.orchestration.repository.api.fixture.FirstTestRepository;
+import org.apache.shardingsphere.orchestration.repository.api.fixture.TestConfigurationRepository;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -26,11 +26,11 @@ import static org.junit.Assert.assertThat;
public final class DataChangedEventListenerTest {
@Test
- public void assertFixture() {
- FirstTestRepository testRepository = new FirstTestRepository();
+ public void assertOnChange() {
+ TestConfigurationRepository repository = new TestConfigurationRepository();
DataChangedEventListener listener = dataChangedEvent -> assertThat(dataChangedEvent.getChangedType().name(), is(dataChangedEvent.getValue()));
- testRepository.watch("UPDATED", listener);
- testRepository.watch("DELETED", listener);
- testRepository.watch("IGNORED", listener);
+ repository.watch("UPDATED", listener);
+ repository.watch("DELETED", listener);
+ repository.watch("IGNORED", listener);
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestConfigurationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestConfigurationRepository.java
deleted file mode 100644
index 4a06af8..0000000
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestConfigurationRepository.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.driver.orchestration.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class FirstTestConfigurationRepository implements ConfigurationRepository {
-
- private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return REGISTRY_DATA.get(key);
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- REGISTRY_DATA.clear();
- }
-
- @Override
- public String getType() {
- return "FirstTestConfigCenter";
- }
-}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FourthTestConfigurationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FourthTestConfigurationRepository.java
deleted file mode 100644
index 1758e56..0000000
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FourthTestConfigurationRepository.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.driver.orchestration.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class FourthTestConfigurationRepository implements ConfigurationRepository {
-
- private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return REGISTRY_DATA.get(key);
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- REGISTRY_DATA.clear();
- }
-
- @Override
- public String getType() {
- return "FourthTestConfigCenter";
- }
-}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FourthTestRegistryRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FourthTestRegistryRepository.java
deleted file mode 100644
index 723471a..0000000
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FourthTestRegistryRepository.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.driver.orchestration.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class FourthTestRegistryRepository implements RegistryRepository, ConfigurationRepository {
-
- private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return REGISTRY_DATA.get(key);
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void persistEphemeral(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- REGISTRY_DATA.clear();
- }
-
- @Override
- public String getType() {
- return "FourthTestRegistryCenter";
- }
-}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/SecondTestConfigurationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/SecondTestConfigurationRepository.java
deleted file mode 100644
index 4dffea5..0000000
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/SecondTestConfigurationRepository.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.driver.orchestration.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class SecondTestConfigurationRepository implements ConfigurationRepository {
-
- private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return REGISTRY_DATA.get(key);
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- REGISTRY_DATA.clear();
- }
-
- @Override
- public String getType() {
- return "SecondTestConfigCenter";
- }
-}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/SecondTestRegistryRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/SecondTestRegistryRepository.java
deleted file mode 100644
index ec2442d..0000000
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/SecondTestRegistryRepository.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.driver.orchestration.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class SecondTestRegistryRepository implements RegistryRepository, ConfigurationRepository {
-
- private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return REGISTRY_DATA.get(key);
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void persistEphemeral(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- REGISTRY_DATA.clear();
- }
-
- @Override
- public String getType() {
- return "SecondTestRegistryCenter";
- }
-}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestMetaDataRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestConfigurationRepository.java
similarity index 95%
rename from shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestMetaDataRepository.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestConfigurationRepository.java
index dc4449d..3d2e0b4 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestMetaDataRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestConfigurationRepository.java
@@ -31,7 +31,7 @@ import java.util.Properties;
@Getter
@Setter
-public final class FirstTestMetaDataRepository implements ConfigurationRepository {
+public final class TestConfigurationRepository implements ConfigurationRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
@@ -71,6 +71,6 @@ public final class FirstTestMetaDataRepository implements ConfigurationRepositor
@Override
public String getType() {
- return "FirstTestMetaDataCenter";
+ return "CONFIG_TEST";
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestRegistryRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestRegistryRepository.java
similarity index 94%
rename from shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestRegistryRepository.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestRegistryRepository.java
index 73d3175..3e74027 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestRegistryRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestRegistryRepository.java
@@ -32,7 +32,7 @@ import java.util.Properties;
@Getter
@Setter
-public final class FirstTestRegistryRepository implements RegistryRepository, ConfigurationRepository {
+public final class TestRegistryRepository implements RegistryRepository, ConfigurationRepository {
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
@@ -77,6 +77,6 @@ public final class FirstTestRegistryRepository implements RegistryRepository, Co
@Override
public String getType() {
- return "FirstTestRegistryCenter";
+ return "REG_TEST";
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/ThirdTestConfigurationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/ThirdTestConfigurationRepository.java
deleted file mode 100644
index 6f69b7e..0000000
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/ThirdTestConfigurationRepository.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.driver.orchestration.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class ThirdTestConfigurationRepository implements ConfigurationRepository {
-
- private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return REGISTRY_DATA.get(key);
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- REGISTRY_DATA.clear();
- }
-
- @Override
- public String getType() {
- return "ThirdTestConfigCenter";
- }
-}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/ThirdTestRegistryRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/ThirdTestRegistryRepository.java
deleted file mode 100644
index 5ec15ca..0000000
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/ThirdTestRegistryRepository.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.shardingsphere.driver.orchestration.fixture;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-@Getter
-@Setter
-public final class ThirdTestRegistryRepository implements RegistryRepository, ConfigurationRepository {
-
- private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
-
- private Properties props = new Properties();
-
- @Override
- public void init(final OrchestrationRepositoryConfiguration config) {
- }
-
- @Override
- public String get(final String key) {
- return REGISTRY_DATA.get(key);
- }
-
- @Override
- public List<String> getChildrenKeys(final String key) {
- return Collections.emptyList();
- }
-
- @Override
- public void persist(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void persistEphemeral(final String key, final String value) {
- REGISTRY_DATA.put(key, value);
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
- }
-
- @Override
- public void delete(final String key) {
- }
-
- @Override
- public void close() {
- REGISTRY_DATA.clear();
- }
-
- @Override
- public String getType() {
- return "ThirdTestRegistryCenter";
- }
-}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java
index cb7537a..e60d140 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java
@@ -76,14 +76,13 @@ public final class OrchestrationShardingSphereDataSourceTest {
Map<String, OrchestrationRepositoryConfiguration> instanceConfigurationMap = new HashMap<>();
instanceConfigurationMap.put("test_sharding_registry_name", getRegistryOrchestrationRepositoryConfiguration());
instanceConfigurationMap.put("test_sharding_config_name", getConfigOrchestrationRepositoryConfiguration());
- instanceConfigurationMap.put("test_sharding_metadata_name", getMetaDataOrchestrationRepositoryConfiguration());
return new OrchestrationConfiguration(instanceConfigurationMap);
}
private static OrchestrationRepositoryConfiguration getRegistryOrchestrationRepositoryConfiguration() {
Properties properties = new Properties();
properties.setProperty("overwrite", "true");
- OrchestrationRepositoryConfiguration result = new OrchestrationRepositoryConfiguration("FourthTestRegistryCenter", properties);
+ OrchestrationRepositoryConfiguration result = new OrchestrationRepositoryConfiguration("REG_TEST", properties);
result.setOrchestrationType(CenterType.REGISTRY_CENTER.getValue());
result.setNamespace("test_sharding_registry");
result.setServerLists("localhost:3181");
@@ -93,23 +92,13 @@ public final class OrchestrationShardingSphereDataSourceTest {
private static OrchestrationRepositoryConfiguration getConfigOrchestrationRepositoryConfiguration() {
Properties properties = new Properties();
properties.setProperty("overwrite", "true");
- OrchestrationRepositoryConfiguration result = new OrchestrationRepositoryConfiguration("FourthTestConfigCenter", properties);
+ OrchestrationRepositoryConfiguration result = new OrchestrationRepositoryConfiguration("CONFIG_TEST", properties);
result.setOrchestrationType(CenterType.CONFIG_CENTER.getValue());
result.setNamespace("test_sharding_config");
result.setServerLists("localhost:3181");
return result;
}
- private static OrchestrationRepositoryConfiguration getMetaDataOrchestrationRepositoryConfiguration() {
- Properties properties = new Properties();
- properties.setProperty("overwrite", "true");
- OrchestrationRepositoryConfiguration result = new OrchestrationRepositoryConfiguration("FirstTestMetaDataCenter", properties);
- result.setOrchestrationType(CenterType.METADATA_CENTER.getValue());
- result.setNamespace("test_encrypt_metadata");
- result.setServerLists("localhost:3181");
- return result;
- }
-
@Test
public void assertInitializeOrchestrationShardingSphereDataSource() throws SQLException {
OrchestrationShardingSphereDataSource orchestrationShardingSphereDataSource = new OrchestrationShardingSphereDataSource(getOrchestrationConfiguration());
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository
index f9617c7..1e0ec59 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository
@@ -15,8 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.orchestration.fixture.FirstTestConfigurationRepository
-org.apache.shardingsphere.driver.orchestration.fixture.SecondTestConfigurationRepository
-org.apache.shardingsphere.driver.orchestration.fixture.ThirdTestConfigurationRepository
-org.apache.shardingsphere.driver.orchestration.fixture.FourthTestConfigurationRepository
-org.apache.shardingsphere.driver.orchestration.fixture.FirstTestMetaDataRepository
+org.apache.shardingsphere.driver.orchestration.fixture.TestConfigurationRepository
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository
index 88906e3..5052e2d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/META-INF/services/org.apache.shardingsphere.orchestration.repository.api.RegistryRepository
@@ -15,7 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.orchestration.fixture.FirstTestRegistryRepository
-org.apache.shardingsphere.driver.orchestration.fixture.SecondTestRegistryRepository
-org.apache.shardingsphere.driver.orchestration.fixture.ThirdTestRegistryRepository
-org.apache.shardingsphere.driver.orchestration.fixture.FourthTestRegistryRepository
+org.apache.shardingsphere.driver.orchestration.fixture.TestRegistryRepository
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
index 06adf55..915ce95 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
@@ -48,7 +48,7 @@ rules:
orchestration:
test_ms_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_ms_registry
props:
@@ -59,7 +59,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_ms_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_config
props:
@@ -70,7 +70,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_ms_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
index 91e5c94..4220fa8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
@@ -48,7 +48,7 @@ rules:
orchestration:
test_ms_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_ms_registry
props:
@@ -59,7 +59,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_ms_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_center
props:
@@ -70,7 +70,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_ms_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index 9f5ecf5..47fc89f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -87,7 +87,7 @@ rules:
orchestration:
test_sharding_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -98,7 +98,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
@@ -109,7 +109,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index db21a88..59b8845 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -87,7 +87,7 @@ rules:
orchestration:
test_sharding_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -98,7 +98,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
@@ -109,7 +109,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
index 016e313..69a913f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
@@ -71,7 +71,7 @@ rules:
orchestration:
test_sharding_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -82,7 +82,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
@@ -93,7 +93,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
index 881a7e6..e6328e3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
@@ -73,7 +73,7 @@ rules:
orchestration:
test_sharding_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -84,7 +84,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
@@ -95,7 +95,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
index 169d2ec..d916cf2 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
@@ -121,7 +121,7 @@ rules:
orchestration:
test_sharding_ms_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -132,7 +132,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
@@ -143,7 +143,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
index a5c88ad..1473d3c 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
@@ -123,7 +123,7 @@ rules:
orchestration:
test_sharding_ms_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -134,7 +134,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
@@ -145,7 +145,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml
index b658d6b..4b47548 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml
@@ -44,7 +44,7 @@ dataSources:
orchestration:
test_sharding_ms_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -55,7 +55,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
@@ -66,7 +66,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
index 5960d7c..09e8874 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
@@ -84,7 +84,7 @@ rules:
orchestration:
test_sharding_ms_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -95,7 +95,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
@@ -106,7 +106,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
index 37c4676..4cc4e63 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
@@ -88,7 +88,7 @@ rules:
orchestration:
test_sharding_ms_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -99,7 +99,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
@@ -110,7 +110,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_sharding_ms_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
index 323efbf..9e56040 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
@@ -18,7 +18,7 @@
orchestration:
test_encrypt_registry_name:
orchestrationType: registry_center
- instanceType: FirstTestRegistryCenter
+ instanceType: REG_TEST
serverLists: localhost:3181
namespace: test_encrypt_registry
props:
@@ -29,7 +29,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_encrypt_config_name:
orchestrationType: config_center
- instanceType: FirstTestConfigCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_encrypt_config
props:
@@ -40,7 +40,7 @@ orchestration:
operationTimeoutMilliseconds: 10
test_encrypt_metadata_name:
orchestrationType: metadata_center
- instanceType: FirstTestMetaDataCenter
+ instanceType: CONFIG_TEST
serverLists: localhost:3181
namespace: test_encrypt_metadata
props:
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/sharding.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/sharding.yaml
index e2a49ec..fb14bc0 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/sharding.yaml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/sharding.yaml
@@ -93,4 +93,4 @@ rules:
- ds_s
props:
- sql.show: false
\ No newline at end of file
+ sql.show: false