This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 63ab54b Refactor CacheOption (#16350)
63ab54b is described below
commit 63ab54bd886623a2583c86dda8beb3128079dbfe
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Mar 25 01:49:39 2022 +0800
Refactor CacheOption (#16350)
* Refactor CacheOption
* Fix spring
* For checkstyle
---
.../YamlSQLParserCacheOptionRuleConfiguration.java | 6 +++---
.../parser/CacheOptionBeanDefinitionParser.java | 8 ++++----
.../parser/SQLParserRuleBeanDefinitionParser.java | 2 +-
.../src/main/resources/META-INF/namespace/sql-parser.xsd | 16 +++++++---------
.../ral/common/updatable/AlterSQLParserRuleHandler.java | 9 ++++-----
.../shardingsphere/sql/parser/api/CacheOption.java | 14 +++++---------
6 files changed, 24 insertions(+), 31 deletions(-)
diff --git
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/yaml/config/YamlSQLParserCacheOptionRuleConfiguration.java
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/yaml/config/YamlSQLParserCacheOptionRuleConfiguration.java
index 3d06aca..c0fb2f1 100644
---
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/yaml/config/YamlSQLParserCacheOptionRuleConfiguration.java
+++
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-core/src/main/java/org/apache/shardingsphere/parser/yaml/config/YamlSQLParserCacheOptionRuleConfiguration.java
@@ -27,10 +27,10 @@ import
org.apache.shardingsphere.infra.yaml.config.pojo.YamlConfiguration;
@Getter
@Setter
public final class YamlSQLParserCacheOptionRuleConfiguration implements
YamlConfiguration {
-
+
private int initialCapacity;
-
+
private long maximumSize;
-
+
private int concurrencyLevel;
}
diff --git
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/CacheOptionBeanDefinitionParser.java
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/CacheOptionBeanDefinitionParser.java
index 46baf2a..397fb7e 100644
---
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/CacheOptionBeanDefinitionParser.java
+++
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/CacheOptionBeanDefinitionParser.java
@@ -28,14 +28,14 @@ import org.w3c.dom.Element;
/**
* Cache option bean parser for spring namespace.
*/
-public class CacheOptionBeanDefinitionParser extends
AbstractBeanDefinitionParser {
+public final class CacheOptionBeanDefinitionParser extends
AbstractBeanDefinitionParser {
@Override
protected AbstractBeanDefinition parseInternal(final Element element,
final ParserContext parserContext) {
BeanDefinitionBuilder factory =
BeanDefinitionBuilder.rootBeanDefinition(CacheOption.class);
- factory.addPropertyValue("initialCapacity",
element.getAttribute(SQLParserRuleBeanDefinitionTag.INITIAL_CAPACITY));
- factory.addPropertyValue("maximumSize",
element.getAttribute(SQLParserRuleBeanDefinitionTag.MAXIMUM_SIZE));
- factory.addPropertyValue("concurrencyLevel",
element.getAttribute(SQLParserRuleBeanDefinitionTag.CONCURRENCY_LEVEL));
+
factory.addConstructorArgValue(element.getAttribute(SQLParserRuleBeanDefinitionTag.INITIAL_CAPACITY));
+
factory.addConstructorArgValue(element.getAttribute(SQLParserRuleBeanDefinitionTag.MAXIMUM_SIZE));
+
factory.addConstructorArgValue(element.getAttribute(SQLParserRuleBeanDefinitionTag.CONCURRENCY_LEVEL));
return factory.getBeanDefinition();
}
}
diff --git
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/SQLParserRuleBeanDefinitionParser.java
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/SQLParserRuleBeanDefinitionParser.java
index 75c2433..9f0f7d8 100644
---
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/SQLParserRuleBeanDefinitionParser.java
+++
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/java/org/apache/shardingsphere/parser/spring/namespace/parser/SQLParserRuleBeanDefinitionParser.java
@@ -31,7 +31,7 @@ import java.util.Optional;
/**
* SQL parser bean parser for spring namespace.
*/
-public class SQLParserRuleBeanDefinitionParser extends
AbstractBeanDefinitionParser {
+public final class SQLParserRuleBeanDefinitionParser extends
AbstractBeanDefinitionParser {
@Override
protected AbstractBeanDefinition parseInternal(final Element element,
final ParserContext parserContext) {
diff --git
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/resources/META-INF/namespace/sql-parser.xsd
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/resources/META-INF/namespace/sql-parser.xsd
index 3ca3f32..6e8cc4e 100644
---
a/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/resources/META-INF/namespace/sql-parser.xsd
+++
b/shardingsphere-kernel/shardingsphere-parser/shardingsphere-parser-spring/shardingsphere-parser-spring-namespace/src/main/resources/META-INF/namespace/sql-parser.xsd
@@ -20,13 +20,12 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://shardingsphere.apache.org/schema/shardingsphere/sql-parser";
elementFormDefault="qualified">
- <xsd:import namespace="http://www.springframework.org/schema/beans";
-
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
-
+ <xsd:import namespace="http://www.springframework.org/schema/beans";
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"; />
+
<xsd:element name="rule">
<xsd:complexType>
- <xsd:attribute name="id" type="xsd:string" use="required"/>
- <xsd:attribute name="sql-comment-parse-enable" type="xsd:boolean"
default="false"/>
+ <xsd:attribute name="id" type="xsd:string" use="required" />
+ <xsd:attribute name="sql-comment-parse-enable" type="xsd:boolean"
default="false" />
<xsd:attribute name="sql-statement-cache-ref" type="xsd:string" />
<xsd:attribute name="parse-tree-cache-ref" type="xsd:string" />
</xsd:complexType>
@@ -35,10 +34,9 @@
<xsd:element name="cache-option">
<xsd:complexType>
<xsd:attribute name="id" type="xsd:string" use="required" />
- <xsd:attribute name="initial-capacity" type="xsd:int"
use="required"/>
- <xsd:attribute name="maximum-size" type="xsd:long" use="required"/>
- <xsd:attribute name="concurrency-level" type="xsd:int"
use="required"/>
+ <xsd:attribute name="initial-capacity" type="xsd:int"
use="required" />
+ <xsd:attribute name="maximum-size" type="xsd:long" use="required"
/>
+ <xsd:attribute name="concurrency-level" type="xsd:int"
use="required" />
</xsd:complexType>
</xsd:element>
-
</xsd:schema>
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
index fda7a37..7e5076b 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/AlterSQLParserRuleHandler.java
@@ -74,10 +74,9 @@ public final class AlterSQLParserRuleHandler extends
UpdatableRALBackendHandler<
}
private CacheOption buildCacheOption(final CacheOption cacheOption, final
CacheOptionSegment segment) {
- CacheOption result = new CacheOption();
- result.setInitialCapacity(null == segment.getInitialCapacity() ?
cacheOption.getInitialCapacity() : segment.getInitialCapacity());
- result.setMaximumSize(null == segment.getMaximumSize() ?
cacheOption.getMaximumSize() : segment.getMaximumSize());
- result.setConcurrencyLevel(null == segment.getConcurrencyLevel() ?
cacheOption.getConcurrencyLevel() : segment.getConcurrencyLevel());
- return result;
+ int initialCapacity = null == segment.getInitialCapacity() ?
cacheOption.getInitialCapacity() : segment.getInitialCapacity();
+ long maximumSize = null == segment.getMaximumSize() ?
cacheOption.getMaximumSize() : segment.getMaximumSize();
+ int concurrencyLevel = null == segment.getConcurrencyLevel() ?
cacheOption.getConcurrencyLevel() : segment.getConcurrencyLevel();
+ return new CacheOption(initialCapacity, maximumSize, concurrencyLevel);
}
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/CacheOption.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/CacheOption.java
index ea73ce1..5031634 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/CacheOption.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/api/CacheOption.java
@@ -17,23 +17,19 @@
package org.apache.shardingsphere.sql.parser.api;
-import lombok.AllArgsConstructor;
import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.RequiredArgsConstructor;
/**
* Cache option.
*/
+@RequiredArgsConstructor
@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
public final class CacheOption {
- private int initialCapacity;
+ private final int initialCapacity;
- private long maximumSize;
+ private final long maximumSize;
- private int concurrencyLevel;
+ private final int concurrencyLevel;
}
