未验证 提交 006b8a3e 编写于 作者: S salaboy 提交者: GitHub

Merge pull request #2409 from...

Merge pull request #2409 from Activiti/CTI777-2393-Start-Process-inconsistency-of-parameter-name-in-request-response-for-process-name

Refactoring for UpdateProcessPayload and StartProcessPayload
/*
/*
* Copyright 2018 Alfresco, Inc. and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
......@@ -128,7 +128,7 @@ public class ProcessAdminRuntimeImpl implements ProcessAdminRuntime {
.processDefinitionKey(startProcessPayload.getProcessDefinitionKey())
.businessKey(startProcessPayload.getBusinessKey())
.variables(startProcessPayload.getVariables())
.name(startProcessPayload.getProcessInstanceName())
.name(startProcessPayload.getName())
.start());
}
......@@ -218,8 +218,8 @@ public class ProcessAdminRuntimeImpl implements ProcessAdminRuntime {
public ProcessInstance update(UpdateProcessPayload updateProcessPayload) {
if (updateProcessPayload.getBusinessKey()!=null)
runtimeService.updateBusinessKey(updateProcessPayload.getProcessInstanceId(),updateProcessPayload.getBusinessKey());
if (updateProcessPayload.getProcessInstanceName()!=null)
runtimeService.setProcessInstanceName(updateProcessPayload.getProcessInstanceId(),updateProcessPayload.getProcessInstanceName());
if (updateProcessPayload.getName()!=null)
runtimeService.setProcessInstanceName(updateProcessPayload.getProcessInstanceId(),updateProcessPayload.getName());
return processInstanceConverter.from(runtimeService.createProcessInstanceQuery()
.processInstanceId(updateProcessPayload.getProcessInstanceId()).singleResult());
......
......@@ -231,7 +231,7 @@ public class ProcessRuntimeImpl implements ProcessRuntime {
.processDefinitionKey(startProcessPayload.getProcessDefinitionKey())
.businessKey(startProcessPayload.getBusinessKey())
.variables(startProcessPayload.getVariables())
.name(startProcessPayload.getProcessInstanceName())
.name(startProcessPayload.getName())
.start());
}
......@@ -333,8 +333,8 @@ public class ProcessRuntimeImpl implements ProcessRuntime {
if (updateProcessPayload.getBusinessKey()!=null)
runtimeService.updateBusinessKey(updateProcessPayload.getProcessInstanceId(),updateProcessPayload.getBusinessKey());
if (updateProcessPayload.getProcessInstanceName()!=null)
runtimeService.setProcessInstanceName(updateProcessPayload.getProcessInstanceId(),updateProcessPayload.getProcessInstanceName());
if (updateProcessPayload.getName()!=null)
runtimeService.setProcessInstanceName(updateProcessPayload.getProcessInstanceId(),updateProcessPayload.getName());
ProcessInstance updatedProcessInstance=processInstanceConverter.from(runtimeService.createProcessInstanceQuery()
.processInstanceId(updateProcessPayload.getProcessInstanceId())
......
......@@ -73,7 +73,7 @@ public class ProcessRuntimeImplTest {
UpdateProcessPayload updateProcessPayload = ProcessPayloadBuilder.update()
.withProcessInstanceId("processId")
.withBusinessKey("businessKey")
.withProcessInstanceName("name")
.withName("name")
.build();
ProcessInstanceImpl process = new ProcessInstanceImpl();
......
......@@ -444,7 +444,7 @@ public class ProcessRuntimeTest {
.withVariable("expectedKey",
true)
.withBusinessKey("my business key")
.withProcessInstanceName("my process name")
.withName("my process name")
.build());
assertThat(categorizeProcess).isNotNull();
......@@ -466,7 +466,7 @@ public class ProcessRuntimeTest {
UpdateProcessPayload updateProcessPayload = ProcessPayloadBuilder.update()
.withProcessInstanceId(processInstance.getId())
.withBusinessKey(processInstance.getBusinessKey() + " UPDATED")
.withProcessInstanceName(processInstance.getName() + " UPDATED")
.withName(processInstance.getName() + " UPDATED")
.build();
ProcessInstance updatedProcessInstance = processRuntime.update(updateProcessPayload);
......@@ -513,7 +513,7 @@ public class ProcessRuntimeTest {
.withVariable("expectedKey",
true)
.withBusinessKey("my business key")
.withProcessInstanceName("my process name")
.withName("my process name")
.build());
assertThat(categorizeProcess).isNotNull();
......@@ -530,7 +530,7 @@ public class ProcessRuntimeTest {
UpdateProcessPayload updateProcessPayload = ProcessPayloadBuilder.update()
.withProcessInstanceId(processInstance.getId())
.withBusinessKey(processInstance.getBusinessKey() + " UPDATED")
.withProcessInstanceName(processInstance.getName() + " UPDATED")
.withName(processInstance.getName() + " UPDATED")
.build();
ProcessInstance updatedProcessInstance = processAdminRuntime.update(updateProcessPayload);
......
package org.activiti.spring.conformance.set0;
import static org.activiti.spring.conformance.set0.Set0RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import org.activiti.api.model.shared.event.RuntimeEvent;
import org.activiti.api.process.model.ProcessInstance;
import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
import org.activiti.api.process.model.events.*;
import org.activiti.api.process.model.events.BPMNActivityEvent;
import org.activiti.api.process.model.events.BPMNSequenceFlowTakenEvent;
import org.activiti.api.process.model.events.ProcessRuntimeEvent;
import org.activiti.api.process.runtime.ProcessRuntime;
import org.activiti.api.runtime.shared.NotFoundException;
import org.activiti.spring.conformance.util.security.SecurityUtil;
......@@ -14,10 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import static org.activiti.spring.conformance.set0.Set0RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class ConformanceBasicGenericTaskTest {
......@@ -60,7 +62,7 @@ public class ConformanceBasicGenericTaskTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
package org.activiti.spring.conformance.set0;
import static org.activiti.spring.conformance.set0.Set0RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import org.activiti.api.model.shared.event.RuntimeEvent;
import org.activiti.api.model.shared.event.VariableEvent;
import org.activiti.api.process.model.ProcessInstance;
......@@ -17,10 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import static org.activiti.spring.conformance.set0.Set0RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class ConformanceBasicProcessInformationTest {
......@@ -59,7 +59,7 @@ public class ConformanceBasicProcessInformationTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......@@ -111,7 +111,7 @@ public class ConformanceBasicProcessInformationTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.withVariable("var1", "value1")
.build());
......
......@@ -3,7 +3,7 @@ package org.activiti.spring.conformance.set0;
import static org.activiti.spring.conformance.set0.Set0RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import org.activiti.api.model.shared.event.RuntimeEvent;
import org.activiti.api.process.model.ProcessInstance;
import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
......@@ -46,7 +46,7 @@ public class ProcessInstanceOperationsTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......@@ -91,7 +91,7 @@ public class ProcessInstanceOperationsTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -66,7 +66,7 @@ public class ConformanceServiceTaskModifyVariableTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.withVariable("var1", "value1")
.build());
......
......@@ -65,7 +65,7 @@ public class ConformanceServiceTaskTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey(MY_BUSINESS_KEY)
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
package org.activiti.spring.conformance.set2;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import org.activiti.api.model.shared.event.RuntimeEvent;
import org.activiti.api.process.model.ProcessInstance;
import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
......@@ -8,18 +12,14 @@ import org.activiti.api.process.model.events.BPMNSequenceFlowTakenEvent;
import org.activiti.api.process.model.events.ProcessRuntimeEvent;
import org.activiti.api.process.runtime.ProcessAdminRuntime;
import org.activiti.api.process.runtime.ProcessRuntime;
import org.activiti.api.process.runtime.events.listener.ProcessRuntimeEventListener;
import org.activiti.api.runtime.shared.NotFoundException;
import org.activiti.api.runtime.shared.events.VariableEventListener;
import org.activiti.api.runtime.shared.query.Page;
import org.activiti.api.runtime.shared.query.Pageable;
import org.activiti.api.task.model.Task;
import org.activiti.api.task.model.builders.TaskPayloadBuilder;
import org.activiti.api.task.model.events.TaskRuntimeEvent;
import org.activiti.api.task.runtime.TaskRuntime;
import org.activiti.api.task.runtime.conf.TaskRuntimeConfiguration;
import org.activiti.api.task.runtime.events.listener.TaskRuntimeEventListener;
import org.activiti.engine.ActivitiException;
import org.activiti.spring.conformance.util.security.SecurityUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
......@@ -28,13 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.List;
import org.activiti.spring.conformance.util.security.SecurityUtil;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class UserTaskAssigneeDeleteRuntimeTest {
......@@ -68,7 +61,7 @@ public class UserTaskAssigneeDeleteRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
package org.activiti.spring.conformance.set2;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import java.util.List;
import org.activiti.api.model.shared.event.RuntimeEvent;
import org.activiti.api.process.model.ProcessInstance;
import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
......@@ -26,12 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.List;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class UserTaskAssigneeRuntimeTest {
......@@ -80,7 +80,7 @@ public class UserTaskAssigneeRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
package org.activiti.spring.conformance.set2;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import org.activiti.api.model.shared.event.RuntimeEvent;
import org.activiti.api.process.model.ProcessInstance;
import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
......@@ -23,10 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class UserTaskCandidateDeleteRuntimeTest {
......@@ -60,7 +60,7 @@ public class UserTaskCandidateDeleteRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -61,7 +61,7 @@ public class UserTaskCandidateGroupRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......@@ -175,7 +175,7 @@ public class UserTaskCandidateGroupRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -61,7 +61,7 @@ public class UserTaskCandidateUserRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......@@ -167,7 +167,7 @@ public class UserTaskCandidateUserRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
package org.activiti.spring.conformance.set2;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
import org.activiti.api.process.model.ProcessInstance;
import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
import org.activiti.api.process.runtime.ProcessAdminRuntime;
......@@ -18,9 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import static org.activiti.spring.conformance.set2.Set2RuntimeTestConfiguration.collectedEvents;
import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
public class UserTaskNoCandidateRuntimeTest {
......@@ -57,7 +57,7 @@ public class UserTaskNoCandidateRuntimeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -61,7 +61,7 @@ public class UserTaskCandidateGroupAndAssigneeTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -61,7 +61,7 @@ public class UserTaskCandidateGroupsTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -63,7 +63,7 @@ public class UserTaskCandidateVisibilityTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......@@ -175,7 +175,7 @@ public class UserTaskCandidateVisibilityTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -62,7 +62,7 @@ public class BasicExclusiveGatewayErrorTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -59,7 +59,7 @@ public class BasicExclusiveGatewayTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -59,7 +59,7 @@ public class BasicParallelGatewayGroupAssignmentsTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -59,7 +59,7 @@ public class BasicParallelGatewayTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -59,7 +59,7 @@ public class BasicCallActivityAndServiceTaskTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -59,7 +59,7 @@ public class BasicCallActivityTest {
.start()
.withProcessDefinitionKey(processKey)
.withBusinessKey("my-business-key")
.withProcessInstanceName("my-process-instance-name")
.withName("my-process-instance-name")
.build());
//then
......
......@@ -17,8 +17,8 @@
<url>http://activiti.org</url>
<properties>
<activiti-build.version>7.0.56</activiti-build.version>
<activiti-api.version>7.0.82</activiti-api.version>
<activiti-core-common.version>7.0.44</activiti-core-common.version>
<activiti-api.version>7.0.83</activiti-api.version>
<activiti-core-common.version>7.0.45</activiti-core-common.version>
<activiti.version>${project.version}</activiti.version>
<batik.version>1.10</batik.version>
<commons-email.version>1.5</commons-email.version>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册