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 be7019d Rename
DataSourcePoolCreationMetaData.getDataSourcePropertiesFieldName() to
DataSourcePoolCreationMetaData.getJdbcUrlPropertiesFieldName() (#14631)
be7019d is described below
commit be7019d681a5b36c81ae04ec817fcf7984bd2d10
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 9 14:41:14 2022 +0800
Rename DataSourcePoolCreationMetaData.getDataSourcePropertiesFieldName() to
DataSourcePoolCreationMetaData.getJdbcUrlPropertiesFieldName() (#14631)
---
.../creator/DataSourcePoolCreationMetaData.java | 20 ++++++------
.../pool/creator/DataSourcePoolCreator.java | 2 +-
.../DefaultDataSourcePoolCreationMetaData.java | 6 ++--
.../impl/HikariDataSourcePoolCreationMetaData.java | 38 +++++++++++-----------
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java
index 7e88d8d..c7b1cca 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreationMetaData.java
@@ -50,23 +50,23 @@ public interface DataSourcePoolCreationMetaData extends
TypedSPI, RequiredSPI {
Map<String, String> getPropertySynonyms();
/**
- * Get data source properties field name.
- *
- * @return data source properties field name
+ * Get JDBC URL field name.
+ *
+ * @return JDBC URL field name
*/
- String getDataSourcePropertiesFieldName();
+ String getJdbcUrlFieldName();
/**
- * Get JDBC URL field name.
+ * Get JDBC URL properties field name.
*
- * @return JDBC URL field name
+ * @return JDBC URL properties field name
*/
- String getJdbcUrlFieldName();
+ String getJdbcUrlPropertiesFieldName();
/**
- * Get default data source properties.
+ * Get default JDBC URL properties.
*
- * @return default data source properties
+ * @return default JDBC URL properties
*/
- Properties getDefaultDataSourceProperties();
+ Properties getDefaultJdbcUrlProperties();
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
index 9b12347..2171281 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
@@ -81,7 +81,7 @@ public final class DataSourcePoolCreator {
setDefaultFields(dataSourceReflection);
setConfiguredFields(dataSourceConfig, dataSourceReflection);
dataSourceReflection.addDefaultDataSourceProperties(
- creationMetaData.getDataSourcePropertiesFieldName(),
creationMetaData.getJdbcUrlFieldName(),
creationMetaData.getDefaultDataSourceProperties());
+ creationMetaData.getJdbcUrlPropertiesFieldName(),
creationMetaData.getJdbcUrlFieldName(),
creationMetaData.getDefaultJdbcUrlProperties());
return result;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java
index 597421f..34c01e8 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/DefaultDataSourcePoolCreationMetaData.java
@@ -44,17 +44,17 @@ public final class DefaultDataSourcePoolCreationMetaData
implements DataSourcePo
}
@Override
- public String getDataSourcePropertiesFieldName() {
+ public String getJdbcUrlFieldName() {
return null;
}
@Override
- public String getJdbcUrlFieldName() {
+ public String getJdbcUrlPropertiesFieldName() {
return null;
}
@Override
- public Properties getDefaultDataSourceProperties() {
+ public Properties getDefaultJdbcUrlProperties() {
return new Properties();
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java
index a5b707e..4ae3b21 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/impl/HikariDataSourcePoolCreationMetaData.java
@@ -37,7 +37,7 @@ public final class HikariDataSourcePoolCreationMetaData
implements DataSourcePoo
private final Map<String, String> propertySynonyms = new HashMap<>(2, 1);
- private final Properties defaultDataSourceProperties = new Properties();
+ private final Properties defaultJdbcUrlProperties = new Properties();
public HikariDataSourcePoolCreationMetaData() {
buildDefaultProperties();
@@ -66,30 +66,30 @@ public final class HikariDataSourcePoolCreationMetaData
implements DataSourcePoo
}
private void buildDefaultDataSourceProperties() {
- defaultDataSourceProperties.setProperty("useServerPrepStmts",
Boolean.TRUE.toString());
- defaultDataSourceProperties.setProperty("cachePrepStmts",
Boolean.TRUE.toString());
- defaultDataSourceProperties.setProperty("prepStmtCacheSize", "200000");
- defaultDataSourceProperties.setProperty("prepStmtCacheSqlLimit",
"2048");
- defaultDataSourceProperties.setProperty("useLocalSessionState",
Boolean.TRUE.toString());
- defaultDataSourceProperties.setProperty("rewriteBatchedStatements",
Boolean.TRUE.toString());
- defaultDataSourceProperties.setProperty("cacheResultSetMetadata",
Boolean.FALSE.toString());
- defaultDataSourceProperties.setProperty("cacheServerConfiguration",
Boolean.TRUE.toString());
- defaultDataSourceProperties.setProperty("elideSetAutoCommits",
Boolean.TRUE.toString());
- defaultDataSourceProperties.setProperty("maintainTimeStats",
Boolean.FALSE.toString());
-
defaultDataSourceProperties.setProperty("netTimeoutForStreamingResults", "0");
- defaultDataSourceProperties.setProperty("tinyInt1isBit",
Boolean.FALSE.toString());
- defaultDataSourceProperties.setProperty("useSSL",
Boolean.FALSE.toString());
- defaultDataSourceProperties.setProperty("serverTimezone", "UTC");
+ defaultJdbcUrlProperties.setProperty("useServerPrepStmts",
Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("cachePrepStmts",
Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("prepStmtCacheSize", "200000");
+ defaultJdbcUrlProperties.setProperty("prepStmtCacheSqlLimit", "2048");
+ defaultJdbcUrlProperties.setProperty("useLocalSessionState",
Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("rewriteBatchedStatements",
Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("cacheResultSetMetadata",
Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("cacheServerConfiguration",
Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("elideSetAutoCommits",
Boolean.TRUE.toString());
+ defaultJdbcUrlProperties.setProperty("maintainTimeStats",
Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("netTimeoutForStreamingResults",
"0");
+ defaultJdbcUrlProperties.setProperty("tinyInt1isBit",
Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("useSSL",
Boolean.FALSE.toString());
+ defaultJdbcUrlProperties.setProperty("serverTimezone", "UTC");
}
@Override
- public String getDataSourcePropertiesFieldName() {
- return "dataSourceProperties";
+ public String getJdbcUrlFieldName() {
+ return "jdbcUrl";
}
@Override
- public String getJdbcUrlFieldName() {
- return "jdbcUrl";
+ public String getJdbcUrlPropertiesFieldName() {
+ return "dataSourceProperties";
}
@Override
