This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 873c43a2e49 Rename DataSourcePoolMetaData.getSkippedProperties()
(#28039)
873c43a2e49 is described below
commit 873c43a2e4935318f1a6a4da1b0db09a75f922df
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Aug 11 13:32:22 2023 +0800
Rename DataSourcePoolMetaData.getSkippedProperties() (#28039)
---
.../infra/datasource/pool/creator/DataSourcePoolCreator.java | 2 +-
.../infra/datasource/pool/metadata/DataSourcePoolMetaData.java | 6 +++---
.../datasource/pool/props/DataSourcePropertiesCreator.java | 2 +-
.../pool/metadata/fixture/DataSourcePoolMetaDataFixture.java | 2 +-
.../datasource/c3p0/metadata/C3P0DataSourcePoolMetaData.java | 10 +++++-----
.../datasource/dbcp/metadata/DBCPDataSourcePoolMetaData.java | 2 +-
.../datasource/druid/metadata/DruidDataSourcePoolMetaData.java | 2 +-
.../hikari/metadata/HikariDataSourcePoolMetaData.java | 10 +++++-----
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
index 4e27fe74fcb..989d82b7f67 100644
---
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
+++
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
@@ -258,7 +258,7 @@ public final class DataSourcePoolCreator {
}
private static boolean isValidProperty(final String key, final Object
value, final DataSourcePoolMetaData poolMetaData) {
- return !poolMetaData.getInvalidProperties().containsKey(key) || null
== value || !value.equals(poolMetaData.getInvalidProperties().get(key));
+ return !poolMetaData.getSkippedProperties().containsKey(key) || null
== value || !value.equals(poolMetaData.getSkippedProperties().get(key));
}
@SuppressWarnings("unchecked")
diff --git
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaData.java
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaData.java
index 8678cf76948..5689ede44ad 100644
---
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaData.java
+++
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/DataSourcePoolMetaData.java
@@ -38,11 +38,11 @@ public interface DataSourcePoolMetaData extends TypedSPI {
Map<String, Object> getDefaultProperties();
/**
- * Get invalid properties.
+ * Get skipped properties.
*
- * @return invalid properties
+ * @return skipped properties
*/
- Map<String, Object> getInvalidProperties();
+ Map<String, Object> getSkippedProperties();
/**
* Get property synonyms.
diff --git
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/DataSourcePropertiesCreator.java
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/DataSourcePropertiesCreator.java
index 536cbe10e59..ca6ca1500a3 100644
---
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/DataSourcePropertiesCreator.java
+++
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/DataSourcePropertiesCreator.java
@@ -125,7 +125,7 @@ public final class DataSourcePropertiesCreator {
}
private static boolean isValidProperty(final String key, final Object
value, final DataSourcePoolMetaData poolMetaData) {
- return !poolMetaData.getInvalidProperties().containsKey(key) || null
== value || !value.equals(poolMetaData.getInvalidProperties().get(key));
+ return !poolMetaData.getSkippedProperties().containsKey(key) || null
== value || !value.equals(poolMetaData.getSkippedProperties().get(key));
}
/**
diff --git
a/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/DataSourcePoolMetaDataFixture.java
b/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/DataSourcePoolMetaDataFixture.java
index 732a64c0723..a7c036fcbce 100644
---
a/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/DataSourcePoolMetaDataFixture.java
+++
b/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/metadata/fixture/DataSourcePoolMetaDataFixture.java
@@ -32,7 +32,7 @@ public final class DataSourcePoolMetaDataFixture implements
DataSourcePoolMetaDa
}
@Override
- public Map<String, Object> getInvalidProperties() {
+ public Map<String, Object> getSkippedProperties() {
Map<String, Object> result = new HashMap<>(2, 1F);
result.put("maxPoolSize", -1);
result.put("minPoolSize", -1);
diff --git
a/infra/datasource/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/c3p0/metadata/C3P0DataSourcePoolMetaData.java
b/infra/datasource/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/c3p0/metadata/C3P0DataSourcePoolMetaData.java
index 4972c28cf86..581c0924694 100644
---
a/infra/datasource/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/c3p0/metadata/C3P0DataSourcePoolMetaData.java
+++
b/infra/datasource/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/c3p0/metadata/C3P0DataSourcePoolMetaData.java
@@ -31,7 +31,7 @@ public final class C3P0DataSourcePoolMetaData implements
DataSourcePoolMetaData
private static final Map<String, Object> DEFAULT_PROPS = new HashMap<>(6,
1F);
- private static final Map<String, Object> INVALID_PROPS = new HashMap<>(2,
1F);
+ private static final Map<String, Object> SKIPPED_PROPS = new HashMap<>(2,
1F);
private static final Map<String, String> PROP_SYNONYMS = new HashMap<>(5,
1F);
@@ -54,8 +54,8 @@ public final class C3P0DataSourcePoolMetaData implements
DataSourcePoolMetaData
}
private static void buildInvalidProperties() {
- INVALID_PROPS.put("minPoolSize", -1);
- INVALID_PROPS.put("maxPoolSize", -1);
+ SKIPPED_PROPS.put("minPoolSize", -1);
+ SKIPPED_PROPS.put("maxPoolSize", -1);
}
private static void buildPropertySynonyms() {
@@ -77,8 +77,8 @@ public final class C3P0DataSourcePoolMetaData implements
DataSourcePoolMetaData
}
@Override
- public Map<String, Object> getInvalidProperties() {
- return INVALID_PROPS;
+ public Map<String, Object> getSkippedProperties() {
+ return SKIPPED_PROPS;
}
@Override
diff --git
a/infra/datasource/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/dbcp/metadata/DBCPDataSourcePoolMetaData.java
b/infra/datasource/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/dbcp/metadata/DBCPDataSourcePoolMetaData.java
index 882cd49883f..d703fccce2e 100644
---
a/infra/datasource/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/dbcp/metadata/DBCPDataSourcePoolMetaData.java
+++
b/infra/datasource/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/dbcp/metadata/DBCPDataSourcePoolMetaData.java
@@ -46,7 +46,7 @@ public final class DBCPDataSourcePoolMetaData implements
DataSourcePoolMetaData
}
@Override
- public Map<String, Object> getInvalidProperties() {
+ public Map<String, Object> getSkippedProperties() {
return Collections.emptyMap();
}
diff --git
a/infra/datasource/type/druid/src/main/java/org/apache/shardingsphere/infra/datasource/druid/metadata/DruidDataSourcePoolMetaData.java
b/infra/datasource/type/druid/src/main/java/org/apache/shardingsphere/infra/datasource/druid/metadata/DruidDataSourcePoolMetaData.java
index 32e8f033d56..9d65164aa94 100644
---
a/infra/datasource/type/druid/src/main/java/org/apache/shardingsphere/infra/datasource/druid/metadata/DruidDataSourcePoolMetaData.java
+++
b/infra/datasource/type/druid/src/main/java/org/apache/shardingsphere/infra/datasource/druid/metadata/DruidDataSourcePoolMetaData.java
@@ -45,7 +45,7 @@ public final class DruidDataSourcePoolMetaData implements
DataSourcePoolMetaData
}
@Override
- public Map<String, Object> getInvalidProperties() {
+ public Map<String, Object> getSkippedProperties() {
return Collections.emptyMap();
}
diff --git
a/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolMetaData.java
b/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolMetaData.java
index 12c43f56425..0647c42f03c 100644
---
a/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolMetaData.java
+++
b/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolMetaData.java
@@ -33,7 +33,7 @@ public final class HikariDataSourcePoolMetaData implements
DataSourcePoolMetaDat
private static final Map<String, Object> DEFAULT_PROPS = new HashMap<>(6,
1F);
- private static final Map<String, Object> INVALID_PROPS = new HashMap<>(2,
1F);
+ private static final Map<String, Object> SKIPPED_PROPS = new HashMap<>(2,
1F);
private static final Map<String, String> PROP_SYNONYMS = new HashMap<>(6,
1F);
@@ -57,8 +57,8 @@ public final class HikariDataSourcePoolMetaData implements
DataSourcePoolMetaDat
}
private static void buildInvalidProperties() {
- INVALID_PROPS.put("minimumIdle", -1);
- INVALID_PROPS.put("maximumPoolSize", -1);
+ SKIPPED_PROPS.put("minimumIdle", -1);
+ SKIPPED_PROPS.put("maximumPoolSize", -1);
}
private static void buildPropertySynonyms() {
@@ -82,8 +82,8 @@ public final class HikariDataSourcePoolMetaData implements
DataSourcePoolMetaDat
}
@Override
- public Map<String, Object> getInvalidProperties() {
- return INVALID_PROPS;
+ public Map<String, Object> getSkippedProperties() {
+ return SKIPPED_PROPS;
}
@Override
