You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/11/08 08:49:30 UTC
[shardingsphere] branch master updated: Unified governance center naming style (#22010)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 a42a47de49e Unified governance center naming style (#22010)
a42a47de49e is described below
commit a42a47de49ef634abf6572e84af3ddeed99d8a4e
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Tue Nov 8 16:49:16 2022 +0800
Unified governance center naming style (#22010)
* Unified governance center naming style
* Fix unit test
---
.../data/pipeline/core/metadata/node/PipelineMetaDataNode.java | 4 ++--
.../data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java | 4 ++--
.../mode/metadata/persist/node/DatabaseMetaDataNode.java | 4 ++--
.../mode/metadata/persist/node/DatabaseMetaDataNodeTest.java | 4 ++--
.../metadata/persist/service/MetaDataVersionPersistServiceTest.java | 2 +-
.../service/config/database/DataSourcePersistServiceTest.java | 4 ++--
.../registry/metadata/watcher/MetaDataChangedWatcherTest.java | 6 +++---
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
index 190bf24e353..92e369f55ab 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
@@ -43,7 +43,7 @@ public final class PipelineMetaDataNode {
* @return data sources path
*/
public static String getMetaDataDataSourcesPath(final JobType jobType) {
- return String.join("/", getMetaDataRootPath(jobType), "dataSources");
+ return String.join("/", getMetaDataRootPath(jobType), "data_sources");
}
private static String getMetaDataRootPath(final JobType jobType) {
@@ -59,7 +59,7 @@ public final class PipelineMetaDataNode {
* @return data sources path
*/
public static String getMetaDataProcessConfigPath(final JobType jobType) {
- return String.join("/", getMetaDataRootPath(jobType), "processConfig");
+ return String.join("/", getMetaDataRootPath(jobType), "process_config");
}
/**
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java
index a0681f81d4a..c718743559c 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java
@@ -37,12 +37,12 @@ public final class PipelineMetaDataNodeTest {
@Test
public void assertGetMetaDataDataSourcesPath() {
- assertThat(PipelineMetaDataNode.getMetaDataDataSourcesPath(JobType.MIGRATION), is(migrationMetaDataRootPath + "/dataSources"));
+ assertThat(PipelineMetaDataNode.getMetaDataDataSourcesPath(JobType.MIGRATION), is(migrationMetaDataRootPath + "/data_sources"));
}
@Test
public void assertGetMetaDataProcessConfigPath() {
- assertThat(PipelineMetaDataNode.getMetaDataProcessConfigPath(JobType.MIGRATION), is(migrationMetaDataRootPath + "/processConfig"));
+ assertThat(PipelineMetaDataNode.getMetaDataProcessConfigPath(JobType.MIGRATION), is(migrationMetaDataRootPath + "/process_config"));
}
@Test
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNode.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNode.java
index d78278066b4..bbaf9d3364a 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNode.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNode.java
@@ -34,7 +34,7 @@ public final class DatabaseMetaDataNode {
private static final String SCHEMAS_NODE = "schemas";
- private static final String DATA_SOURCE_NODE = "dataSources";
+ private static final String DATA_SOURCE_NODE = "data_sources";
private static final String RULE_NODE = "rules";
@@ -258,7 +258,7 @@ public final class DatabaseMetaDataNode {
* @return version
*/
public static Optional<String> getVersionByDataSourcesPath(final String dataSourceNodeFullPath) {
- Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/versions/([\\w\\-]+)/dataSources", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(getMetaDataNodePath() + "/([\\w\\-]+)/versions/([\\w\\-]+)/data_sources", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(dataSourceNodeFullPath);
return matcher.find() ? Optional.of(matcher.group(2)) : Optional.empty();
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNodeTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNodeTest.java
index 2f1dab3ee68..53f283cfe16 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNodeTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/node/DatabaseMetaDataNodeTest.java
@@ -92,7 +92,7 @@ public class DatabaseMetaDataNodeTest {
@Test
public void assertGetVersionByDatabasePath() {
- Optional<String> actualVersion = DatabaseMetaDataNode.getVersionByDataSourcesPath("/metadata/logic_db/versions/0/dataSources");
+ Optional<String> actualVersion = DatabaseMetaDataNode.getVersionByDataSourcesPath("/metadata/logic_db/versions/0/data_sources");
assertTrue(actualVersion.isPresent());
assertThat(actualVersion.get(), is("0"));
}
@@ -131,6 +131,6 @@ public class DatabaseMetaDataNodeTest {
@Test
public void assertGetMetaDataDataSourcePath() {
- assertThat(DatabaseMetaDataNode.getMetaDataDataSourcePath(DefaultDatabase.LOGIC_NAME, "0"), is("/metadata/logic_db/versions/0/dataSources"));
+ assertThat(DatabaseMetaDataNode.getMetaDataDataSourcePath(DefaultDatabase.LOGIC_NAME, "0"), is("/metadata/logic_db/versions/0/data_sources"));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistServiceTest.java
index f82dff1cb13..baea0c4e73a 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/MetaDataVersionPersistServiceTest.java
@@ -80,7 +80,7 @@ public final class MetaDataVersionPersistServiceTest {
assertTrue(actual.isPresent());
assertThat(actual.get(), is("2"));
verify(repository).persist("/metadata/foo_db/versions/2/rules", "1");
- verify(repository).persist("/metadata/foo_db/versions/2/dataSources", "1");
+ verify(repository).persist("/metadata/foo_db/versions/2/data_sources", "1");
}
@Test
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java
index 83e3c5b981a..8208931a85a 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/config/database/DataSourcePersistServiceTest.java
@@ -52,7 +52,7 @@ public final class DataSourcePersistServiceTest {
@Test
public void assertLoad() {
when(repository.getDirectly("/metadata/foo_db/active_version")).thenReturn("0");
- when(repository.getDirectly("/metadata/foo_db/versions/0/dataSources")).thenReturn(readDataSourceYaml("yaml/persist/data-source.yaml"));
+ when(repository.getDirectly("/metadata/foo_db/versions/0/data_sources")).thenReturn(readDataSourceYaml("yaml/persist/data-source.yaml"));
Map<String, DataSourceProperties> actual = new DataSourcePersistService(repository).load("foo_db");
assertThat(actual.size(), is(2));
assertDataSourceProperties(actual.get("ds_0"), DataSourcePropertiesCreator.create(createDataSource("ds_0")));
@@ -85,7 +85,7 @@ public final class DataSourcePersistServiceTest {
when(repository.getDirectly("/metadata/foo_db/active_version")).thenReturn("0");
new DataSourcePersistService(repository).append("foo_db", Collections.singletonMap("foo_ds", DataSourcePropertiesCreator.create(createDataSource("foo_ds"))));
String expected = readDataSourceYaml("yaml/persist/data-source-foo.yaml");
- verify(repository).persist("/metadata/foo_db/versions/0/dataSources", expected);
+ verify(repository).persist("/metadata/foo_db/versions/0/data_sources", expected);
}
private DataSource createDataSource(final String name) {
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
index be3dfafa9ac..ee4eda33bd3 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcherTest.java
@@ -60,7 +60,7 @@ public final class MetaDataChangedWatcherTest {
@Test
public void assertEmptyValue() {
- String key = "/metadata/sharding_db/dataSources";
+ String key = "/metadata/sharding_db/data_sources";
Optional<GovernanceEvent> actual = createEvent(key, null, Type.UPDATED);
assertFalse(actual.isPresent());
}
@@ -75,7 +75,7 @@ public final class MetaDataChangedWatcherTest {
@Test
public void assertCreateDataSourceChangedEvent() {
- String key = "/metadata/sharding_db/versions/0/dataSources";
+ String key = "/metadata/sharding_db/versions/0/data_sources";
String value = "{}";
Optional<GovernanceEvent> actual = createEvent(key, value, Type.UPDATED);
assertTrue(actual.isPresent());
@@ -83,7 +83,7 @@ public final class MetaDataChangedWatcherTest {
@Test
public void assertCreateDataSourceChangedEventWithAddEvent() {
- String key = "/metadata/sharding_db/versions/0/dataSources";
+ String key = "/metadata/sharding_db/versions/0/data_sources";
String value = "{}";
Optional<GovernanceEvent> actual = createEvent(key, value, Type.ADDED);
assertTrue(actual.isPresent());