[incubator-dolphinscheduler] branch dev-1.3.0 updated: fix oracle connect failure (#2812)

[leonbao]

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
     new 5b633cf  fix oracle connect failure (#2812)
5b633cf is described below

commit 5b633cf4126760168f50bf76be3706a1a6536eb0
Author: lgcareer <18610854...@163.com>
AuthorDate: Mon May 25 19:46:39 2020 +0800

    fix oracle connect failure (#2812)
    
    * use method getJdbcUrl of parent
    
    * Remove the incorrect print message
---
 .../api/controller/DataSourceController.java                |  2 +-
 .../dolphinscheduler/dao/datasource/OracleDataSource.java   | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
index 7f35ac0..a34d61a 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
@@ -278,7 +278,7 @@ public class DataSourceController extends BaseController {
                                     @RequestParam(value = "password") String 
password,
                                     @RequestParam(value = "connectType") 
DbConnectType connectType,
                                     @RequestParam(value = "other") String 
other) {
-        logger.info("login user {}, connect datasource: {} failure, note: {}, 
type: {}, connectType: {}, other: {}",
+        logger.info("login user {}, connect datasource: {}, note: {}, type: 
{}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, connectType, other);
         String parameter = dataSourceService.buildParameter(name, note, type, 
host, port, database, principal, userName, password, connectType, other);
         Boolean isConnection = dataSourceService.checkConnection(type, 
parameter);
diff --git 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
index c457583..7666ca7 100644
--- 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
+++ 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
@@ -46,19 +46,6 @@ public class OracleDataSource extends BaseDataSource {
     }
 
     /**
-     * gets the JDBC url for the data source connection
-     * @return jdbc url
-     */
-    @Override
-    public String getJdbcUrl() {
-        String jdbcUrl = getAddress();
-        if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {
-            jdbcUrl += "/";
-        }
-        return jdbcUrl;
-    }
-
-    /**
      * @return db type
      */
     @Override