This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 07f9637 replace strings with constants already exist. (#1825)
07f9637 is described below
commit 07f96375b3975b005c0cc3a44cbb6d01b6550080
Author: ZHAOLIPAN <[email protected]>
AuthorDate: Wed Jan 15 14:00:28 2020 +0800
replace strings with constants already exist. (#1825)
---
.../apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java | 3 ++-
.../java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java | 3 ++-
.../org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java | 3 ++-
.../org/apache/dolphinscheduler/common/job/db/OracleDataSource.java | 3 ++-
.../org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java | 3 ++-
.../org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java | 3 ++-
.../org/apache/dolphinscheduler/common/job/db/SparkDataSource.java | 3 ++-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java
index 457ddb0..fe76497 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java
@@ -16,6 +16,7 @@
*/
package org.apache.dolphinscheduler.common.job.db;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +59,7 @@ public class ClickHouseDataSource extends BaseDataSource {
public void isConnectable() throws Exception {
Connection con = null;
try {
- Class.forName("ru.yandex.clickhouse.ClickHouseDriver");
+ Class.forName(Constants.COM_CLICKHOUSE_JDBC_DRIVER);
con = DriverManager.getConnection(getJdbcUrl(), getUser(),
getPassword());
} finally {
if (con != null) {
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java
index 101efae..cddedd1 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java
@@ -16,6 +16,7 @@
*/
package org.apache.dolphinscheduler.common.job.db;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +62,7 @@ public class HiveDataSource extends BaseDataSource {
public void isConnectable() throws Exception {
Connection con = null;
try {
- Class.forName("org.apache.hive.jdbc.HiveDriver");
+ Class.forName(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER);
con = DriverManager.getConnection(getJdbcUrl(), getUser(), "");
} finally {
if (con != null) {
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java
index 3cf2b2c..fa149e6 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java
@@ -16,6 +16,7 @@
*/
package org.apache.dolphinscheduler.common.job.db;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +57,7 @@ public class MySQLDataSource extends BaseDataSource {
public void isConnectable() throws Exception {
Connection con = null;
try {
- Class.forName("com.mysql.jdbc.Driver");
+ Class.forName(Constants.COM_MYSQL_JDBC_DRIVER);
con = DriverManager.getConnection(getJdbcUrl(), getUser(),
getPassword());
} finally {
if (con != null) {
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java
index 551c782..c3dc3a9 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java
@@ -16,6 +16,7 @@
*/
package org.apache.dolphinscheduler.common.job.db;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +59,7 @@ public class OracleDataSource extends BaseDataSource {
public void isConnectable() throws Exception {
Connection con = null;
try {
- Class.forName("oracle.jdbc.driver.OracleDriver");
+ Class.forName(Constants.COM_ORACLE_JDBC_DRIVER);
con = DriverManager.getConnection(getJdbcUrl(), getUser(),
getPassword());
} finally {
if (con != null) {
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java
index 5241b4c..4989e76 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java
@@ -16,6 +16,7 @@
*/
package org.apache.dolphinscheduler.common.job.db;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +61,7 @@ public class PostgreDataSource extends BaseDataSource {
public void isConnectable() throws Exception {
Connection con = null;
try {
- Class.forName("org.postgresql.Driver");
+ Class.forName(Constants.ORG_POSTGRESQL_DRIVER);
con = DriverManager.getConnection(getJdbcUrl(), getUser(),
getPassword());
} finally {
if (con != null) {
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java
index fe398eb..8554992 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java
@@ -16,6 +16,7 @@
*/
package org.apache.dolphinscheduler.common.job.db;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +55,7 @@ public class SQLServerDataSource extends BaseDataSource {
public void isConnectable() throws Exception {
Connection con = null;
try {
- Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+ Class.forName(Constants.COM_SQLSERVER_JDBC_DRIVER);
con = DriverManager.getConnection(getJdbcUrl(), getUser(),
getPassword());
} finally {
if (con != null) {
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SparkDataSource.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SparkDataSource.java
index eb45512..5d10c63 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SparkDataSource.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SparkDataSource.java
@@ -16,6 +16,7 @@
*/
package org.apache.dolphinscheduler.common.job.db;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +64,7 @@ public class SparkDataSource extends BaseDataSource {
public void isConnectable() throws Exception {
Connection con = null;
try {
- Class.forName("org.apache.hive.jdbc.HiveDriver");
+ Class.forName(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER);
con = DriverManager.getConnection(getJdbcUrl(), getUser(), "");
} finally {
if (con != null) {
