You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/05/08 07:16:17 UTC
(shardingsphere) branch master updated: Fix sonar issues (#31165)
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 dd0d21e1fbb Fix sonar issues (#31165)
dd0d21e1fbb is described below
commit dd0d21e1fbb71f2245184f88898b032e7409dac7
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed May 8 15:16:09 2024 +0800
Fix sonar issues (#31165)
* Reuse encryptors when update encrypt tables
* Fix sonar issues
---
.../shardingsphere/encrypt/rule/EncryptRuleTest.java | 2 +-
.../infra/util/props/MultiSourceProperties.java | 14 ++++++++------
.../mode/tuple/annotation/RepositoryTupleField.java | 2 +-
.../manager/context/ConfigurationContextManager.java | 16 ++++++----------
4 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
index decb749fad0..230276d8b03 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptRuleTest.java
@@ -49,7 +49,7 @@ class EncryptRuleTest {
private static final String DIGEST_ALGORITHM_NAME = "digest-algorithm-name";
@Test
- public void assertGetAllTableNames() {
+ void assertGetAllTableNames() {
assertThat(new EncryptRule("foo_db", createEncryptRuleConfiguration()).getAllTableNames(), is(Collections.singleton("t_encrypt")));
}
diff --git a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/MultiSourceProperties.java b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/MultiSourceProperties.java
index 95be05f5171..6a126aeee95 100644
--- a/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/MultiSourceProperties.java
+++ b/infra/util/src/main/java/org/apache/shardingsphere/infra/util/props/MultiSourceProperties.java
@@ -24,10 +24,12 @@ import java.util.Properties;
*/
public final class MultiSourceProperties extends Properties {
- private final Properties[] defaults;
+ private static final long serialVersionUID = 4196837300230442865L;
- public MultiSourceProperties(final Properties... defaults) {
- this.defaults = defaults;
+ private final Properties[] multiProps;
+
+ public MultiSourceProperties(final Properties... multiProps) {
+ this.multiProps = multiProps;
}
@Override
@@ -36,7 +38,7 @@ public final class MultiSourceProperties extends Properties {
if (null != value) {
return value;
}
- for (Properties each : defaults) {
+ for (Properties each : multiProps) {
value = each.getProperty(key);
if (null != value) {
return value;
@@ -47,7 +49,7 @@ public final class MultiSourceProperties extends Properties {
@Override
public String getProperty(final String key, final String defaultValue) {
- String value = this.getProperty(key);
- return (null == value) ? defaultValue : value;
+ String value = getProperty(key);
+ return null == value ? defaultValue : value;
}
}
diff --git a/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/annotation/RepositoryTupleField.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/annotation/RepositoryTupleField.java
index add696df28e..74fde9ee9a8 100644
--- a/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/annotation/RepositoryTupleField.java
+++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/annotation/RepositoryTupleField.java
@@ -46,7 +46,7 @@ public @interface RepositoryTupleField {
Type type();
@RequiredArgsConstructor
- enum Type implements Comparable<Type> {
+ enum Type {
ALGORITHM, DEFAULT_ALGORITHM, STRATEGY, DEFAULT_STRATEGY, DATA_SOURCE, TABLE, OTHER
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
index f79844c4013..876b57a29da 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
@@ -160,11 +160,9 @@ public final class ConfigurationContextManager {
ShardingSphereDatabase database = metaDataContexts.get().getMetaData().getDatabase(databaseName);
Collection<ShardingSphereRule> rules = new LinkedList<>(database.getRuleMetaData().getRules());
Optional<ShardingSphereRule> toBeChangedRule = rules.stream().filter(each -> each.getConfiguration().getClass().equals(ruleConfig.getClass())).findFirst();
- if (toBeChangedRule.isPresent() && toBeChangedRule.get() instanceof PartialRuleUpdateSupported) {
- if (((PartialRuleUpdateSupported) toBeChangedRule.get()).partialUpdateRule(ruleConfig)) {
- ((PartialRuleUpdateSupported) toBeChangedRule.get()).updateConfiguration(ruleConfig);
- return;
- }
+ if (toBeChangedRule.isPresent() && toBeChangedRule.get() instanceof PartialRuleUpdateSupported && ((PartialRuleUpdateSupported) toBeChangedRule.get()).partialUpdateRule(ruleConfig)) {
+ ((PartialRuleUpdateSupported) toBeChangedRule.get()).updateConfiguration(ruleConfig);
+ return;
}
try {
rules.removeIf(each -> each.getConfiguration().getClass().isAssignableFrom(ruleConfig.getClass()));
@@ -189,11 +187,9 @@ public final class ConfigurationContextManager {
ShardingSphereDatabase database = metaDataContexts.get().getMetaData().getDatabase(databaseName);
Collection<ShardingSphereRule> rules = new LinkedList<>(database.getRuleMetaData().getRules());
Optional<ShardingSphereRule> toBeChangedRule = rules.stream().filter(each -> each.getConfiguration().getClass().equals(ruleConfig.getClass())).findFirst();
- if (toBeChangedRule.isPresent() && toBeChangedRule.get() instanceof PartialRuleUpdateSupported) {
- if (((PartialRuleUpdateSupported) toBeChangedRule.get()).partialUpdateRule(ruleConfig)) {
- ((PartialRuleUpdateSupported) toBeChangedRule.get()).updateConfiguration(ruleConfig);
- return;
- }
+ if (toBeChangedRule.isPresent() && toBeChangedRule.get() instanceof PartialRuleUpdateSupported && ((PartialRuleUpdateSupported) toBeChangedRule.get()).partialUpdateRule(ruleConfig)) {
+ ((PartialRuleUpdateSupported) toBeChangedRule.get()).updateConfiguration(ruleConfig);
+ return;
}
try {
rules.removeIf(each -> each.getConfiguration().getClass().isAssignableFrom(ruleConfig.getClass()));