You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/12/30 23:03:41 UTC

[shardingsphere] branch master updated: Remove useless judge of AbstractDataSourcePoolCreator (#14449)

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 2be339c  Remove useless judge of AbstractDataSourcePoolCreator (#14449)
2be339c is described below

commit 2be339c55b09c626a7cfacea02c9bd982fe2b1ce
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Dec 31 07:02:27 2021 +0800

    Remove useless judge of AbstractDataSourcePoolCreator (#14449)
---
 .../impl/AbstractDataSourcePoolCreator.java        |  44 ++------
 .../creator/impl/DataSourcePropertiesHandler.java  |  78 ++++++++++++++
 .../creator/impl/DefaultDataSourcePoolCreator.java |  14 +--
 .../creator/impl/HikariDataSourcePoolCreator.java  |   8 +-
 .../fixture/CallTimeRecordDataSource.java          | 117 +++++++++------------
 5 files changed, 147 insertions(+), 114 deletions(-)

diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/AbstractDataSourcePoolCreator.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/AbstractDataSourcePoolCreator.java
index b3636a7..d267e00 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/AbstractDataSourcePoolCreator.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/AbstractDataSourcePoolCreator.java
@@ -92,10 +92,9 @@ public abstract class AbstractDataSourcePoolCreator implements DataSourcePoolCre
     @Override
     public final DataSource createDataSource(final DataSourceConfiguration dataSourceConfig) {
         DataSource result = buildDataSource(dataSourceConfig.getDataSourceClassName());
-        Method[] methods = result.getClass().getMethods();
         addPropertySynonym(dataSourceConfig);
-        setConfiguredFields(dataSourceConfig, result, methods);
-        setDefaultDataSourceProperties(result);
+        setConfiguredFields(dataSourceConfig, result, result.getClass().getMethods());
+        new DataSourcePropertiesHandler(result).addDefaultProperties(getDataSourcePropertiesFieldName(), getJdbcUrlFieldName(), getDefaultDataSourceProperties());
         return result;
     }
     
@@ -164,44 +163,13 @@ public abstract class AbstractDataSourcePoolCreator implements DataSourcePoolCre
         return Arrays.stream(methods).filter(each -> each.getName().equals(setterMethodName) && 1 == each.getParameterTypes().length).findFirst();
     }
     
-    private void setDefaultDataSourceProperties(final DataSource dataSource) {
-        if (null == getJdbcUrlPropertyName() || null == getDataSourcePropertiesPropertyName()) {
-            return;
-        }
-        setDataSourcePropertiesIfAbsent(getDataSourcePropertiesFromDataSource(dataSource), getJdbcUrlProperties(dataSource));
-    }
-    
-    @SneakyThrows(ReflectiveOperationException.class)
-    private Properties getDataSourcePropertiesFromDataSource(final DataSource dataSource) {
-        String getDataSourcePropertiesMethodName = GETTER_PREFIX + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, getDataSourcePropertiesPropertyName());
-        Properties result = (Properties) dataSource.getClass().getMethod(getDataSourcePropertiesMethodName).invoke(dataSource);
-        return null == result ? new Properties() : result;
-    }
-    
-    @SneakyThrows(ReflectiveOperationException.class)
-    private Map<String, String> getJdbcUrlProperties(final DataSource dataSource) {
-        String getJdbcUrlMethodName = GETTER_PREFIX + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, getJdbcUrlPropertyName());
-        String jdbcUrl = (String) dataSource.getClass().getMethod(getJdbcUrlMethodName).invoke(dataSource);
-        return new ConnectionURLParser(jdbcUrl).getProperties();
-    }
-    
-    private void setDataSourcePropertiesIfAbsent(final Properties dataSourceProps, final Map<String, String> jdbcUrlProps) {
-        for (Entry<Object, Object> entry : getDefaultDataSourceProperties().entrySet()) {
-            String key = entry.getKey().toString();
-            String value = entry.getValue().toString();
-            if (!dataSourceProps.containsKey(key) && !jdbcUrlProps.containsKey(key)) {
-                dataSourceProps.setProperty(key, value);
-            }
-        }
-    }
-    
     protected abstract Map<String, String> getPropertySynonyms();
     
-    protected abstract String getJdbcUrlPropertyName();
+    protected abstract Map<String, Object> getInvalidProperties();
     
-    protected abstract String getDataSourcePropertiesPropertyName();
+    protected abstract String getDataSourcePropertiesFieldName();
     
-    protected abstract Properties getDefaultDataSourceProperties();
+    protected abstract String getJdbcUrlFieldName();
     
