Skip to content
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

[Improvement-15713][api]DataSource And UdfFunc list query use Enum code value rather than ordinal #15714

Merged
merged 7 commits into from
Apr 9, 2024
Merged

[Improvement-15713][api]DataSource And UdfFunc list query use Enum code value rather than ordinal #15714

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37ca98c
fix：DataSource And UdfFunc list query use Enum code value not ordinal
songwenyong Mar 14, 2024
ebd8301
Merge branch 'dev' into Improvement-15713
rickchengx Mar 15, 2024
d8a47bf
Merge branch 'dev' into Improvement-15713
rickchengx Mar 18, 2024
db2ad8f
Merge branch 'dev' into Improvement-15713
songwenyong Mar 19, 2024
a8c0fe5
Merge branch 'dev' into Improvement-15713
rickchengx Mar 22, 2024
e9ab9e4
Merge branch 'dev' into Improvement-15713
rickchengx Apr 3, 2024
f60db41
Merge branch 'dev' into Improvement-15713
rickchengx Apr 9, 2024
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
2 changes: 1 addition & 1 deletion ...er-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public Result<Object> queryDataSource(@Parameter(hidden = true) @RequestAttribut
@ApiException(QUERY_DATASOURCE_ERROR)
public Result<Object> queryDataSourceList(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("type") DbType type) {
List<DataSource> datasourceList = dataSourceService.queryDataSourceList(loginUser, type.ordinal());
List<DataSource> datasourceList = dataSourceService.queryDataSourceList(loginUser, type.getCode());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overall LGTM, please update the related UT

return Result.success(datasourceList);
}

Expand Down
2 changes: 1 addition & 1 deletion ...ler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ public Result<Object> queryUdfFuncListPaging(@Parameter(hidden = true) @RequestA
@ApiException(QUERY_DATASOURCE_BY_TYPE_ERROR)
public Result<Object> queryUdfFuncList(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("type") UdfType type) {
return udfFuncService.queryUdfFuncList(loginUser, type.ordinal());
return udfFuncService.queryUdfFuncList(loginUser, type.getCode());
}

/**
Expand Down
Loading