[shardingsphere] branch master updated: Fix CI error on windows, ExportDatabaseConfigurationHandler use System.lineSeparator instead of '\n' (#18693)

[zh...@apache.org]

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

zhonghongsheng 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 0a805a004c2 Fix CI error on windows, ExportDatabaseConfigurationHandler use System.lineSeparator instead of '\n' (#18693)
0a805a004c2 is described below

commit 0a805a004c26c0c56ee1636522d8863fd0155b7a
Author: liguoping <xd...@163.com>
AuthorDate: Wed Jun 29 20:42:52 2022 +0800

    Fix CI error on windows, ExportDatabaseConfigurationHandler use System.lineSeparator instead of '\n' (#18693)
---
 .../queryable/ExportDatabaseConfigurationHandler.java       | 13 +++++++------
 .../queryable/ExportDatabaseConfigurationHandlerTest.java   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandler.java
index 577f009cd2a..0034e4ea328 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandler.java
@@ -84,24 +84,25 @@ public final class ExportDatabaseConfigurationHandler extends QueryableRALBacken
     }
     
     private void appendDatabaseName(final String databaseName, final StringBuilder stringBuilder) {
-        stringBuilder.append("databaseName").append(": ").append(databaseName).append("\n");
+        stringBuilder.append("databaseName").append(": ").append(databaseName).append(System.lineSeparator());
     }
     
     private void appendDataSourceConfigurations(final ShardingSphereDatabase database, final StringBuilder stringBuilder) {
         if (database.getResource().getDataSources().isEmpty()) {
             return;
         }
-        stringBuilder.append("dataSources").append(":\n");
+        stringBuilder.append("dataSources:").append(System.lineSeparator());
         for (Entry<String, DataSource> entry : database.getResource().getDataSources().entrySet()) {
             appendDataSourceConfiguration(entry.getKey(), entry.getValue(), stringBuilder);
         }
     }
     
     private void appendDataSourceConfiguration(final String name, final DataSource dataSource, final StringBuilder stringBuilder) {
-        stringBuilder.append("  ").append(name).append(":\n");
+        stringBuilder.append("  ").append(name).append(":").append(System.lineSeparator());
         DataSourceProperties dataSourceProps = DataSourcePropertiesCreator.create(dataSource);
-        dataSourceProps.getConnectionPropertySynonyms().getStandardProperties().forEach((key, value) -> stringBuilder.append("    ").append(key).append(": ").append(value).append("\n"));
-        dataSourceProps.getPoolPropertySynonyms().getStandardProperties().forEach((key, value) -> stringBuilder.append("    ").append(key).append(": ").append(value).append("\n"));
+        dataSourceProps.getConnectionPropertySynonyms().getStandardProperties()
+                .forEach((key, value) -> stringBuilder.append("    ").append(key).append(": ").append(value).append(System.lineSeparator()));
+        dataSourceProps.getPoolPropertySynonyms().getStandardProperties().forEach((key, value) -> stringBuilder.append("    ").append(key).append(": ").append(value).append(System.lineSeparator()));
     }
     
     @SuppressWarnings({"rawtypes", "unchecked"})
@@ -109,7 +110,7 @@ public final class ExportDatabaseConfigurationHandler extends QueryableRALBacken
         if (ruleConfigs.isEmpty()) {
             return;
         }
-        stringBuilder.append("rules").append(":\n");
+        stringBuilder.append("rules:").append(System.lineSeparator());
         for (Entry<RuleConfiguration, YamlRuleConfigurationSwapper> entry : YamlRuleConfigurationSwapperFactory.getInstanceMapByRuleConfigurations(ruleConfigs).entrySet()) {
             stringBuilder.append(YamlEngine.marshal(Collections.singletonList(entry.getValue().swapToYamlConfiguration(entry.getKey()))));
         }
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandlerTest.java
index 682fb9df593..b93de2831e2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/queryable/ExportDatabaseConfigurationHandlerTest.java
@@ -205,7 +205,7 @@ public final class ExportDatabaseConfigurationHandlerTest extends ProxyContextRe
         assertTrue(handler.next());
         Collection<Object> rowData = handler.getRowData().getData();
         assertThat(rowData.size(), is(1));
-        assertThat(rowData.iterator().next(), is("databaseName: empty_db\n"));
+        assertThat(rowData.iterator().next(), is("databaseName: empty_db" + System.lineSeparator()));
         assertFalse(handler.next());
     }