[shardingsphere] branch master updated: Optimize the message of `DatabaseServerInfo` (#28428)

[jianglongtao]

This is an automated email from the ASF dual-hosted git repository.

jianglongtao 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 871cedbd12c Optimize the message of `DatabaseServerInfo` (#28428)
871cedbd12c is described below

commit 871cedbd12c4639a845929b37bf64c9195187fd1
Author: 오지환 (Cooper) <coo...@chequer.io>
AuthorDate: Fri Sep 15 11:31:17 2023 +0900

    Optimize the message of `DatabaseServerInfo` (#28428)
    
    * Optimize the message of `DatabaseServerInfo`
    
    * Fix message from DBMS to Database type
    
    * Fix databaseName to databaseType
---
 .../apache/shardingsphere/proxy/database/DatabaseServerInfo.java    | 6 +++---
 .../shardingsphere/proxy/database/DatabaseServerInfoTest.java       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfo.java
 
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfo.java
index d4f0a913577..5407054be26 100644
--- 
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfo.java
+++ 
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfo.java
@@ -31,14 +31,14 @@ import java.sql.SQLException;
 @Getter
 public final class DatabaseServerInfo {
     
-    private final String databaseName;
+    private final String databaseType;
     
     private final String databaseVersion;
     
     public DatabaseServerInfo(final DataSource dataSource) {
         try (Connection connection = dataSource.getConnection()) {
             DatabaseMetaData databaseMetaData = connection.getMetaData();
-            databaseName = databaseMetaData.getDatabaseProductName();
+            databaseType = databaseMetaData.getDatabaseProductName();
             databaseVersion = databaseMetaData.getDatabaseProductVersion();
         } catch (final SQLException ex) {
             throw new DatabaseServerLoadingServerException(ex);
@@ -47,6 +47,6 @@ public final class DatabaseServerInfo {
     
     @Override
     public String toString() {
-        return String.format("Database name is `%s`, version is `%s`", 
databaseName, databaseVersion);
+        return String.format("Database type is `%s`, version is `%s`", 
databaseType, databaseVersion);
     }
 }
diff --git 
a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfoTest.java
 
b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfoTest.java
index 2c6fe57b463..abb748e4ae9 100644
--- 
a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfoTest.java
+++ 
b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfoTest.java
@@ -52,6 +52,6 @@ class DatabaseServerInfoTest {
         
when(databaseMetaData.getDatabaseProductName()).thenReturn("fixtureDB");
         when(databaseMetaData.getDatabaseProductVersion()).thenReturn("1.0.0");
         
when(dataSource.getConnection().getMetaData()).thenReturn(databaseMetaData);
-        assertThat(new DatabaseServerInfo(dataSource).toString(), is("Database 
name is `fixtureDB`, version is `1.0.0`"));
+        assertThat(new DatabaseServerInfo(dataSource).toString(), is("Database 
type is `fixtureDB`, version is `1.0.0`"));
     }
 }