rename database PropertyAlias to database PropertySynonym (#7026)

shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-schema/src/test/java/org/apache/shardingsphere/orchestration/core/schema/fixture/TestOrchestrationSchemaContexts.java

@@ -103,7 +103,7 @@ public final class TestOrchestrationSchemaContexts extends OrchestrationSchemaCo
     }
     
     private DataSourceParameter createDataSourceParameter(final DataSourceConfiguration dataSourceConfig) {
-        bindAlias(dataSourceConfig);
+        bindSynonym(dataSourceConfig);
         DataSourceParameter result = new DataSourceParameter();
         for (Field each : result.getClass().getDeclaredFields()) {
             try {
@@ -117,8 +117,8 @@ public final class TestOrchestrationSchemaContexts extends OrchestrationSchemaCo
         return result;
     }
     
-    private static void bindAlias(final DataSourceConfiguration dataSourceConfiguration) {
-        dataSourceConfiguration.addPropertyAlias("url", "jdbcUrl");
-        dataSourceConfiguration.addPropertyAlias("user", "username");
+    private static void bindSynonym(final DataSourceConfiguration dataSourceConfiguration) {
+        dataSourceConfiguration.addPropertySynonym("url", "jdbcUrl");
+        dataSourceConfiguration.addPropertySynonym("user", "username");
     }
 }

shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DataSourceConfiguration.java

@@ -127,18 +127,18 @@ public final class DataSourceConfiguration {
     }
     
     /**
-     * Add property alias to shared configuration.
+     * Add property synonym to shared configuration.
      *
      * @param originalName original key for data source configuration property
-     * @param alias property alias for configuration
+     * @param synonym property synonym for configuration
      */
-    public void addPropertyAlias(final String originalName, final String alias) {
+    public void addPropertySynonym(final String originalName, final String synonym) {
         if (props.containsKey(originalName)) {
-            props.put(alias, props.get(originalName));
+            props.put(synonym, props.get(originalName));
         }
         // TODO fixes by #6709
-        if (props.containsKey(alias)) {
-            props.put(originalName, props.get(alias));
+        if (props.containsKey(synonym)) {
+            props.put(originalName, props.get(synonym));
         }
     }
     

shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/config/DataSourceConfigurationTest.java

@@ -73,15 +73,15 @@ public final class DataSourceConfigurationTest {
     }
     
     @Test
-    public void assertAddAlias() {
+    public void assertAddSynonym() {
         HikariDataSource actualDataSource = new HikariDataSource();
         actualDataSource.setDriverClassName("org.h2.Driver");
         actualDataSource.setJdbcUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL");
         actualDataSource.setUsername("root");
         actualDataSource.setPassword("root");
         DataSourceConfiguration actual = DataSourceConfiguration.getDataSourceConfiguration(actualDataSource);
-        actual.addPropertyAlias("url", "jdbcUrl");
-        actual.addPropertyAlias("user", "username");
+        actual.addPropertySynonym("url", "jdbcUrl");
+        actual.addPropertySynonym("user", "username");
         assertThat(actual.getDataSourceClassName(), is(HikariDataSource.class.getName()));
         assertThat(actual.getProps().get("driverClassName").toString(), is("org.h2.Driver"));
         assertThat(actual.getProps().get("jdbcUrl").toString(), is("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));

shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/util/DataSourceConverter.java

@@ -75,7 +75,7 @@ public final class DataSourceConverter {
     }
     
     private static DataSourceParameter createDataSourceParameter(final DataSourceConfiguration dataSourceConfig) {
-        bindAlias(dataSourceConfig);
+        bindSynonym(dataSourceConfig);
         DataSourceParameter result = new DataSourceParameter();
         for (Field each : result.getClass().getDeclaredFields()) {
             try {
@@ -89,12 +89,12 @@ public final class DataSourceConverter {
         return result;
     }
 
-    private static void bindAlias(final DataSourceConfiguration dataSourceConfiguration) {
-        dataSourceConfiguration.addPropertyAlias("url", "jdbcUrl");
-        dataSourceConfiguration.addPropertyAlias("user", "username");
-        dataSourceConfiguration.addPropertyAlias("connectionTimeout", "connectionTimeoutMilliseconds");
-        dataSourceConfiguration.addPropertyAlias("maxLifetime", "maxLifetimeMilliseconds");
-        dataSourceConfiguration.addPropertyAlias("idleTimeout", "idleTimeoutMilliseconds");
+    private static void bindSynonym(final DataSourceConfiguration dataSourceConfiguration) {
+        dataSourceConfiguration.addPropertySynonym("url", "jdbcUrl");
+        dataSourceConfiguration.addPropertySynonym("user", "username");
+        dataSourceConfiguration.addPropertySynonym("connectionTimeout", "connectionTimeoutMilliseconds");
+        dataSourceConfiguration.addPropertySynonym("maxLifetime", "maxLifetimeMilliseconds");
+        dataSourceConfiguration.addPropertySynonym("idleTimeout", "idleTimeoutMilliseconds");
     }
     
     /**