[shardingsphere] branch master updated: Use CanonicalName instead of HikariDataSource type (#13551)

[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 75dd2ec  Use CanonicalName instead of HikariDataSource type (#13551)
75dd2ec is described below

commit 75dd2ec87d3851e7c9b8d768102b7e8daffe9414
Author: Haoran Meng <menghaora...@gmail.com>
AuthorDate: Thu Nov 11 15:50:32 2021 +0800

    Use CanonicalName instead of HikariDataSource type (#13551)
    
    Co-authored-by: shardingsphere <d...@shardingsphere.apache.org>
---
 shardingsphere-infra/shardingsphere-infra-common/pom.xml               | 2 +-
 .../infra/config/datasource/creator/impl/HikariDataSourceCreator.java  | 3 ++-
 .../infra/config/datasource/killer/impl/HikariDataSourceKiller.java    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/shardingsphere-infra/shardingsphere-infra-common/pom.xml 
b/shardingsphere-infra/shardingsphere-infra-common/pom.xml
index ec05384..5493357 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-common/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/HikariDataSourceCreator.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/HikariDataSourceCreator.java
index 85acf44..7451c8f 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/HikariDataSourceCreator.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/creator/impl/HikariDataSourceCreator.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.infra.config.datasource.creator.impl;
 
+import com.zaxxer.hikari.HikariDataSource;
 import 
org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration;
 
 import javax.sql.DataSource;
@@ -67,6 +68,6 @@ public final class HikariDataSourceCreator extends 
AbstractDataSourceCreator {
     
     @Override
     public String getType() {
-        return "com.zaxxer.hikari.HikariDataSource";
+        return HikariDataSource.class.getCanonicalName();
     }
 }
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/killer/impl/HikariDataSourceKiller.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/killer/impl/HikariDataSourceKiller.java
index 5e8a156..a492e72 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/killer/impl/HikariDataSourceKiller.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/killer/impl/HikariDataSourceKiller.java
@@ -30,7 +30,7 @@ public final class HikariDataSourceKiller implements 
DataSourceKiller {
     
     @Override
     public String getType() {
-        return "com.zaxxer.hikari.HikariDataSource";
+        return HikariDataSource.class.getCanonicalName();
     }
     
     @Override