This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 1303050 [FIX-3836][dev-API] process definition validation name
interface prompt information error (#3908)
1303050 is described below
commit 13030502fd27863827ce9a2e3ec905c5a359170b
Author: BoYiZhang <[email protected]>
AuthorDate: Thu Oct 15 14:09:28 2020 +0800
[FIX-3836][dev-API] process definition validation name interface prompt
information error (#3908)
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* fix bug
Delete invalid field: executorcores
Modify verification prompt
* dag add close button
* reset last version
* reset last version
* dag add close buttion
dag add close buttion
* update CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* updae CLICK_SAVE_WORKFLOW_BUTTON xpath
* Update CreateWorkflowLocator.java
modify submit workflow button
* Update CreateWorkflowLocator.java
* Update CreateWorkflowLocator.java
modify CLICK_ADD_BUTTON
* Update CreateWorkflowLocator.java
delete print
* Update CreateWorkflowLocator.java
1
* Update CreateWorkflowLocator.java
1
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes =
10M'
* Update dag.vue
* Update dag.vue
* Update dag.vue
* Update CreateWorkflowLocator.java
* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"
This reverts commit 3a2cba7a
* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks
in addition
update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes =
10M'
* Update dolphinscheduler-daemon.sh
* process definition validation name interface prompt information error
Co-authored-by: dailidong <[email protected]>
Co-authored-by: xingchun-chen
<[email protected]>
---
.../api/service/impl/ProcessDefinitionServiceImpl.java | 4 ++--
.../api/controller/ProcessDefinitionControllerTest.java | 4 ++--
.../dolphinscheduler/api/service/ProcessDefinitionServiceTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 90239b3..8193093 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -223,7 +223,7 @@ public class ProcessDefinitionServiceImpl extends
BaseService implements
// return processDefinition object with ID
result.put(Constants.DATA_LIST,
processDefineMapper.selectById(processDefine.getId()));
putMsg(result, Status.SUCCESS);
- result.put("processDefinitionId", processDefine.getId());
+ result.put(PROCESSDEFINITIONID, processDefine.getId());
return result;
}
@@ -438,7 +438,7 @@ public class ProcessDefinitionServiceImpl extends
BaseService implements
if (processDefinition == null) {
putMsg(result, Status.SUCCESS);
} else {
- putMsg(result, Status.PROCESS_INSTANCE_EXIST, name);
+ putMsg(result, Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR,
name);
}
return result;
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
index f2a54a1..692d28b 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
@@ -117,14 +117,14 @@ public class ProcessDefinitionControllerTest {
public void testVerifyProcessDefinitionName() throws Exception {
Map<String, Object> result = new HashMap<>();
- putMsg(result, Status.PROCESS_INSTANCE_EXIST);
+ putMsg(result, Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR);
String projectName = "test";
String name = "dag_test";
Mockito.when(processDefinitionService.verifyProcessDefinitionName(user,
projectName, name)).thenReturn(result);
Result response =
processDefinitionController.verifyProcessDefinitionName(user, projectName,
name);
- Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST.getCode(),
response.getCode().intValue());
+
Assert.assertEquals(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getCode(),
response.getCode().intValue());
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
index 9a9fcb0..eb71cc8 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
@@ -627,7 +627,7 @@ public class ProcessDefinitionServiceTest {
Mockito.when(processDefineMapper.verifyByDefineName(project.getId(),
"test_pdf")).thenReturn(getProcessDefinition());
Map<String, Object> processExistRes =
processDefinitionService.verifyProcessDefinitionName(loginUser,
"project_test1", "test_pdf");
- Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST,
processExistRes.get(Constants.STATUS));
+
Assert.assertEquals(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR,
processExistRes.get(Constants.STATUS));
}
@Test
