Refactor ProxyContext (#29693)

* Refactor ProxyContext * Fix test case
apache · Jan 10, 2024 · 6de521c · 6de521c
1 parent cc6d5eb
commit 6de521c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...kend/core/src/main/java/org/apache/shardingsphere/proxy/backend/context/ProxyContext.java b/...kend/core/src/main/java/org/apache/shardingsphere/proxy/backend/context/ProxyContext.java
@@ -22,6 +22,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException;
+import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException;
 import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import org.apache.shardingsphere.infra.state.instance.InstanceStateContext;
 import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
@@ -80,7 +81,8 @@ public boolean databaseExists(final String name) {
      * @return got database
      */
     public ShardingSphereDatabase getDatabase(final String name) {
-        ShardingSpherePreconditions.checkState(!Strings.isNullOrEmpty(name) && contextManager.getMetaDataContexts().getMetaData().containsDatabase(name), NoDatabaseSelectedException::new);
+        ShardingSpherePreconditions.checkState(!Strings.isNullOrEmpty(name), NoDatabaseSelectedException::new);
+        ShardingSpherePreconditions.checkState(contextManager.getMetaDataContexts().getMetaData().containsDatabase(name), () -> new UnknownDatabaseException(name));
         return contextManager.getMetaDataContexts().getMetaData().getDatabase(name);
     }
 

diff --git a/.../core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java b/.../core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -20,6 +20,7 @@
 import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.UnknownDatabaseException;
 import org.apache.shardingsphere.infra.instance.InstanceContext;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
 import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -109,7 +110,7 @@ void assertGetDatabaseWhenNotExisted() {
                 new ShardingSphereMetaData(databases, mock(ResourceMetaData.class), mock(RuleMetaData.class), new ConfigurationProperties(new Properties())));
         when(contextManager.getMetaDataContexts()).thenReturn(metaDataContexts);
         ProxyContext.init(contextManager);
-        assertThrows(NoDatabaseSelectedException.class, () -> ProxyContext.getInstance().getDatabase("db1"));
+        assertThrows(UnknownDatabaseException.class, () -> ProxyContext.getInstance().getDatabase("db1"));
     }
 
     @Test