Commit 07f96375 authored by ZHAOLIPAN's avatar ZHAOLIPAN Committed by qiaozhanwei
Browse files

replace strings with constants already exist. (#1825)

parent be4fa728

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {