You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/06/13 06:06:47 UTC
[shardingsphere] branch master updated: Unify remained props and
properties (#6024)
This is an automated email from the ASF dual-hosted git repository.
zhyee 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 578bf71 Unify remained props and properties (#6024)
578bf71 is described below
commit 578bf719e5ccdf5fae6ef3286939db847cbe7037
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Jun 13 14:06:34 2020 +0800
Unify remained props and properties (#6024)
* Add KeyGenerateAlgorithmBeanDefinitionTag
* Update KeyGenerateAlgorithmBeanDefinitionTag
* Unify remain props and properties
---
.../core/configcenter/ConfigCenterNode.java | 2 +-
.../core/configcenter/ConfigCenterNodeTest.java | 2 +-
.../core/configcenter/ConfigCenterTest.java | 38 +++++++++++-----------
.../tag/LoadBalanceAlgorithmBeanDefinitionTag.java | 2 +-
.../handler/ShardingNamespaceHandler.java | 5 +--
.../KeyGenerateAlgorithmBeanDefinitionParser.java | 6 ++--
.../KeyGenerateStrategyBeanDefinitionParser.java | 6 ++--
.../parser/ShardingRuleBeanDefinitionParser.java | 7 ++--
... => KeyGenerateAlgorithmBeanDefinitionTag.java} | 18 ++++++----
.../spring/namespace/tag/SPIBeanDefinitionTag.java | 4 ---
.../tag/ShardingRuleBeanDefinitionTag.java | 8 -----
...OrchestrationSpringBootRegistryEncryptTest.java | 2 +-
...estrationSpringBootRegistryMasterSlaveTest.java | 2 +-
...rchestrationSpringBootRegistryShardingTest.java | 2 +-
.../constants/InstanceBeanDefinitionTag.java | 2 +-
.../controller/ShardingPropertiesController.java | 2 +-
16 files changed, 51 insertions(+), 57 deletions(-)
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/main/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNode.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/main/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNode.java
index 754c15d..3c55076 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/main/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNode.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/main/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNode.java
@@ -44,7 +44,7 @@ public final class ConfigCenterNode {
private static final String AUTHENTICATION_NODE = "authentication";
- private static final String PROPS_NODE = "properties";
+ private static final String PROPS_NODE = "props";
private static final String CLUSTER_NODE = "cluster";
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNodeTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNodeTest.java
index 27c76a5..bc589a4 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNodeTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterNodeTest.java
@@ -53,7 +53,7 @@ public final class ConfigCenterNodeTest {
@Test
public void assertGetPropsPath() {
- assertThat(configurationNode.getPropsPath(), is("/test/config/properties"));
+ assertThat(configurationNode.getPropsPath(), is("/test/config/props"));
}
@Test
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterTest.java
index 3f48da1..2eb7e30 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-configcenter/src/test/java/org/apache/shardingsphere/orchestration/core/configcenter/ConfigCenterTest.java
@@ -219,19 +219,19 @@ public final class ConfigCenterTest {
public void assertPersistConfigurationForShardingRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
when(configCenterRepository.get("/test/config/schema/sharding_db/datasource")).thenReturn(DATA_SOURCE_YAML);
when(configCenterRepository.get("/test/config/schema/sharding_db/rule")).thenReturn(SHARDING_RULE_YAML);
- when(configCenterRepository.get("/test/config/properties")).thenReturn(PROPS_YAML);
+ when(configCenterRepository.get("/test/config/props")).thenReturn(PROPS_YAML);
ConfigCenter configurationService = new ConfigCenter("test", configCenterRepository);
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), null, createProperties(), false);
verify(configCenterRepository, times(0)).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository, times(0)).persist("/test/config/schema/sharding_db/rule", SHARDING_RULE_YAML);
- verify(configCenterRepository, times(0)).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository, times(0)).persist("/test/config/props", PROPS_YAML);
}
@Test
public void assertMoreShardingSchema() {
when(configCenterRepository.get("/test/config/schema/sharding_db/datasource")).thenReturn(DATA_SOURCE_YAML);
when(configCenterRepository.get("/test/config/schema/sharding_db/rule")).thenReturn(SHARDING_RULE_YAML);
- when(configCenterRepository.get("/test/config/properties")).thenReturn(PROPS_YAML);
+ when(configCenterRepository.get("/test/config/props")).thenReturn(PROPS_YAML);
when(configCenterRepository.get("/test/config/schema")).thenReturn("myTest1,myTest2");
ConfigCenter configurationService = new ConfigCenter("test", configCenterRepository);
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), null, createProperties(), false);
@@ -242,7 +242,7 @@ public final class ConfigCenterTest {
public void assertMoreAndContainsShardingSchema() {
when(configCenterRepository.get("/test/config/schema/sharding_db/datasource")).thenReturn(DATA_SOURCE_YAML);
when(configCenterRepository.get("/test/config/schema/sharding_db/rule")).thenReturn(SHARDING_RULE_YAML);
- when(configCenterRepository.get("/test/config/properties")).thenReturn(PROPS_YAML);
+ when(configCenterRepository.get("/test/config/props")).thenReturn(PROPS_YAML);
when(configCenterRepository.get("/test/config/schema")).thenReturn("myTest1,sharding_db");
ConfigCenter configurationService = new ConfigCenter("test", configCenterRepository);
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), null, createProperties(), false);
@@ -255,7 +255,7 @@ public final class ConfigCenterTest {
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), null, createProperties(), false);
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", SHARDING_RULE_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -264,19 +264,19 @@ public final class ConfigCenterTest {
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), null, createProperties(), true);
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", SHARDING_RULE_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
public void assertPersistConfigurationForMasterSlaveRuleWithoutAuthenticationAndIsNotOverwriteAndConfigurationIsExisted() {
when(configCenterRepository.get("/test/config/schema/sharding_db/datasource")).thenReturn(DATA_SOURCE_YAML);
when(configCenterRepository.get("/test/config/schema/sharding_db/rule")).thenReturn(MASTER_SLAVE_RULE_YAML);
- when(configCenterRepository.get("/test/config/properties")).thenReturn(PROPS_YAML);
+ when(configCenterRepository.get("/test/config/props")).thenReturn(PROPS_YAML);
ConfigCenter configurationService = new ConfigCenter("test", configCenterRepository);
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), null, createProperties(), false);
verify(configCenterRepository, times(0)).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository, times(0)).persist("/test/config/schema/sharding_db/rule", MASTER_SLAVE_RULE_YAML);
- verify(configCenterRepository, times(0)).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository, times(0)).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -285,7 +285,7 @@ public final class ConfigCenterTest {
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), null, createProperties(), false);
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", MASTER_SLAVE_RULE_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -294,7 +294,7 @@ public final class ConfigCenterTest {
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), null, createProperties(), true);
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", MASTER_SLAVE_RULE_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -302,13 +302,13 @@ public final class ConfigCenterTest {
when(configCenterRepository.get("/test/config/schema/sharding_db/datasource")).thenReturn(DATA_SOURCE_PARAMETER_YAML);
when(configCenterRepository.get("/test/config/schema/sharding_db/rule")).thenReturn(SHARDING_RULE_YAML);
when(configCenterRepository.get("/test/config/authentication")).thenReturn(AUTHENTICATION_YAML);
- when(configCenterRepository.get("/test/config/properties")).thenReturn(PROPS_YAML);
+ when(configCenterRepository.get("/test/config/props")).thenReturn(PROPS_YAML);
ConfigCenter configurationService = new ConfigCenter("test", configCenterRepository);
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createRuleConfigurations(), createAuthentication(), createProperties(), false);
verify(configCenterRepository, times(0)).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository, times(0)).persist("/test/config/schema/sharding_db/rule", SHARDING_RULE_YAML);
verify(configCenterRepository, times(0)).persist("/test/config/authentication", AUTHENTICATION_YAML);
- verify(configCenterRepository, times(0)).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository, times(0)).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -318,7 +318,7 @@ public final class ConfigCenterTest {
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", SHARDING_RULE_YAML);
verify(configCenterRepository).persist("/test/config/authentication", AUTHENTICATION_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -328,7 +328,7 @@ public final class ConfigCenterTest {
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", SHARDING_RULE_YAML);
verify(configCenterRepository).persist("/test/config/authentication", AUTHENTICATION_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -336,13 +336,13 @@ public final class ConfigCenterTest {
when(configCenterRepository.get("/test/config/schema/sharding_db/datasource")).thenReturn(DATA_SOURCE_PARAMETER_YAML);
when(configCenterRepository.get("/test/config/schema/sharding_db/rule")).thenReturn(MASTER_SLAVE_RULE_YAML);
when(configCenterRepository.get("/test/config/authentication")).thenReturn(AUTHENTICATION_YAML);
- when(configCenterRepository.get("/test/config/properties")).thenReturn(PROPS_YAML);
+ when(configCenterRepository.get("/test/config/props")).thenReturn(PROPS_YAML);
ConfigCenter configurationService = new ConfigCenter("test", configCenterRepository);
configurationService.persistConfigurations("sharding_db", createDataSourceConfigurations(), createMasterSlaveRuleConfiguration(), createAuthentication(), createProperties(), false);
verify(configCenterRepository, times(0)).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository, times(0)).persist("/test/config/schema/sharding_db/rule", MASTER_SLAVE_RULE_YAML);
verify(configCenterRepository, times(0)).persist("/test/config/authentication", AUTHENTICATION_YAML);
- verify(configCenterRepository, times(0)).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository, times(0)).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -353,7 +353,7 @@ public final class ConfigCenterTest {
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", MASTER_SLAVE_RULE_YAML);
verify(configCenterRepository).persist("/test/config/authentication", AUTHENTICATION_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -363,7 +363,7 @@ public final class ConfigCenterTest {
verify(configCenterRepository).persist(eq("/test/config/schema/sharding_db/datasource"), ArgumentMatchers.any());
verify(configCenterRepository).persist("/test/config/schema/sharding_db/rule", MASTER_SLAVE_RULE_YAML);
verify(configCenterRepository).persist("/test/config/authentication", AUTHENTICATION_YAML);
- verify(configCenterRepository).persist("/test/config/properties", PROPS_YAML);
+ verify(configCenterRepository).persist("/test/config/props", PROPS_YAML);
}
@Test
@@ -543,7 +543,7 @@ public final class ConfigCenterTest {
@Test
public void assertLoadProperties() {
- when(configCenterRepository.get("/test/config/properties")).thenReturn(PROPS_YAML);
+ when(configCenterRepository.get("/test/config/props")).thenReturn(PROPS_YAML);
ConfigCenter configurationService = new ConfigCenter("test", configCenterRepository);
Properties actual = configurationService.loadProperties();
assertThat(actual.get(ConfigurationPropertyKey.SQL_SHOW.getKey()), is(Boolean.FALSE));
diff --git a/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-spring/shardingsphere-master-slave-spring-namespace/src/main/java/org/apache/shardingsphere/masterslave/spring/namespace/tag/LoadBalanceAlgorithmBeanDefinitionTag.java b/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-spring/shardingsphere-master-slave-spring-namespace/src/main/java/org/apache/shardingsphere/masterslave/spring/namespace/tag/LoadBalanceAlgorithmBeanD [...]
index cc9a7a9..5ec17df 100644
--- a/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-spring/shardingsphere-master-slave-spring-namespace/src/main/java/org/apache/shardingsphere/masterslave/spring/namespace/tag/LoadBalanceAlgorithmBeanDefinitionTag.java
+++ b/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-spring/shardingsphere-master-slave-spring-namespace/src/main/java/org/apache/shardingsphere/masterslave/spring/namespace/tag/LoadBalanceAlgorithmBeanDefinitionTag.java
@@ -26,5 +26,5 @@ public final class LoadBalanceAlgorithmBeanDefinitionTag {
public static final String TYPE_ATTRIBUTE = "type";
- public static final String PROPS_TAG = "properties";
+ public static final String PROPS_TAG = "props";
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/handler/ShardingNamespaceHandler.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/handler/ShardingNamespaceHandler.java
index 03cd224..6a32125 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/handler/ShardingNamespaceHandler.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/handler/ShardingNamespaceHandler.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.sharding.spring.namespace.parser.KeyGenerateStr
import org.apache.shardingsphere.sharding.spring.namespace.parser.ShardingAlgorithmBeanDefinitionParser;
import org.apache.shardingsphere.sharding.spring.namespace.parser.ShardingRuleBeanDefinitionParser;
import org.apache.shardingsphere.sharding.spring.namespace.parser.ShardingStrategyBeanDefinitionParser;
+import org.apache.shardingsphere.sharding.spring.namespace.tag.KeyGenerateAlgorithmBeanDefinitionTag;
import org.apache.shardingsphere.sharding.spring.namespace.tag.SPIBeanDefinitionTag;
import org.apache.shardingsphere.sharding.spring.namespace.tag.ShardingRuleBeanDefinitionTag;
import org.apache.shardingsphere.sharding.spring.namespace.tag.ShardingStrategyBeanDefinitionTag;
@@ -39,8 +40,8 @@ public final class ShardingNamespaceHandler extends NamespaceHandlerSupport {
registerBeanDefinitionParser(ShardingStrategyBeanDefinitionTag.COMPLEX_STRATEGY_ROOT_TAG, new ShardingStrategyBeanDefinitionParser());
registerBeanDefinitionParser(ShardingStrategyBeanDefinitionTag.HINT_STRATEGY_ROOT_TAG, new ShardingStrategyBeanDefinitionParser());
registerBeanDefinitionParser(ShardingStrategyBeanDefinitionTag.NONE_STRATEGY_ROOT_TAG, new ShardingStrategyBeanDefinitionParser());
- registerBeanDefinitionParser(ShardingRuleBeanDefinitionTag.KEY_GENERATE_STRATEGY_REF_TAG, new KeyGenerateStrategyBeanDefinitionParser());
- registerBeanDefinitionParser(SPIBeanDefinitionTag.KEY_GENERATE_ALGORITHM_TAG, new KeyGenerateAlgorithmBeanDefinitionParser());
+ registerBeanDefinitionParser(KeyGenerateAlgorithmBeanDefinitionTag.STRATEGY_TAG, new KeyGenerateStrategyBeanDefinitionParser());
+ registerBeanDefinitionParser(KeyGenerateAlgorithmBeanDefinitionTag.ALGORITHM_TAG, new KeyGenerateAlgorithmBeanDefinitionParser());
registerBeanDefinitionParser(SPIBeanDefinitionTag.SHARDING_ALGORITHM_TAG, new ShardingAlgorithmBeanDefinitionParser());
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateAlgorithmBeanDefinitionParser.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateAlgorithmBeanDefinitionParser.java
index a00ec60..8d38f15 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateAlgorithmBeanDefinitionParser.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateAlgorithmBeanDefinitionParser.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.spring.namespace.parser;
import org.apache.shardingsphere.sharding.spring.namespace.factorybean.KeyGenerateAlgorithmFactoryBean;
-import org.apache.shardingsphere.sharding.spring.namespace.tag.SPIBeanDefinitionTag;
+import org.apache.shardingsphere.sharding.spring.namespace.tag.KeyGenerateAlgorithmBeanDefinitionTag;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
@@ -36,13 +36,13 @@ public final class KeyGenerateAlgorithmBeanDefinitionParser extends AbstractBean
@Override
protected AbstractBeanDefinition parseInternal(final Element element, final ParserContext parserContext) {
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(KeyGenerateAlgorithmFactoryBean.class);
- factory.addConstructorArgValue(element.getAttribute(SPIBeanDefinitionTag.KEY_GENERATE_ALGORITHM_TYPE_ATTRIBUTE));
+ factory.addConstructorArgValue(element.getAttribute(KeyGenerateAlgorithmBeanDefinitionTag.TYPE_ATTRIBUTE));
factory.addConstructorArgValue(parseProperties(element, parserContext));
return factory.getBeanDefinition();
}
private Properties parseProperties(final Element element, final ParserContext parserContext) {
- Element propsElement = DomUtils.getChildElementByTagName(element, SPIBeanDefinitionTag.PROPS_TAG);
+ Element propsElement = DomUtils.getChildElementByTagName(element, KeyGenerateAlgorithmBeanDefinitionTag.PROPS_TAG);
return null == propsElement ? new Properties() : parserContext.getDelegate().parsePropsElement(propsElement);
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateStrategyBeanDefinitionParser.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateStrategyBeanDefinitionParser.java
index 879c761..853eae4 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateStrategyBeanDefinitionParser.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/KeyGenerateStrategyBeanDefinitionParser.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.spring.namespace.parser;
import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
-import org.apache.shardingsphere.sharding.spring.namespace.tag.ShardingRuleBeanDefinitionTag;
+import org.apache.shardingsphere.sharding.spring.namespace.tag.KeyGenerateAlgorithmBeanDefinitionTag;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
@@ -33,8 +33,8 @@ public final class KeyGenerateStrategyBeanDefinitionParser extends AbstractBeanD
@Override
protected AbstractBeanDefinition parseInternal(final Element element, final ParserContext parserContext) {
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(KeyGenerateStrategyConfiguration.class);
- factory.addConstructorArgValue(element.getAttribute(ShardingRuleBeanDefinitionTag.GENERATE_KEY_COLUMN_ATTRIBUTE));
- factory.addConstructorArgValue(element.getAttribute(ShardingRuleBeanDefinitionTag.GENERATE_KEY_ALGORITHM_REF_TAG));
+ factory.addConstructorArgValue(element.getAttribute(KeyGenerateAlgorithmBeanDefinitionTag.COLUMN_ATTRIBUTE));
+ factory.addConstructorArgValue(element.getAttribute(KeyGenerateAlgorithmBeanDefinitionTag.ALGORITHM_REF_TAG));
return factory.getBeanDefinition();
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/ShardingRuleBeanDefinitionParser.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/ShardingRuleBeanDefinitionParser.java
index 471f303..9c4c2f4 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/ShardingRuleBeanDefinitionParser.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/parser/ShardingRuleBeanDefinitionParser.java
@@ -21,6 +21,7 @@ import com.google.common.base.Strings;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.spring.namespace.factorybean.KeyGenerateAlgorithmFactoryBean;
+import org.apache.shardingsphere.sharding.spring.namespace.tag.KeyGenerateAlgorithmBeanDefinitionTag;
import org.apache.shardingsphere.sharding.spring.namespace.tag.ShardingRuleBeanDefinitionTag;
import org.apache.shardingsphere.sharding.strategy.algorithm.keygen.config.AlgorithmProvidedShardingRuleConfiguration;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -162,7 +163,7 @@ public final class ShardingRuleBeanDefinitionParser extends AbstractBeanDefiniti
}
private void parseKeyGenerateStrategyConfiguration(final Element tableElement, final BeanDefinitionBuilder factory) {
- String keyGenerator = tableElement.getAttribute(ShardingRuleBeanDefinitionTag.KEY_GENERATE_STRATEGY_REF_ATTRIBUTE);
+ String keyGenerator = tableElement.getAttribute(KeyGenerateAlgorithmBeanDefinitionTag.STRATEGY_REF_ATTRIBUTE);
if (!Strings.isNullOrEmpty(keyGenerator)) {
factory.addPropertyReference("keyGenerateStrategy", keyGenerator);
}
@@ -219,7 +220,7 @@ public final class ShardingRuleBeanDefinitionParser extends AbstractBeanDefiniti
}
private Collection<String> findKeyGenerateStrategyRefsFromTable(final List<Element> shardingTableElements) {
- return shardingTableElements.stream().filter(each -> !Strings.isNullOrEmpty(each.getAttribute(ShardingRuleBeanDefinitionTag.KEY_GENERATE_STRATEGY_REF_ATTRIBUTE)))
- .map(each -> each.getAttribute(ShardingRuleBeanDefinitionTag.KEY_GENERATE_STRATEGY_REF_ATTRIBUTE)).collect(Collectors.toSet());
+ return shardingTableElements.stream().filter(each -> !Strings.isNullOrEmpty(each.getAttribute(KeyGenerateAlgorithmBeanDefinitionTag.STRATEGY_REF_ATTRIBUTE)))
+ .map(each -> each.getAttribute(KeyGenerateAlgorithmBeanDefinitionTag.STRATEGY_REF_ATTRIBUTE)).collect(Collectors.toSet());
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/SPIBeanDefinitionTag.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/KeyGenerateAlgorithmBeanDefinitionTag.java
similarity index 66%
copy from shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/SPIBeanDefinitionTag.java
copy to shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/KeyGenerateAlgorithmBeanDefinitionTag.java
index d94dd93..eeb4c0b 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/SPIBeanDefinitionTag.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/KeyGenerateAlgorithmBeanDefinitionTag.java
@@ -21,18 +21,22 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * SPI bean definition tag.
+ * Key generate algorithm bean definition tag.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SPIBeanDefinitionTag {
+public final class KeyGenerateAlgorithmBeanDefinitionTag {
- public static final String KEY_GENERATE_ALGORITHM_TAG = "key-generate-algorithm";
+ public static final String ALGORITHM_TAG = "key-generate-algorithm";
- public static final String KEY_GENERATE_ALGORITHM_TYPE_ATTRIBUTE = "type";
+ public static final String TYPE_ATTRIBUTE = "type";
- public static final String SHARDING_ALGORITHM_TAG = "sharding-algorithm";
+ public static final String PROPS_TAG = "props";
- public static final String SHARDING_ALGORITHM_TYPE_ATTRIBUTE = "type";
+ public static final String STRATEGY_REF_ATTRIBUTE = "key-generate-strategy-ref";
- public static final String PROPS_TAG = "props";
+ public static final String STRATEGY_TAG = "key-generate-strategy";
+
+ public static final String COLUMN_ATTRIBUTE = "column";
+
+ public static final String ALGORITHM_REF_TAG = "algorithm-ref";
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/SPIBeanDefinitionTag.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/SPIBeanDefinitionTag.java
index d94dd93..8e25832 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/SPIBeanDefinitionTag.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/SPIBeanDefinitionTag.java
@@ -26,10 +26,6 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SPIBeanDefinitionTag {
- public static final String KEY_GENERATE_ALGORITHM_TAG = "key-generate-algorithm";
-
- public static final String KEY_GENERATE_ALGORITHM_TYPE_ATTRIBUTE = "type";
-
public static final String SHARDING_ALGORITHM_TAG = "sharding-algorithm";
public static final String SHARDING_ALGORITHM_TYPE_ATTRIBUTE = "type";
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/ShardingRuleBeanDefinitionTag.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/ShardingRuleBeanDefinitionTag.java
index 1ac79eb..ea78ddf 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/ShardingRuleBeanDefinitionTag.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-spring/shardingsphere-sharding-spring-namespace/src/main/java/org/apache/shardingsphere/sharding/spring/namespace/tag/ShardingRuleBeanDefinitionTag.java
@@ -65,12 +65,4 @@ public final class ShardingRuleBeanDefinitionTag {
public static final String DEFAULT_TABLE_STRATEGY_REF_ATTRIBUTE = "default-table-strategy-ref";
public static final String DEFAULT_KEY_GENERATE_STRATEGY_REF_ATTRIBUTE = "default-key-generate-strategy-ref";
-
- public static final String KEY_GENERATE_STRATEGY_REF_ATTRIBUTE = "key-generate-strategy-ref";
-
- public static final String KEY_GENERATE_STRATEGY_REF_TAG = "key-generate-strategy";
-
- public static final String GENERATE_KEY_COLUMN_ATTRIBUTE = "column";
-
- public static final String GENERATE_KEY_ALGORITHM_REF_TAG = "algorithm-ref";
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryEncryptTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/Orch [...]
index e761ad9..ccc9eb7 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryEncryptTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryEncryptTest.java
@@ -76,7 +76,7 @@ public class OrchestrationSpringBootRegistryEncryptTest {
+ " user_id:\n"
+ " cipherColumn: user_id\n"
+ " encryptorName: order_encrypt\n");
- testCenter.persist("/demo_spring_boot_ds_center/config/properties", "sql.show: 'true'\n");
+ testCenter.persist("/demo_spring_boot_ds_center/config/props", "sql.show: 'true'\n");
testCenter.persist("/demo_spring_boot_ds_center/registry/datasources", "");
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryMasterSlaveTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/ [...]
index 04e45fd..70a5838 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryMasterSlaveTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryMasterSlaveTest.java
@@ -88,7 +88,7 @@ public class OrchestrationSpringBootRegistryMasterSlaveTest {
+ " slaveDataSourceNames: \n"
+ " - ds_slave_0\n"
+ " - ds_slave_1\n");
- testCenter.persist("/demo_spring_boot_ds_center/config/properties", "{}\n");
+ testCenter.persist("/demo_spring_boot_ds_center/config/props", "{}\n");
testCenter.persist("/demo_spring_boot_ds_center/registry/datasources", "");
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryShardingTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/Orc [...]
index 8d9054b..07b9a54 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryShardingTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryShardingTest.java
@@ -126,7 +126,7 @@ public class OrchestrationSpringBootRegistryShardingTest {
+ " keyGenerators:\n"
+ " snowflake:\n"
+ " type: SNOWFLAKE\n");
- testCenter.persist("/demo_spring_boot_ds_center/config/properties", ""
+ testCenter.persist("/demo_spring_boot_ds_center/config/props", ""
+ "executor.size: '100'\n"
+ "sql.show: 'true'\n");
testCenter.persist("/demo_spring_boot_ds_center/registry/datasources", "");
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/constants/InstanceBeanDefinitionTag.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/constants/Instanc [...]
index 9fbde3e..66fc842 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/constants/InstanceBeanDefinitionTag.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/constants/InstanceBeanDefinitionTag.java
@@ -36,5 +36,5 @@ public final class InstanceBeanDefinitionTag {
public static final String NAMESPACE_TAG = "META-INF/namespace";
- public static final String PROP_TAG = "properties";
+ public static final String PROP_TAG = "props";
}
diff --git a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/ShardingPropertiesController.java b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/ShardingPropertiesController.java
index d533513..6f96e1b 100644
--- a/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/ShardingPropertiesController.java
+++ b/shardingsphere-ui/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/ShardingPropertiesController.java
@@ -56,7 +56,7 @@ public final class ShardingPropertiesController {
*/
@RequestMapping(value = "", method = RequestMethod.PUT)
public ResponseResult updateShardingProperties(@RequestBody final Map<String, String> configMap) {
- shardingPropertiesService.updateShardingProperties(configMap.get("properties"));
+ shardingPropertiesService.updateShardingProperties(configMap.get("props"));
return ResponseResultUtil.success();
}
}