This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 4591bda5443 Fix sonar issue (#26509)
4591bda5443 is described below
commit 4591bda54436c5fe62bb494bfff1b4320f925c6c
Author: zhaojinchao <[email protected]>
AuthorDate: Fri Jun 23 22:40:28 2023 +0800
Fix sonar issue (#26509)
---
.../metadata/converter/ReadwriteSplittingNodeConverter.java | 2 +-
.../NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java | 7 ++-----
.../metadata/persist/service/config/AbstractPersistService.java | 3 +--
.../persist/service/config/database/DataSourcePersistService.java | 3 ++-
.../service/config/database/DatabaseRulePersistService.java | 3 ++-
.../persist/service/config/global/NewGlobalRulePersistService.java | 4 ----
6 files changed, 8 insertions(+), 14 deletions(-)
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 e842aa49b26..84e4dc29172 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,7 +38,7 @@ public final class ReadwriteSplittingNodeConverter {
private static final String RULES_NODE_PREFIX =
"/([\\w\\-]+)/([\\w\\-]+)/rules/";
- private static final String RULE_NAME_PATTERN = "/([\\w\\-]+)/versions/?";
+ private static final String RULE_NAME_PATTERN = "/([\\w\\-]+)/versions?";
private static final String RULE_ACTIVE_VERSION =
"/([\\w\\-]+)/active_version$";
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
index 7cf136d1be0..23159496dde 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/NewYamlReadwriteSplittingRuleConfigurationSwapperTest.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.infra.util.yaml.datanode.YamlDataNode;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -67,18 +66,16 @@ class NewYamlReadwriteSplittingRuleConfigurationSwapperTest
{
assertThat(result.getLoadBalancers().size(), is(0));
}
- // Fixme
- @Disabled
@Test
void assertSwapToObject() {
Collection<YamlDataNode> config = new LinkedList<>();
- config.add(new
YamlDataNode("/metadata/foo_db/rules/readwrite_splitting/data_sources/group_0",
"loadBalancerName: random\n"
+ config.add(new
YamlDataNode("/metadata/foo_db/rules/readwrite_splitting/data_sources/group_0/version/0",
"loadBalancerName: random\n"
+ "readDataSourceNames:\n"
+ "- read_ds_0\n"
+ "- read_ds_1\n"
+ "transactionalReadQueryStrategy: DYNAMIC\n"
+ "writeDataSourceName: write_ds\n"));
- config.add(new
YamlDataNode("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random",
"type: random\n"));
+ config.add(new
YamlDataNode("/metadata/foo_db/rules/readwrite_splitting/load_balancers/random/versions/0",
"type: random\n"));
ReadwriteSplittingRuleConfiguration result =
swapper.swapToObject(config);
assertThat(result.getDataSources().size(), is(1));
assertThat(result.getDataSources().iterator().next().getName(),
is("group_0"));
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/AbstractPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/AbstractPersistService.java
index 3106503ae43..39a92e7bf9f 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/AbstractPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/AbstractPersistService.java
@@ -83,8 +83,7 @@ public abstract class AbstractPersistService {
return String.join("/", path, childKey);
}
- private String getActiveVersion(final String key) {
+ protected String getActiveVersion(final String key) {
return repository.getDirectly(key);
}
-
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
index ac86b1a7cef..92afad4169e 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
@@ -27,6 +27,7 @@ import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -53,7 +54,7 @@ public final class DataSourcePersistService implements
DatabaseBasedPersistServi
@Override
public Collection<MetaDataVersion> persistConfig(final String
databaseName, final Map<String, DataSourceProperties> configs) {
- return null;
+ return Collections.emptyList();
}
private Map<String, Map<String, Object>>
swapYamlDataSourceConfiguration(final Map<String, DataSourceProperties>
dataSourcePropsMap) {
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
index e714ae087cb..56263ffe0ee 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java
@@ -28,6 +28,7 @@ import
org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedList;
/**
@@ -51,7 +52,7 @@ public final class DatabaseRulePersistService implements
DatabaseBasedPersistSer
@Override
public Collection<MetaDataVersion> persistConfig(final String
databaseName, final Collection<RuleConfiguration> configs) {
- return null;
+ return Collections.emptyList();
}
private Collection<YamlRuleConfiguration>
createYamlRuleConfigurations(final Collection<RuleConfiguration> ruleConfigs) {
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/NewGlobalRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/NewGlobalRulePersistService.java
index 2c2627fc12a..8b108d9f0b2 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/NewGlobalRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/NewGlobalRulePersistService.java
@@ -121,8 +121,4 @@ public final class NewGlobalRulePersistService extends
AbstractPersistService im
.filter(AuthorityRuleConfiguration.class::isInstance).map(AuthorityRuleConfiguration.class::cast).findFirst();
return authorityRuleConfig.isPresent() ?
authorityRuleConfig.get().getUsers() : Collections.emptyList();
}
-
- private String getActiveVersion(final String ruleName) {
- return
repository.getDirectly(NewGlobalNode.getGlobalRuleActiveVersionNode(ruleName));
- }
}
