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 b1bf3a12b2c Fix sonar issue (#26198)
b1bf3a12b2c is described below
commit b1bf3a12b2c142a150922dbbe692c95c550a57dd
Author: ChenJiaHao <[email protected]>
AuthorDate: Thu Jun 8 18:37:53 2023 +0800
Fix sonar issue (#26198)
---
.../parser/core/EncryptDistSQLStatementVisitor.java | 15 ++++++++++-----
.../mask/metadata/converter/MaskNodeConverter.java | 6 ++++--
.../converter/ReadwriteSplittingNodeConverter.java | 6 ++++--
.../shadow/metadata/converter/ShadowNodeConverter.java | 8 +++++---
4 files changed, 23 insertions(+), 12 deletions(-)
diff --git
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
index 855018df646..54fbe703b00 100644
---
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
+++
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -87,11 +87,16 @@ public final class EncryptDistSQLStatementVisitor extends
EncryptDistSQLStatemen
return new
EncryptColumnSegment(getIdentifierValue(ctx.columnDefinition().columnName()),
new
EncryptColumnItemSegment(getIdentifierValue(ctx.cipherColumnDefinition().cipherColumnName()),
(AlgorithmSegment) visit(ctx.encryptAlgorithm().algorithmDefinition())),
null == ctx.assistedQueryColumnDefinition() ? null
- : new
EncryptColumnItemSegment(getIdentifierValue(ctx.assistedQueryColumnDefinition().assistedQueryColumnName()),
- null == ctx.assistedQueryAlgorithm() ? null :
(AlgorithmSegment) visit(ctx.assistedQueryAlgorithm().algorithmDefinition())),
- null == ctx.likeQueryColumnDefinition() ? null
- : new
EncryptColumnItemSegment(getIdentifierValue(ctx.likeQueryColumnDefinition().likeQueryColumnName()),
- null == ctx.likeQueryAlgorithm() ? null :
(AlgorithmSegment) visit(ctx.likeQueryAlgorithm().algorithmDefinition())));
+ : new
EncryptColumnItemSegment(getIdentifierValue(ctx.assistedQueryColumnDefinition().assistedQueryColumnName()),
getAssistedEncryptor(ctx)),
+ null == ctx.likeQueryColumnDefinition() ? null : new
EncryptColumnItemSegment(getIdentifierValue(ctx.likeQueryColumnDefinition().likeQueryColumnName()),
getLikeEncryptor(ctx)));
+ }
+
+ private AlgorithmSegment getAssistedEncryptor(final
EncryptColumnDefinitionContext ctx) {
+ return null == ctx.assistedQueryAlgorithm() ? null :
(AlgorithmSegment) visit(ctx.assistedQueryAlgorithm().algorithmDefinition());
+ }
+
+ private AlgorithmSegment getLikeEncryptor(final
EncryptColumnDefinitionContext ctx) {
+ return null == ctx.likeQueryAlgorithm() ? null : (AlgorithmSegment)
visit(ctx.likeQueryAlgorithm().algorithmDefinition());
}
@Override
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/converter/MaskNodeConverter.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/converter/MaskNodeConverter.java
index a38af5a3d3c..1f42eec981f 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/converter/MaskNodeConverter.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/metadata/converter/MaskNodeConverter.java
@@ -38,6 +38,8 @@ public final class MaskNodeConverter {
private static final String RULES_NODE_PREFIX =
"/([\\w\\-]+)/([\\w\\-]+)/rules/";
+ private static final String RULE_NAME_PATTERN = "/([\\w\\-]+)?";
+
/**
* Get table name path.
*
@@ -101,7 +103,7 @@ public final class MaskNodeConverter {
* @return table name
*/
public static Optional<String> getTableName(final String rulePath) {
- Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ TABLES_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ TABLES_NODE + RULE_NAME_PATTERN, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
@@ -113,7 +115,7 @@ public final class MaskNodeConverter {
* @return algorithm name
*/
public static Optional<String> getAlgorithmName(final String rulePath) {
- Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ ALGORITHMS_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ ALGORITHMS_NODE + RULE_NAME_PATTERN, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
index c6053d86399..01676f84688 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/metadata/converter/ReadwriteSplittingNodeConverter.java
@@ -38,6 +38,8 @@ public final class ReadwriteSplittingNodeConverter {
private static final String RULES_NODE_PREFIX =
"/([\\w\\-]+)/([\\w\\-]+)/rules/";
+ private static final String RULE_NAME_PATTERN = "/([\\w\\-]+)?";
+
/**
* Get group name path.
*
@@ -101,7 +103,7 @@ public final class ReadwriteSplittingNodeConverter {
* @return group name
*/
public static Optional<String> getGroupName(final String rulePath) {
- Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ DATA_SOURCES_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ DATA_SOURCES_NODE + RULE_NAME_PATTERN, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
@@ -113,7 +115,7 @@ public final class ReadwriteSplittingNodeConverter {
* @return load balancer name
*/
public static Optional<String> getLoadBalancerName(final String rulePath) {
- Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ LOAD_BALANCER_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ LOAD_BALANCER_NODE + RULE_NAME_PATTERN, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/converter/ShadowNodeConverter.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/converter/ShadowNodeConverter.java
index e871f7049ab..6d835268a08 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/converter/ShadowNodeConverter.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/metadata/converter/ShadowNodeConverter.java
@@ -42,6 +42,8 @@ public final class ShadowNodeConverter {
private static final String RULES_NODE_PREFIX =
"/([\\w\\-]+)/([\\w\\-]+)/rules/";
+ private static final String RULE_NAME_PATTERN = "/([\\w\\-]+)?";
+
/**
* Get data source path.
*
@@ -148,7 +150,7 @@ public final class ShadowNodeConverter {
* @return data source name
*/
public static Optional<String> getDataSourceName(final String rulePath) {
- Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ DATA_SOURCES_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ DATA_SOURCES_NODE + RULE_NAME_PATTERN, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
@@ -160,7 +162,7 @@ public final class ShadowNodeConverter {
* @return table name
*/
public static Optional<String> getTableName(final String rulePath) {
- Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ TABLES_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ TABLES_NODE + RULE_NAME_PATTERN, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
@@ -172,7 +174,7 @@ public final class ShadowNodeConverter {
* @return algorithm name
*/
public static Optional<String> getAlgorithmName(final String rulePath) {
- Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ ALGORITHMS_NODE + "/([\\w\\-]+)?", Pattern.CASE_INSENSITIVE);
+ Pattern pattern = Pattern.compile(RULES_NODE_PREFIX + ROOT_NODE + "/"
+ ALGORITHMS_NODE + RULE_NAME_PATTERN, Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) :
Optional.empty();
}
