Skip to content

Commit 28555a7

Browse files
HmhWzHmhWz
committed
The exception cannot be caught because the HTTP status code need to be converted to 400.
1 parent a9f1c54 commit 28555a7

File tree

2 files changed

+57
-89
lines changed

2 files changed

+57
-89
lines changed

‎dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,15 @@ public void init() {
6767
* @return
6868
*/
6969
@RequestMapping(path = "createOrchestrator", method = RequestMethod.POST)
70-
public Message createOrchestrator(HttpServletRequest httpServletRequest, @RequestBody OrchestratorCreateRequest createRequest) {
70+
public Message createOrchestrator(HttpServletRequest httpServletRequest, @RequestBody OrchestratorCreateRequest createRequest) throws Exception{
7171
String username = SecurityFilter.getLoginUsername(httpServletRequest);
7272
Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
7373
LOGGER.info("workspace is {}", workspace.getWorkspaceName());
74-
try {
75-
//保存编排模式
76-
//todo 先注释掉
77-
// orchestratorService.saveOrchestrator(createRequest,null,username);
78-
CommonOrchestratorVo orchestratorVo = orchestratorFrameworkService.createOrchestrator(username, createRequest, workspace);
79-
return Message.ok("创建工作流编排模式成功").data("orchestratorId", orchestratorVo.getOrchestratorId());
80-
} catch (Exception e) {
81-
LOGGER.error("Failed to create orchestrator {} for user {}", createRequest, username, e);
82-
return Message.error("创建工作流编排模式失败:" + e.getMessage());
83-
}
74+
//保存编排模式
75+
//todo 先注释掉
76+
// orchestratorService.saveOrchestrator(createRequest,null,username);
77+
CommonOrchestratorVo orchestratorVo = orchestratorFrameworkService.createOrchestrator(username, createRequest, workspace);
78+
return Message.ok("创建工作流编排模式成功").data("orchestratorId", orchestratorVo.getOrchestratorId());
8479
}
8580

8681
/**
@@ -109,19 +104,12 @@ public Message getAllOrchestrator(HttpServletRequest httpServletRequest, @Reques
109104
* @return
110105
*/
111106
@RequestMapping(path = "modifyOrchestrator", method = RequestMethod.POST)
112-
public Message modifyOrchestrator(HttpServletRequest httpServletRequest, @RequestBody OrchestratorModifyRequest modifyRequest) {
107+
public Message modifyOrchestrator(HttpServletRequest httpServletRequest, @RequestBody OrchestratorModifyRequest modifyRequest) throws Exception{
113108
String username = SecurityFilter.getLoginUsername(httpServletRequest);
114109
Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
115110
LOGGER.info("workspace is {}", workspace.getWorkspaceName());
116-
try {
117-
CommonOrchestratorVo orchestratorVo = orchestratorFrameworkService.modifyOrchestrator(username, modifyRequest, workspace);
118-
//保存编排模式
119-
// orchestratorService.updateOrchestrator(modifyRequest, username);
120-
return Message.ok("修改工作流编排模式成功").data("orchestratorId", orchestratorVo.getOrchestratorId());
121-
} catch (Exception e) {
122-
LOGGER.error("Failed to create orchestrator {} for user {}", modifyRequest, username, e);
123-
return Message.error("修改工作流编排模式失败:" + e.getMessage());
124-
}
111+
CommonOrchestratorVo orchestratorVo = orchestratorFrameworkService.modifyOrchestrator(username, modifyRequest, workspace);
112+
return Message.ok("修改工作流编排模式成功").data("orchestratorId", orchestratorVo.getOrchestratorId());
125113
}
126114

127115
/**
@@ -132,16 +120,11 @@ public Message modifyOrchestrator(HttpServletRequest httpServletRequest, @Reques
132120
* @return
133121
*/
134122
@RequestMapping(path = "deleteOrchestrator", method = RequestMethod.POST)
135-
public Message deleteOrchestrator(HttpServletRequest httpServletRequest, @RequestBody OrchestratorDeleteRequest deleteRequest) {
123+
public Message deleteOrchestrator(HttpServletRequest httpServletRequest, @RequestBody OrchestratorDeleteRequest deleteRequest) throws Exception {
136124
String username = SecurityFilter.getLoginUsername(httpServletRequest);
137125
Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
138-
try {
139-
orchestratorFrameworkService.deleteOrchestrator(username, deleteRequest, workspace);
140-
return Message.ok("删除工作流编排模式成功");
141-
} catch (Exception e) {
142-
LOGGER.error("Failed to delete orchestrator {} for user {}.", deleteRequest.getId(), username, e);
143-
return Message.error("删除工作流编排模式失败:" + ExceptionUtils.getRootCauseMessage(e));
144-
}
126+
orchestratorFrameworkService.deleteOrchestrator(username, deleteRequest, workspace);
127+
return Message.ok("删除工作流编排模式成功");
145128
}
146129

147130
@RequestMapping(path = "orchestratorLevels", method = RequestMethod.GET)

‎dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/restful/DSSFrameworkProjectRestfulApi.java‎

Lines changed: 45 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -77,31 +77,26 @@ public Message getAllProjects(HttpServletRequest request, @RequestBody ProjectQu
7777
* 新建工程,通过和各个AppConn进行交互，将需要满足工程规范的所有的appconn进行创建工程
7878
*/
7979
@RequestMapping(path = "createProject", method = RequestMethod.POST)
80-
public Message createProject(HttpServletRequest request, @RequestBody ProjectCreateRequest projectCreateRequest) {
80+
public Message createProject(HttpServletRequest request, @RequestBody ProjectCreateRequest projectCreateRequest) throws Exception {
8181
String username = SecurityFilter.getLoginUsername(request);
8282
Workspace workspace = SSOHelper.getWorkspace(request);
83-
try {
84-
//將创建人默认为发布权限和編輯权限
85-
if (!projectCreateRequest.getEditUsers().contains(username)) {
86-
projectCreateRequest.getEditUsers().add(username);
87-
}
88-
List<String> releaseUsers = projectCreateRequest.getReleaseUsers();
89-
if (releaseUsers == null) {
90-
releaseUsers = new ArrayList<>();
91-
projectCreateRequest.setReleaseUsers(releaseUsers);
92-
}
93-
if (!releaseUsers.contains(username)) {
94-
releaseUsers.add(username);
95-
}
96-
DSSProjectVo dssProjectVo = dssFrameworkProjectService.createProject(projectCreateRequest, username, workspace);
97-
if (dssProjectVo != null) {
98-
return Message.ok("创建工程成功").data("project", dssProjectVo);
99-
} else {
100-
return Message.error("创建工程失败");
101-
}
102-
} catch (final Throwable t) {
103-
LOGGER.error("failed to create project {} for user {}", projectCreateRequest.getName(), username, t);
104-
return Message.error("创建工程失败:" + t.getMessage());
83+
//將创建人默认为发布权限和編輯权限
84+
if (!projectCreateRequest.getEditUsers().contains(username)) {
85+
projectCreateRequest.getEditUsers().add(username);
86+
}
87+
List<String> releaseUsers = projectCreateRequest.getReleaseUsers();
88+
if (releaseUsers == null) {
89+
releaseUsers = new ArrayList<>();
90+
projectCreateRequest.setReleaseUsers(releaseUsers);
91+
}
92+
if (!releaseUsers.contains(username)) {
93+
releaseUsers.add(username);
94+
}
95+
DSSProjectVo dssProjectVo = dssFrameworkProjectService.createProject(projectCreateRequest, username, workspace);
96+
if (dssProjectVo != null) {
97+
return Message.ok("创建工程成功").data("project", dssProjectVo);
98+
} else {
99+
return Message.error("创建工程失败");
105100
}
106101
}
107102

@@ -113,36 +108,31 @@ public Message createProject(HttpServletRequest request, @RequestBody ProjectCre
113108
* @return
114109
*/
115110
@RequestMapping(path = "modifyProject", method = RequestMethod.POST)
116-
public Message modifyProject(HttpServletRequest request, @RequestBody ProjectModifyRequest projectModifyRequest) {
111+
public Message modifyProject(HttpServletRequest request, @RequestBody ProjectModifyRequest projectModifyRequest) throws Exception {
117112
String username = SecurityFilter.getLoginUsername(request);
118113
Workspace workspace = SSOHelper.getWorkspace(request);
119-
try {
120-
DSSProjectDO dbProject = dssProjectService.getProjectById(projectModifyRequest.getId());
121-
//工程不存在
122-
if (dbProject == null) {
123-
LOGGER.error("{} project id is null, can not modify", projectModifyRequest.getName());
124-
DSSExceptionUtils.dealErrorException(60021,
125-
String.format("%s project id is null, can not modify", projectModifyRequest.getName()), DSSProjectErrorException.class);
126-
}
127-
String createUsername = dbProject.getUsername();
128-
//將创建人默认为发布权限和編輯权限
129-
if (!projectModifyRequest.getEditUsers().contains(createUsername)) {
130-
projectModifyRequest.getEditUsers().add(createUsername);
131-
}
132-
List<String> releaseUsers = projectModifyRequest.getReleaseUsers();
133-
if (releaseUsers == null) {
134-
releaseUsers = new ArrayList<>();
135-
projectModifyRequest.setReleaseUsers(releaseUsers);
136-
}
137-
if (!releaseUsers.contains(createUsername)) {
138-
releaseUsers.add(createUsername);
139-
}
140-
dssFrameworkProjectService.modifyProject(projectModifyRequest, dbProject, username, workspace);
141-
return Message.ok("修改工程成功");
142-
} catch (Exception e) {
143-
LOGGER.error("Failed to modify project {} for user {}", projectModifyRequest.getName(), username, e);
144-
return Message.error("修改工程失败:" + e.getMessage());
114+
DSSProjectDO dbProject = dssProjectService.getProjectById(projectModifyRequest.getId());
115+
//工程不存在
116+
if (dbProject == null) {
117+
LOGGER.error("{} project id is null, can not modify", projectModifyRequest.getName());
118+
DSSExceptionUtils.dealErrorException(60021,
119+
String.format("%s project id is null, can not modify", projectModifyRequest.getName()), DSSProjectErrorException.class);
120+
}
121+
String createUsername = dbProject.getUsername();
122+
//將创建人默认为发布权限和編輯权限
123+
if (!projectModifyRequest.getEditUsers().contains(createUsername)) {
124+
projectModifyRequest.getEditUsers().add(createUsername);
145125
}
126+
List<String> releaseUsers = projectModifyRequest.getReleaseUsers();
127+
if (releaseUsers == null) {
128+
releaseUsers = new ArrayList<>();
129+
projectModifyRequest.setReleaseUsers(releaseUsers);
130+
}
131+
if (!releaseUsers.contains(createUsername)) {
132+
releaseUsers.add(createUsername);
133+
}
134+
dssFrameworkProjectService.modifyProject(projectModifyRequest, dbProject, username, workspace);
135+
return Message.ok("修改工程成功");
146136
}
147137

148138
/**
@@ -153,18 +143,13 @@ public Message modifyProject(HttpServletRequest request, @RequestBody ProjectMod
153143
* @return
154144
*/
155145
@RequestMapping(path = "deleteProject", method = RequestMethod.POST)
156-
public Message deleteProject(HttpServletRequest request, @RequestBody ProjectDeleteRequest projectDeleteRequest) {
146+
public Message deleteProject(HttpServletRequest request, @RequestBody ProjectDeleteRequest projectDeleteRequest) throws Exception {
157147
String username = SecurityFilter.getLoginUsername(request);
158148
Workspace workspace = SSOHelper.getWorkspace(request);
159-
try {
160-
// 检查是否具有删除项目权限
161-
projectService.isDeleteProjectAuth(projectDeleteRequest.getId(), username);
162-
projectService.deleteProject(username, projectDeleteRequest, workspace);
163-
return Message.ok("删除工程成功");
164-
} catch (final Throwable t) {
165-
LOGGER.error("Failed to delete {} for user {}", projectDeleteRequest, username, t);
166-
return Message.error("删除工程失败");
167-
}
149+
// 检查是否具有删除项目权限
150+
projectService.isDeleteProjectAuth(projectDeleteRequest.getId(), username);
151+
projectService.deleteProject(username, projectDeleteRequest, workspace);
152+
return Message.ok("删除工程成功");
168153
}
169154

170155
@RequestMapping(path = "listApplicationAreas", method = RequestMethod.GET)

0 commit comments

Comments
 (0)