This is an automated email from the ASF dual-hosted git repository.
yx9o 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 bd5b4edd50b Rename DataSourcePoolPropertiesContentValidator (#28054)
bd5b4edd50b is described below
commit bd5b4edd50b80829c82b1435148099acd0252421
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 12 19:06:04 2023 +0800
Rename DataSourcePoolPropertiesContentValidator (#28054)
* Rename DataSourcePoolPropertiesLegalValidator
* Rename DataSourcePoolPropertiesContentValidator
* Refactor DataSourcePoolPropertiesValidator
* Refactor DataSourcePoolPropertiesValidator
---
infra/common/pom.xml | 10 ++--------
...ator.java => DataSourcePoolPropertiesContentValidator.java} | 6 +++---
.../props/validator/DataSourcePoolPropertiesValidator.java | 8 +-------
.../props/validator/DataSourcePoolPropertiesValidatorTest.java | 2 +-
...ava => HikariDataSourcePoolPropertiesContentValidator.java} | 6 +++---
...l.props.validator.DataSourcePoolPropertiesContentValidator} | 2 +-
.../validate/DataSourcePoolPropertiesValidateHandler.java | 5 ++---
7 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/infra/common/pom.xml b/infra/common/pom.xml
index 1d13c2b5702..7ac0dc3b46a 100644
--- a/infra/common/pom.xml
+++ b/infra/common/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-datasource-c3p0</artifactId>
+ <artifactId>shardingsphere-infra-datasource-hikari</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -90,15 +90,9 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-datasource-druid</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-infra-datasource-hikari</artifactId>
+ <artifactId>shardingsphere-infra-datasource-c3p0</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-parser-sql-engine</artifactId>
diff --git
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/typed/TypedDataSourcePoolPropertiesValidator.java
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesContentValidator.java
similarity index 90%
rename from
infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/typed/TypedDataSourcePoolPropertiesValidator.java
rename to
infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesContentValidator.java
index 2d592e43acc..3f8b4205adb 100644
---
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/typed/TypedDataSourcePoolPropertiesValidator.java
+++
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesContentValidator.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.datasource.pool.props.validator.typed;
+package org.apache.shardingsphere.infra.datasource.pool.props.validator;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
/**
- * Typed data source pool properties validator.
+ * Data source pool properties content validator.
*/
@SingletonSPI
-public interface TypedDataSourcePoolPropertiesValidator extends TypedSPI {
+public interface DataSourcePoolPropertiesContentValidator extends TypedSPI {
/**
* Validate data source properties.
diff --git
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
index 7dbf7f41a61..90a69a39c43 100644
---
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
+++
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidator.java
@@ -22,7 +22,6 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
import
org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolDestroyer;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
-import
org.apache.shardingsphere.infra.datasource.pool.props.validator.typed.TypedDataSourcePoolPropertiesValidator;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import javax.sql.DataSource;
@@ -32,7 +31,6 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Optional;
/**
* Data source pool properties validator.
@@ -60,12 +58,8 @@ public final class DataSourcePoolPropertiesValidator {
}
private static void validateProperties(final String dataSourceName, final
DataSourcePoolProperties props) throws InvalidDataSourcePoolPropertiesException
{
- Optional<TypedDataSourcePoolPropertiesValidator> typedValidator =
TypedSPILoader.findService(TypedDataSourcePoolPropertiesValidator.class,
props.getPoolClassName());
- if (!typedValidator.isPresent()) {
- return;
- }
try {
- typedValidator.ifPresent(optional -> optional.validate(props));
+
TypedSPILoader.findService(DataSourcePoolPropertiesContentValidator.class,
props.getPoolClassName()).ifPresent(optional -> optional.validate(props));
} catch (final IllegalArgumentException ex) {
throw new InvalidDataSourcePoolPropertiesException(dataSourceName,
ex.getMessage());
}
diff --git
a/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidatorTest.java
b/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidatorTest.java
index c450d8faa6a..548c50901f8 100644
---
a/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidatorTest.java
+++
b/infra/datasource/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/validator/DataSourcePoolPropertiesValidatorTest.java
@@ -35,7 +35,7 @@ class DataSourcePoolPropertiesValidatorTest {
}
@Test
- void assertValidateSuccess() {
+ void assertValidate() {
assertTrue(DataSourcePoolPropertiesValidator.validate(
Collections.singletonMap("name", new
DataSourcePoolProperties(HikariDataSource.class.getName(),
Collections.singletonMap("jdbcUrl", "jdbc:mock")))).isEmpty());
}
diff --git
a/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolPropertiesValidator.java
b/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolPropertiesContentValidator.java
similarity index 95%
rename from
infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolPropertiesValidator.java
rename to
infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolPropertiesContentValidator.java
index 0e2c83e21df..a1bd557206e 100644
---
a/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolPropertiesValidator.java
+++
b/infra/datasource/type/hikari/src/main/java/org/apache/shardingsphere/infra/datasource/hikari/metadata/HikariDataSourcePoolPropertiesContentValidator.java
@@ -18,16 +18,16 @@
package org.apache.shardingsphere.infra.datasource.hikari.metadata;
import com.google.common.base.Preconditions;
-import
org.apache.shardingsphere.infra.datasource.pool.props.validator.typed.TypedDataSourcePoolPropertiesValidator;
+import
org.apache.shardingsphere.infra.datasource.pool.props.validator.DataSourcePoolPropertiesContentValidator;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
- * Data source pool properties validator of HikariCP.
+ * Data source pool properties content validator of HikariCP.
*/
-public final class HikariDataSourcePoolPropertiesValidator implements
TypedDataSourcePoolPropertiesValidator {
+public final class HikariDataSourcePoolPropertiesContentValidator implements
DataSourcePoolPropertiesContentValidator {
private static final long MIN_CONNECTION_TIMEOUT_MILLISECONDS = 250L;
diff --git
a/infra/datasource/type/hikari/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.props.validator.typed.TypedDataSourcePoolPropertiesValidator
b/infra/datasource/type/hikari/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.props.validator.DataSourcePoolPropertiesContentValidator
similarity index 95%
rename from
infra/datasource/type/hikari/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.props.validator.typed.TypedDataSourcePoolPropertiesValidator
rename to
infra/datasource/type/hikari/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.props.validator.DataSourcePoolPropertiesContentValidator
index 97760c66665..621e59c3229 100644
---
a/infra/datasource/type/hikari/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.props.validator.typed.TypedDataSourcePoolPropertiesValidator
+++
b/infra/datasource/type/hikari/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.props.validator.DataSourcePoolPropertiesContentValidator
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.datasource.hikari.metadata.HikariDataSourcePoolPropertiesValidator
+org.apache.shardingsphere.infra.datasource.hikari.metadata.HikariDataSourcePoolPropertiesContentValidator
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePoolPropertiesValidateHandler.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePoolPropertiesValidateHandler.java
index a2f017cd5a3..a81c0ddd4e5 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePoolPropertiesValidateHandler.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/validate/DataSourcePoolPropertiesValidateHandler.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.distsql.handler.validate;
import
org.apache.shardingsphere.distsql.handler.exception.storageunit.InvalidStorageUnitsException;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import
org.apache.shardingsphere.infra.datasource.pool.props.validator.DataSourcePoolPropertiesValidator;
+import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import java.util.Collection;
import java.util.Map;
@@ -37,8 +38,6 @@ public final class DataSourcePoolPropertiesValidateHandler {
*/
public void validate(final Map<String, DataSourcePoolProperties> propsMap)
{
Collection<String> errorMessages =
DataSourcePoolPropertiesValidator.validate(propsMap);
- if (!errorMessages.isEmpty()) {
- throw new InvalidStorageUnitsException(errorMessages);
- }
+ ShardingSpherePreconditions.checkState(errorMessages.isEmpty(), () ->
new InvalidStorageUnitsException(errorMessages));
}
}