-    protected abstract Map<String, Object> getInvalidProperties();
+    protected abstract Properties getDefaultDataSourceProperties();
 }
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DataSourcePropertiesHandler.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DataSourcePropertiesHandler.java
new file mode 100644
index 0000000..4a59d55
--- /dev/null
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DataSourcePropertiesHandler.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.infra.config.datasource.pool.creator.impl;
+
+import com.google.common.base.CaseFormat;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+/**
+ * Data source properties handler.
+ */
+@RequiredArgsConstructor
+public final class DataSourcePropertiesHandler {
+    
+    private static final String GETTER_PREFIX = "get";
+    
+    private final DataSource dataSource;
+            
+    /**
+     * Add default data source properties to target data source.
+     * 
+     * @param dataSourcePropertiesFieldName data source properties field name
+     * @param jdbcUrlFieldName JDBC URL field name
+     * @param defaultDataSourceProps default data source properties
+     */
+    public void addDefaultProperties(final String dataSourcePropertiesFieldName, final String jdbcUrlFieldName, final Properties defaultDataSourceProps) {
+        if (null == dataSourcePropertiesFieldName || null == jdbcUrlFieldName) {
+            return;
+        }
+        Properties targetDataSourceProps = getDataSourceProperties(dataSourcePropertiesFieldName);
+        Map<String, String> jdbcUrlProps = new ConnectionURLParser(getJdbcUrl(jdbcUrlFieldName)).getProperties();
+        for (Entry<Object, Object> entry : defaultDataSourceProps.entrySet()) {
+            String defaultPropertyKey = entry.getKey().toString();
+            String defaultPropertyValue = entry.getValue().toString();
+            if (!containsDefaultProperty(defaultPropertyKey, targetDataSourceProps, jdbcUrlProps)) {
+                targetDataSourceProps.setProperty(defaultPropertyKey, defaultPropertyValue);
+            }
+        }
+    }
+    
+    private boolean containsDefaultProperty(final String defaultPropertyKey, final Properties targetDataSourceProps, final Map<String, String> jdbcUrlProps) {
+        return targetDataSourceProps.containsKey(defaultPropertyKey) || jdbcUrlProps.containsKey(defaultPropertyKey);
+    }
+    
+    @SneakyThrows(ReflectiveOperationException.class)
+    private Properties getDataSourceProperties(final String dataSourcePropertiesFieldName) {
+        return (Properties) dataSource.getClass().getMethod(getGetterMethodName(dataSourcePropertiesFieldName)).invoke(dataSource);
+    }
+    
+    @SneakyThrows(ReflectiveOperationException.class)
+    private String getJdbcUrl(final String jdbcUrlFieldName) {
+        return (String) dataSource.getClass().getMethod(getGetterMethodName(getGetterMethodName(jdbcUrlFieldName))).invoke(dataSource);
+    }
+    
+    private String getGetterMethodName(final String fieldName) {
+        return GETTER_PREFIX + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, fieldName);
+    }
+}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreator.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreator.java
index e301450..80e61c2 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreator.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreator.java
@@ -32,23 +32,23 @@ public final class DefaultDataSourcePoolCreator extends AbstractDataSourcePoolCr
     }
     
     @Override
