This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 679b0e5 Rename mode-repository to standalone-mode-repository (#11933)
679b0e5 is described below
commit 679b0e51b2957cd9d7bf503de67ce11fbabb844a
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 21 15:33:06 2021 +0800
Rename mode-repository to standalone-mode-repository (#11933)
---
.../spring/namespace/handler/DataSourceNamespaceHandler.java | 6 +++---
...daloneModeRepositoryConfigurationBeanDefinitionParser.java} | 10 +++++-----
...Tag.java => StandaloneModeRepositoryBeanDefinitionTag.java} | 6 +++---
.../src/main/resources/META-INF/namespace/datasource.xsd | 2 +-
.../resources/META-INF/spring/memory-application-context.xml | 2 +-
.../META-INF/spring/standalone-application-context.xml | 6 ++----
6 files changed, 15 insertions(+), 17 deletions(-)
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/handler/DataSourceNamespaceHandler.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/handler/DataSourceNamespaceHandler.java
index acb6c30..5f92b8a 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/handler/DataSourceNamespaceHandler.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/handler/DataSourceNamespaceHandler.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.spring.namespace.handler;
import
org.apache.shardingsphere.spring.namespace.parser.DataSourceBeanDefinitionParser;
-import
org.apache.shardingsphere.spring.namespace.parser.ModeRepositoryConfigurationBeanDefinitionParser;
+import
org.apache.shardingsphere.spring.namespace.parser.StandaloneModeRepositoryConfigurationBeanDefinitionParser;
import
org.apache.shardingsphere.spring.namespace.parser.TransactionTypeScannerBeanDefinitionParser;
import
org.apache.shardingsphere.spring.namespace.tag.DataSourceBeanDefinitionTag;
-import
org.apache.shardingsphere.spring.namespace.tag.ModeRepositoryBeanDefinitionTag;
+import
org.apache.shardingsphere.spring.namespace.tag.StandaloneModeRepositoryBeanDefinitionTag;
import
org.apache.shardingsphere.spring.namespace.tag.TransactionTypeScannerBeanDefinitionTag;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
@@ -33,7 +33,7 @@ public final class DataSourceNamespaceHandler extends
NamespaceHandlerSupport {
@Override
public void init() {
registerBeanDefinitionParser(DataSourceBeanDefinitionTag.ROOT_TAG, new
DataSourceBeanDefinitionParser());
- registerBeanDefinitionParser(ModeRepositoryBeanDefinitionTag.ROOT_TAG,
new ModeRepositoryConfigurationBeanDefinitionParser());
+
registerBeanDefinitionParser(StandaloneModeRepositoryBeanDefinitionTag.ROOT_TAG,
new StandaloneModeRepositoryConfigurationBeanDefinitionParser());
registerBeanDefinitionParser(TransactionTypeScannerBeanDefinitionTag.ROOT_TAG,
new TransactionTypeScannerBeanDefinitionParser());
}
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/ModeRepositoryConfigurationBeanDefinitionParser.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/StandaloneModeRepositoryConfigurationBeanDefinitionParser.java
similarity index 81%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/ModeRepositoryConfigurationBeanDefinitionParser.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/StandaloneModeRepositoryConfigurationBeanDefinitionParser.java
index 2bc754c..4880e6c 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/ModeRepositoryConfigurationBeanDefinitionParser.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/StandaloneModeRepositoryConfigurationBeanDefinitionParser.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.spring.namespace.parser;
import
org.apache.shardingsphere.infra.mode.config.StandalonePersistRepositoryConfiguration;
-import
org.apache.shardingsphere.spring.namespace.tag.ModeRepositoryBeanDefinitionTag;
+import
org.apache.shardingsphere.spring.namespace.tag.StandaloneModeRepositoryBeanDefinitionTag;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
@@ -29,20 +29,20 @@ import org.w3c.dom.Element;
import java.util.Properties;
/**
- * Mode repository configuration parser for spring namespace.
+ * Standalone mode repository configuration parser for spring namespace.
*/
-public final class ModeRepositoryConfigurationBeanDefinitionParser extends
AbstractBeanDefinitionParser {
+public final class StandaloneModeRepositoryConfigurationBeanDefinitionParser
extends AbstractBeanDefinitionParser {
@Override
protected AbstractBeanDefinition parseInternal(final Element element,
final ParserContext parserContext) {
BeanDefinitionBuilder factory =
BeanDefinitionBuilder.rootBeanDefinition(StandalonePersistRepositoryConfiguration.class);
-
factory.addConstructorArgValue(element.getAttribute(ModeRepositoryBeanDefinitionTag.TYPE_ATTRIBUTE));
+
factory.addConstructorArgValue(element.getAttribute(StandaloneModeRepositoryBeanDefinitionTag.TYPE_ATTRIBUTE));
factory.addConstructorArgValue(parseProperties(element,
parserContext));
return factory.getBeanDefinition();
}
private Properties parseProperties(final Element element, final
ParserContext parserContext) {
- Element propsElement = DomUtils.getChildElementByTagName(element,
ModeRepositoryBeanDefinitionTag.PROPS_TAG);
+ Element propsElement = DomUtils.getChildElementByTagName(element,
StandaloneModeRepositoryBeanDefinitionTag.PROPS_TAG);
return null == propsElement ? new Properties() :
parserContext.getDelegate().parsePropsElement(propsElement);
}
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/ModeRepositoryBeanDefinitionTag.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/StandaloneModeRepositoryBeanDefinitionTag.java
similarity index 85%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/ModeRepositoryBeanDefinitionTag.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/StandaloneModeRepositoryBeanDefinitionTag.java
index 2bd5095..c098a31 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/ModeRepositoryBeanDefinitionTag.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/tag/StandaloneModeRepositoryBeanDefinitionTag.java
@@ -21,12 +21,12 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Mode repository bean definition tag.
+ * Standalone mode repository bean definition tag.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ModeRepositoryBeanDefinitionTag {
+public final class StandaloneModeRepositoryBeanDefinitionTag {
- public static final String ROOT_TAG = "mode-repository";
+ public static final String ROOT_TAG = "standalone-mode-repository";
public static final String TYPE_ATTRIBUTE = "type";
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd
index 7e55b72..9646932 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/resources/META-INF/namespace/datasource.xsd
@@ -44,7 +44,7 @@
</xsd:complexType>
</xsd:element>
- <xsd:element name="mode-repository">
+ <xsd:element name="standalone-mode-repository">
<xsd:complexType>
<xsd:all>
<xsd:element ref="beans:props" minOccurs="0" />
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/memory-application-context.xml
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/memory-application-context.xml
index 939ac1f..e6d3697 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/memory-application-context.xml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/memory-application-context.xml
@@ -32,7 +32,7 @@
<import resource="included/data-sources-context.xml" />
<import resource="included/rules-context.xml" />
- <shardingsphere:data-source id="dataSource" schema-name="logic_db"
data-source-names="ds_0_write,ds_0_read_0,ds_0_read_1,ds_1_write,ds_1_read_0,ds_1_read_1"
rule-refs="shardingRule, readWriteSplittingRule, encryptRule">
+ <shardingsphere:data-source id="dataSource"
data-source-names="ds_0_write,ds_0_read_0,ds_0_read_1,ds_1_write,ds_1_read_0,ds_1_read_1"
rule-refs="shardingRule, readWriteSplittingRule, encryptRule">
<props>
<prop key="sql-show">false</prop>
<prop key="executor-size">${executor-size}</prop>
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/standalone-application-context.xml
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/standalone-application-context.xml
index 753894d..887f243 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/standalone-application-context.xml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/standalone-application-context.xml
@@ -32,11 +32,9 @@
<import resource="included/data-sources-context.xml" />
<import resource="included/rules-context.xml" />
- <shardingsphere:mode-repository id="local" type="Local">
-
- </shardingsphere:mode-repository>
+ <shardingsphere:standalone-mode-repository id="local" type="Local" />
- <shardingsphere:data-source id="dataSource" schema-name="logic_db"
data-source-names="ds_0_write,ds_0_read_0,ds_0_read_1,ds_1_write,ds_1_read_0,ds_1_read_1"
rule-refs="shardingRule, readWriteSplittingRule, encryptRule">
+ <shardingsphere:data-source id="dataSource"
data-source-names="ds_0_write,ds_0_read_0,ds_0_read_1,ds_1_write,ds_1_read_0,ds_1_read_1"
rule-refs="shardingRule, readWriteSplittingRule, encryptRule">
<shardingsphere:mode type="Standalone" repository-ref="local"
overwrite="true" />
<props>
<prop key="sql-show">false</prop>
