(shardingsphere) branch master updated: Optimize DatabaseExportMetaDataGenerator, null value properties are not exported (#34166)

[menghaoran]

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

menghaoran 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 39a58578787 Optimize DatabaseExportMetaDataGenerator, null value 
properties are not exported (#34166)
39a58578787 is described below

commit 39a58578787fa4cc9a2aeac339ee333b3941da9d
Author: jiangML <1060319...@qq.com>
AuthorDate: Fri Dec 27 10:19:00 2024 +0800

    Optimize DatabaseExportMetaDataGenerator, null value properties are not 
exported (#34166)
    
    * Optimize DatabaseExportMetaDataGenerator, null value properties are not 
exported
    
    * Fix test error
    
    * Fix test error
    
    * Fix test error
---
 .../proxy/backend/util/DatabaseExportMetaDataGenerator.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java
index 570e9f96944..c0eb39fc3bc 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java
@@ -71,12 +71,16 @@ public final class DatabaseExportMetaDataGenerator {
     private void appendDataSourceConfiguration(final String dataSourceName, 
final DataSourcePoolProperties props, final StringBuilder stringBuilder) {
         
stringBuilder.append(createIndentation(2)).append(dataSourceName).append(':').append(System.lineSeparator());
         for (Entry<String, Object> entry : 
props.getConnectionPropertySynonyms().getStandardProperties().entrySet()) {
-            String value = null == entry.getValue() ? "" : 
entry.getValue().toString();
-            
stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": 
").append(value).append(System.lineSeparator());
+            if (null != entry.getValue()) {
+                String value = entry.getValue().toString();
+                
stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": 
").append(value).append(System.lineSeparator());
+            }
         }
         for (Entry<String, Object> entry : 
props.getPoolPropertySynonyms().getStandardProperties().entrySet()) {
-            String value = null == entry.getValue() ? "" : 
entry.getValue().toString();
-            
stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": 
").append(value).append(System.lineSeparator());
+            if (null != entry.getValue()) {
+                String value = entry.getValue().toString();
+                
stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": 
").append(value).append(System.lineSeparator());
+            }
         }
     }