This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch 5.0.0-alpha-release
in repository https://gitbox.apache.org/repos/asf/shardingsphere-ui.git
The following commit(s) were added to refs/heads/5.0.0-alpha-release by this
push:
new 2a6d70e revert code for 5.0.0-alpha (#69)
2a6d70e is described below
commit 2a6d70e96424de759ed088bdcb946d1868af8e19
Author: Haoran Meng <[email protected]>
AuthorDate: Mon Nov 16 14:23:25 2020 +0800
revert code for 5.0.0-alpha (#69)
---
pom.xml | 8 ++++----
shardingsphere-ui-backend/pom.xml | 22 ++++++++++++++++++----
.../ui/servcie/impl/ShardingSchemaServiceImpl.java | 10 +++++-----
3 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f78467..bf91c11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,22 +65,22 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-governance-repository-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-sharding-common</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-governance-repository-etcd</artifactId>
+ <artifactId>shardingsphere-governance-core-facade</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-governance-core-config</artifactId>
+
<artifactId>shardingsphere-governance-repository-zookeeper-curator</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-governance-core-registry</artifactId>
+
<artifactId>shardingsphere-governance-repository-etcd</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
</dependencies>
diff --git a/shardingsphere-ui-backend/pom.xml
b/shardingsphere-ui-backend/pom.xml
index 0ce6cdb..4634787 100644
--- a/shardingsphere-ui-backend/pom.xml
+++ b/shardingsphere-ui-backend/pom.xml
@@ -29,19 +29,33 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
-
<artifactId>shardingsphere-governance-repository-zookeeper-curator</artifactId>
+ <artifactId>shardingsphere-sharding-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-parser-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-parser-engine</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-sql-parser-binder</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-governance-repository-etcd</artifactId>
+ <artifactId>shardingsphere-governance-core-facade</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-governance-core-config</artifactId>
+
<artifactId>shardingsphere-governance-repository-zookeeper-curator</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-governance-core-registry</artifactId>
+ <artifactId>shardingsphere-governance-repository-etcd</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
diff --git
a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java
b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java
index 0255989..be41540 100644
---
a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java
+++
b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/ShardingSchemaServiceImpl.java
@@ -45,7 +45,7 @@ public final class ShardingSchemaServiceImpl implements
ShardingSchemaService {
@Override
public Collection<String> getAllSchemaNames() {
- return
configCenterService.getActivatedConfigCenter().getChildrenKeys(configCenterService.getActivateConfigurationNode().getMetadataNodePath());
+ return
configCenterService.getActivatedConfigCenter().getChildrenKeys(configCenterService.getActivateConfigurationNode().getSchemasPath());
}
@Override
@@ -85,16 +85,16 @@ public final class ShardingSchemaServiceImpl implements
ShardingSchemaService {
ConfigurationRepository configCenterRepository =
configCenterService.getActivatedConfigCenter();
String schemaNamePath =
configCenterService.getActivateConfigurationNode().getSchemaNamePath(schemaName);
configCenterRepository.delete(schemaNamePath);
- String schemaNames =
configCenterRepository.get(configCenterService.getActivateConfigurationNode().getMetadataNodePath());
+ String schemaNames =
configCenterRepository.get(configCenterService.getActivateConfigurationNode().getSchemasPath());
List<String> schemaNameList = new
ArrayList<>(Splitter.on(",").splitToList(schemaNames));
schemaNameList.remove(schemaName);
-
configCenterRepository.persist(configCenterService.getActivateConfigurationNode().getMetadataNodePath(),
Joiner.on(",").join(schemaNameList));
+
configCenterRepository.persist(configCenterService.getActivateConfigurationNode().getSchemasPath(),
Joiner.on(",").join(schemaNameList));
}
@Override
public String getMetadataConfiguration(final String schemaName) {
return configCenterService.getActivatedConfigCenter().get(
-
configCenterService.getActivateConfigurationNode().getSchemaPath(schemaName));
+
configCenterService.getActivateConfigurationNode().getTablePath(schemaName));
}
private void checkRuleConfiguration(final String configData) {
@@ -133,7 +133,7 @@ public final class ShardingSchemaServiceImpl implements
ShardingSchemaService {
private void persistSchemaName(final String schemaName) {
ConfigurationRepository configCenterRepository =
configCenterService.getActivatedConfigCenter();
- String schemaPath =
configCenterService.getActivateConfigurationNode().getMetadataNodePath();
+ String schemaPath =
configCenterService.getActivateConfigurationNode().getSchemasPath();
String schemaNames = configCenterRepository.get(schemaPath);
List<String> schemaNameList = Strings.isNullOrEmpty(schemaNames) ? new
ArrayList<>() : new ArrayList<>(Splitter.on(",").splitToList(schemaNames));
if (!schemaNameList.contains(schemaName)) {