-    protected String getJdbcUrlPropertyName() {
-        return null;
+    protected Map<String, Object> getInvalidProperties() {
+        return Collections.emptyMap();
     }
     
     @Override
-    protected String getDataSourcePropertiesPropertyName() {
+    protected String getDataSourcePropertiesFieldName() {
         return null;
     }
     
     @Override
-    protected Properties getDefaultDataSourceProperties() {
-        return new Properties();
+    protected String getJdbcUrlFieldName() {
+        return null;
     }
     
     @Override
-    protected Map<String, Object> getInvalidProperties() {
-        return Collections.emptyMap();
+    protected Properties getDefaultDataSourceProperties() {
+        return new Properties();
     }
     
     @Override
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreator.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreator.java
index 7993dd6..372397c 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreator.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreator.java
@@ -70,13 +70,13 @@ public final class HikariDataSourcePoolCreator extends AbstractDataSourcePoolCre
     }
     
     @Override
-    protected String getJdbcUrlPropertyName() {
-        return "jdbcUrl";
+    protected String getDataSourcePropertiesFieldName() {
+        return "dataSourceProperties";
     }
     
     @Override
-    protected String getDataSourcePropertiesPropertyName() {
-        return "dataSourceProperties";
+    protected String getJdbcUrlFieldName() {
+        return "jdbcUrl";
     }
     
     @Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/fixture/CallTimeRecordDataSource.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/fixture/CallTimeRecordDataSource.java
index 1cb0294..551b48a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/fixture/CallTimeRecordDataSource.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/fixture/CallTimeRecordDataSource.java
@@ -49,7 +49,7 @@ public final class CallTimeRecordDataSource implements DataSource, AutoCloseable
     @Override
     public Connection getConnection() throws SQLException {
         if (5 <= count.get()) {
-            throw new SQLException("datasource is not enough");
+            throw new SQLException("data source is not enough");
         }
         count.getAndIncrement();
         return new CallTimeRecordConnection();
@@ -77,12 +77,10 @@ public final class CallTimeRecordDataSource implements DataSource, AutoCloseable
     
     @Override
     public void setLogWriter(final PrintWriter out) {
-    
     }
     
     @Override
     public void setLoginTimeout(final int seconds) {
-    
     }
     
     @Override
@@ -105,244 +103,233 @@ public final class CallTimeRecordDataSource implements DataSource, AutoCloseable
         public Statement createStatement() {
             return null;
         }
-    
+        
         @Override
         public Statement createStatement(final int resultSetType, final int resultSetConcurrency) {
             return null;
         }
-    
+        
         @Override
         public Statement createStatement(final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) {
             return null;
         }
-    
+        
         @Override
         public PreparedStatement prepareStatement(final String sql) {
             return null;
         }
-    
+        
         @Override
         public PreparedStatement prepareStatement(final String sql, final int autoGeneratedKeys) {
             return null;
         }
-    
+        
         @Override
         public PreparedStatement prepareStatement(final String sql, final int[] columnIndexes) {
             return null;
         }
-    
+        
         @Override
         public PreparedStatement prepareStatement(final String sql, final String[] columnNames) {
             return null;
         }
-    
+        
         @Override
         public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) {
             return null;
         }
-    
+        
         @Override
         public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency) {
             return null;
         }
-    
+        
         @Override
         public CallableStatement prepareCall(final String sql) {
             return null;
         }
-    
+        
         @Override
         public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency) {
             return null;
         }
-    
+        
         @Override
         public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) {
             return null;
         }
-    
+        
         @Override
         public String nativeSQL(final String sql) {
             return null;
         }
-    
+        
         @Override
         public void setAutoCommit(final boolean autoCommit) {
-        
         }
-    
+        
         @Override
         public boolean getAutoCommit() {
             return false;
         }
-    
+        
         @Override
         public void commit() {
-        
         }
-    
+        
         @Override
         public void rollback() {
-        
         }
-    
+        
         @Override
         public void rollback(final Savepoint savepoint) {
-        
         }
-    
+        
         @Override
         public void close() {
             count.getAndDecrement();
         }
-    
+        
         @Override
         public boolean isClosed() {
             return false;
         }
-    
+        
         @Override
         public DatabaseMetaData getMetaData() {
             return null;
         }
-    
+        
         @Override
         public void setReadOnly(final boolean readOnly) {
-        
         }
-    
+        
         @Override
         public boolean isReadOnly() {
             return false;
         }
-    
+        
         @Override
         public void setCatalog(final String catalog) {
-        
         }
-    
+        
         @Override
         public String getCatalog() {
             return null;
         }
-    
+        
         @Override
         public void setTransactionIsolation(final int level) {
-        
         }
-    
+        
         @Override
         public int getTransactionIsolation() {
             return Connection.TRANSACTION_NONE;
         }
-    
+        
         @Override
         public SQLWarning getWarnings() {
             return null;
         }
-    
+        
         @Override
         public void clearWarnings() {
-        
         }
         
         @Override
         public Map<String, Class<?>> getTypeMap() {
             return null;
         }
-    
+        
         @Override
         public void setTypeMap(final Map<String, Class<?>> map) {
-        
         }
-    
+        
         @Override
         public void setHoldability(final int holdability) {
-        
         }
-    
+        
         @Override
         public int getHoldability() {
             return 0;
         }
-    
+        
         @Override
         public Savepoint setSavepoint() {
             return null;
         }
-    
+        
         @Override
         public Savepoint setSavepoint(final String name) {
             return null;
         }
-    
+        
         @Override
         public void releaseSavepoint(final Savepoint savepoint) {
         }
-    
+        
         @Override
         public Clob createClob() {
             return null;
         }
-    
+        
         @Override
         public Blob createBlob() {
             return null;
         }
-    
+        
         @Override
         public NClob createNClob() {
             return null;
         }
-    
+        
         @Override
         public SQLXML createSQLXML() {
             return null;
         }
-    
+        
         @Override
         public boolean isValid(final int timeout) {
             return false;
         }
-    
+        
         @Override
         public void setClientInfo(final String name, final String value) {
-        
         }
-    
+        
         @Override
         public void setClientInfo(final Properties props) {
         }
-    
+        
         @Override
         public String getClientInfo(final String name) {
             return null;
         }
-    
+        
         @Override
         public Properties getClientInfo() {
             return null;
         }
-    
+        
         @Override
         public Array createArrayOf(final String typeName, final Object[] elements) {
             return null;
         }
-    
+        
         @Override
         public Struct createStruct(final String typeName, final Object[] attributes) {
             return null;
         }
-    
+        
         @Override
         public void setSchema(final String schema) {
         }
-    
+        
         @Override
         public String getSchema() {
             return null;
         }
-    
+        
         @Override
         public void abort(final Executor executor) {
         }
@@ -350,17 +337,17 @@ public final class CallTimeRecordDataSource implements DataSource, AutoCloseable
         @Override
         public void setNetworkTimeout(final Executor executor, final int milliseconds) {
         }
-    
+        
         @Override
         public int getNetworkTimeout() {
             return 0;
         }
-    
+        
         @Override
         public <T> T unwrap(final Class<T> iface) {
             return null;
         }
-    
+        
         @Override
         public boolean isWrapperFor(final Class<?> iface) {
             return false;