[shardingsphere] branch master updated: Refactor DataSourcePoolMetaDataReflection (#28032)

[zhangliang]

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 6991d701eb9 Refactor DataSourcePoolMetaDataReflection (#28032)
6991d701eb9 is described below

commit 6991d701eb9cdbb6b497f0d31c5d6d3b8dc70f61
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Aug 11 10:42:52 2023 +0800

    Refactor DataSourcePoolMetaDataReflection (#28032)
---
 .../pool/metadata/DataSourcePoolMetaDataReflection.java        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java
 
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java
index 26a48847849..7a4f6bec616 100644
--- 
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java
+++ 
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaDataReflection.java
@@ -41,11 +41,7 @@ public final class DataSourcePoolMetaDataReflection {
      */
     public Optional<String> getJdbcUrl() {
         Optional<String> jdbcUrl = 
ReflectionUtils.getFieldValue(targetDataSource, 
dataSourcePoolFieldMetaData.getJdbcUrlFieldName());
-        if (jdbcUrl.isPresent()) {
-            return jdbcUrl;
-        } else {
-            return ReflectionUtils.getFieldValueByGetMethod(targetDataSource, 
dataSourcePoolFieldMetaData.getJdbcUrlFieldName());
-        }
+        return jdbcUrl.isPresent() ? jdbcUrl : 
ReflectionUtils.getFieldValueByGetMethod(targetDataSource, 
dataSourcePoolFieldMetaData.getJdbcUrlFieldName());
     }
     
     /**
@@ -57,7 +53,7 @@ public final class DataSourcePoolMetaDataReflection {
         if (null == 
dataSourcePoolFieldMetaData.getJdbcUrlPropertiesFieldName()) {
             return Optional.empty();
         }
-        Optional<Properties> properties = 
ReflectionUtils.getFieldValue(targetDataSource, 
dataSourcePoolFieldMetaData.getJdbcUrlPropertiesFieldName());
-        return properties.isPresent() ? properties : 
ReflectionUtils.getFieldValueByGetMethod(targetDataSource, 
dataSourcePoolFieldMetaData.getJdbcUrlPropertiesFieldName());
+        Optional<Properties> props = 
ReflectionUtils.getFieldValue(targetDataSource, 
dataSourcePoolFieldMetaData.getJdbcUrlPropertiesFieldName());
+        return props.isPresent() ? props : 
ReflectionUtils.getFieldValueByGetMethod(targetDataSource, 
dataSourcePoolFieldMetaData.getJdbcUrlPropertiesFieldName());
     }
 }