This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 7953c8f8006 Refactor QualifiedDataSourceChangedHandler (#35094)
7953c8f8006 is described below
commit 7953c8f8006f0095951456cc0023d46da3724034
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Mar 27 22:29:36 2025 +0800
Refactor QualifiedDataSourceChangedHandler (#35094)
* Refactor QualifiedDataSourceChangedHandler
* Refactor QualifiedDataSourceChangedHandler
---
.../global/node/storage/QualifiedDataSourceChangedHandler.java | 5 +++--
.../global/node/storage/QualifiedDataSourceChangedHandlerTest.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandler.java
index dc9f152ec10..74d81be4d57 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandler.java
@@ -17,8 +17,9 @@
package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.storage;
-import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
+import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedDataSource;
import
org.apache.shardingsphere.infra.rule.attribute.datasource.StaticDataSourceRuleAttribute;
@@ -67,7 +68,7 @@ public final class QualifiedDataSourceChangedHandler
implements GlobalDataChange
}
private void handleQualifiedDataSourceStateChanged(final
ShardingSphereMetaData metaData, final QualifiedDataSource qualifiedDataSource,
final QualifiedDataSourceState state) {
-
Preconditions.checkState(metaData.containsDatabase(qualifiedDataSource.getDatabaseName()),
"No database '%s' exists.", qualifiedDataSource.getDatabaseName());
+
ShardingSpherePreconditions.checkState(metaData.containsDatabase(qualifiedDataSource.getDatabaseName()),
() -> new UnknownDatabaseException(qualifiedDataSource.getDatabaseName()));
metaData.getDatabase(qualifiedDataSource.getDatabaseName()).getRuleMetaData().getAttributes(StaticDataSourceRuleAttribute.class)
.forEach(each -> each.updateStatus(qualifiedDataSource,
state.getState()));
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandlerTest.java
index e5399ad165c..a51c1b0da56 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/node/storage/QualifiedDataSourceChangedHandlerTest.java
@@ -54,7 +54,7 @@ class QualifiedDataSourceChangedHandlerTest {
@BeforeEach
void setUp() {
handler =
ShardingSphereServiceLoader.getServiceInstances(GlobalDataChangedEventHandler.class).stream()
- .filter(each ->
NodePathGenerator.toPath(each.getSubscribedNodePath()).equals("/nodes/qualified_data_sources")).findFirst().orElse(null);
+ .filter(each ->
"/nodes/qualified_data_sources".equals(NodePathGenerator.toPath(each.getSubscribedNodePath()))).findFirst().orElse(null);
}
@Test
