fix oracle connect failure (#2812)

* use method getJdbcUrl of parent * Remove the incorrect print message
apache · May 25, 2020 · 5b633cf · 5b633cf
1 parent 9994878
commit 5b633cf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/...er-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java b/...er-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
@@ -278,7 +278,7 @@ public Result connectDataSource(@ApiIgnore @RequestAttribute(value = Constants.S
                                     @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/...eduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java b/...eduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
@@ -45,19 +45,6 @@ public String driverClassSelector() {
         return Constants.COM_ORACLE_JDBC_DRIVER;
     }
 
-    /**
-     * 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
      */