This is an automated email from the ASF dual-hosted git repository.
totalo 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 9fa738cc68e Revise #19975 Simplify codes (#20002)
9fa738cc68e is described below
commit 9fa738cc68efc94475776fba077068c2d47ca7d8
Author: 吴伟杰 <[email protected]>
AuthorDate: Tue Aug 9 14:00:25 2022 +0800
Revise #19975 Simplify codes (#20002)
* Revise #19975 Simplify RegistryCenter.getJDBCDatabaseName
* Remove cast in AbstractReadwriteSplittingRuleConfigurationChecker
---
.../AbstractReadwriteSplittingRuleConfigurationChecker.java | 2 +-
.../mode/manager/cluster/coordinator/RegistryCenter.java | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
index 5afe814b6c8..219174fcede 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/checker/AbstractReadwriteSplittingRuleConfigurationChecker.java
@@ -110,7 +110,7 @@ public abstract class
AbstractReadwriteSplittingRuleConfigurationChecker<T exten
if (loadBalancer instanceof WeightReadQueryLoadBalanceAlgorithm ||
loadBalancer instanceof TransactionWeightReadQueryLoadBalanceAlgorithm) {
Preconditions.checkState(!loadBalancer.getProps().isEmpty(),
"Readwrite-splitting data source weight config are required in database `%s`.",
databaseName);
Collection<String> dataSourceNames = getDataSourceNames(each,
rules);
- loadBalancer.getProps().keySet().forEach(dataSourceName ->
Preconditions.checkState(dataSourceNames.contains((String) dataSourceName),
+
loadBalancer.getProps().stringPropertyNames().forEach(dataSourceName ->
Preconditions.checkState(dataSourceNames.contains(dataSourceName),
"Load Balancer datasource name config does not match
datasource in database `%s`.", databaseName));
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
index e416d0055ba..bc7d7bfb54a 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
@@ -19,19 +19,19 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator;
import lombok.Getter;
import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
-import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import
org.apache.shardingsphere.infra.instance.metadata.jdbc.JDBCInstanceMetaData;
+import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.mode.lock.LockPersistService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcherFactory;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.cache.subscriber.ScalingRegistrySubscriber;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.SchemaMetaDataRegistrySubscriber;
-import
org.apache.shardingsphere.mode.manager.cluster.process.subscriber.ProcessRegistrySubscriber;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.service.ComputeNodeStatusService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.subscriber.ComputeNodeStatusSubscriber;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.service.StorageNodeStatusService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.subscriber.StorageNodeStatusSubscriber;
+import
org.apache.shardingsphere.mode.manager.cluster.process.subscriber.ProcessRegistrySubscriber;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import java.util.Map;
@@ -76,9 +76,7 @@ public final class RegistryCenter {
}
private String getJDBCDatabaseName() {
- return instanceMetaData instanceof JDBCInstanceMetaData &&
databaseConfigs.keySet().stream().findFirst().isPresent()
- ? databaseConfigs.keySet().stream().findFirst().get()
- : null;
+ return instanceMetaData instanceof JDBCInstanceMetaData ?
databaseConfigs.keySet().stream().findFirst().orElse(null) : null;
}
private void createSubscribers(final ClusterPersistRepository repository) {
