Skip to content

[Improvement#5083][API] Refactored data source creation #5116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CalvinKirs merged 11 commits into from
Apr 25, 2021
Merged

[Improvement#5083][API] Refactored data source creation #5116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c80b4de
[Improvement][API] Create Datasource #5083
ruanwenjun Mar 20, 2021
aead10e
fix Code Smells
ruanwenjun Apr 10, 2021
0175e04
fix code smell
ruanwenjun Apr 10, 2021
09c371c
resolve code smell
ruanwenjun Apr 11, 2021
2da1bfa
use ConnectionParam to replace BaseDatasource
ruanwenjun Apr 14, 2021
0342676
solve license
ruanwenjun Apr 15, 2021
4933e65
add ut
ruanwenjun Apr 15, 2021
9737f89
code check
ruanwenjun Apr 15, 2021
a47d035
add ut
ruanwenjun Apr 15, 2021
32d6194
fix ut coverage
ruanwenjun Apr 15, 2021
e0c38be
fix ut
ruanwenjun Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 24 additions & 133 deletions ...er-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 8 additions & 31 deletions ...cheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
package org.apache.dolphinscheduler.api.service;

import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.enums.DbConnectType;
import org.apache.dolphinscheduler.common.datasource.BaseDataSourceParamDTO;
import org.apache.dolphinscheduler.common.datasource.ConnectionParam;
import org.apache.dolphinscheduler.common.enums.DbType;
import org.apache.dolphinscheduler.dao.entity.User;

Expand All @@ -33,26 +34,20 @@ public interface DataSourceService {
* create data source
*
* @param loginUser login user
* @param name data source name
* @param desc data source description
* @param type data source type
* @param parameter datasource parameters
* @param datasourceParam datasource parameter
* @return create result code
*/
Result<Object> createDataSource(User loginUser, String name, String desc, DbType type, String parameter);
Result<Object> createDataSource(User loginUser, BaseDataSourceParamDTO datasourceParam);

/**
* updateProcessInstance datasource
*
* @param loginUser login user
* @param name data source name
* @param desc data source description
* @param type data source type
* @param parameter datasource parameters
* @param id data source id
* @param id data source id
* @param dataSourceParam data source params
* @return update result code
*/
Result<Object> updateDataSource(int id, User loginUser, String name, String desc, DbType type, String parameter);
Result<Object> updateDataSource(int id, User loginUser, BaseDataSourceParamDTO dataSourceParam);

/**
* updateProcessInstance datasource
Expand Down Expand Up @@ -97,7 +92,7 @@ public interface DataSourceService {
* @param parameter data source parameters
* @return true if connect successfully, otherwise false
*/
Result<Object> checkConnection(DbType type, String parameter);
Result<Object> checkConnection(DbType type, ConnectionParam parameter);

/**
* test connection
Expand All @@ -107,24 +102,6 @@ public interface DataSourceService {
*/
Result<Object> connectionTest(int id);

/**
* build paramters
*
* @param type data source type
* @param host data source host
* @param port data source port
* @param database data source database name
* @param userName user name
* @param password password
* @param other other parameters
* @param principal principal
* @return datasource parameter
*/
String buildParameter(DbType type, String host,
String port, String database, String principal, String userName,
String password, DbConnectType connectType, String other,
String javaSecurityKrb5Conf, String loginUserKeytabUsername, String loginUserKeytabPath);

/**
* delete datasource
*
Expand Down
Loading