[shardingsphere] branch master updated: Remove stale todo of DataSourceConfiguration (#14053)

[panjuan]

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

panjuan 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 1c4eea8  Remove stale todo of DataSourceConfiguration (#14053)
1c4eea8 is described below

commit 1c4eea8c5ba5034e54fd2e9364899904fc0aaf40
Author: Liang Zhang <terrym...@163.com>
AuthorDate: Sat Dec 11 21:05:30 2021 +0800

    Remove stale todo of DataSourceConfiguration (#14053)
---
 .../infra/config/datasource/DataSourceConfiguration.java          | 8 ++++----
 .../config/datasource/creator/impl/AbstractDataSourceCreator.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
index b533460..e40f04a 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
@@ -52,18 +52,18 @@ public final class DataSourceConfiguration {
         if (props.containsKey(originalName)) {
             props.put(synonym, props.get(originalName));
         }
-        // TODO fixes by #6709
         if (props.containsKey(synonym)) {
             props.put(originalName, props.get(synonym));
         }
     }
     
     /**
-     * Get all props.
+     * Get all properties.
      * 
-     * @return map of all props
+     * @return all properties
      */
-    public Map<String, Object> getAllProps() {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public Map<String, Object> getAllProperties() {
         Map<String, Object> result = new HashMap<>(props);
         result.putAll((Map) customPoolProps);
         return result;
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/AbstractDataSourceCreator.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/AbstractDataSourceCreator.java
index 7948821..f14ee36 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/AbstractDataSourceCreator.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/AbstractDataSourceCreator.java
@@ -93,7 +93,7 @@ public abstract class AbstractDataSourceCreator implements 
DataSourceCreator {
         DataSource result = 
buildDataSource(dataSourceConfig.getDataSourceClassName());
         Method[] methods = result.getClass().getMethods();
         addPropertySynonym(dataSourceConfig);
-        for (Entry<String, Object> entry : 
dataSourceConfig.getAllProps().entrySet()) {
+        for (Entry<String, Object> entry : 
dataSourceConfig.getAllProperties().entrySet()) {
             String propertyName = entry.getKey();
             Object propertyValue = entry.getValue();
             if (!isSkippedProperty(propertyName) && 
!isInvalidProperty(propertyName, propertyValue)) {