提交 47bac4ff 编写于 作者: T Tijs Rademakers

Increased DB id size + added REST API create process instance response test

上级 36f44575
...@@ -96,7 +96,7 @@ public abstract class ProcessEngineConfiguration implements EngineServices { ...@@ -96,7 +96,7 @@ public abstract class ProcessEngineConfiguration implements EngineServices {
public static final String NO_TENANT_ID = ""; public static final String NO_TENANT_ID = "";
protected String processEngineName = ProcessEngines.NAME_DEFAULT; protected String processEngineName = ProcessEngines.NAME_DEFAULT;
protected int idBlockSize = 100; protected int idBlockSize = 2500;
protected String history = HistoryLevel.AUDIT.getKey(); protected String history = HistoryLevel.AUDIT.getKey();
protected boolean jobExecutorActivate; protected boolean jobExecutorActivate;
......
...@@ -59,10 +59,10 @@ import org.activiti.rest.service.api.engine.variable.IntegerRestVariableConverte ...@@ -59,10 +59,10 @@ import org.activiti.rest.service.api.engine.variable.IntegerRestVariableConverte
import org.activiti.rest.service.api.engine.variable.LongRestVariableConverter; import org.activiti.rest.service.api.engine.variable.LongRestVariableConverter;
import org.activiti.rest.service.api.engine.variable.QueryVariable; import org.activiti.rest.service.api.engine.variable.QueryVariable;
import org.activiti.rest.service.api.engine.variable.RestVariable; import org.activiti.rest.service.api.engine.variable.RestVariable;
import org.activiti.rest.service.api.engine.variable.RestVariable.RestVariableScope;
import org.activiti.rest.service.api.engine.variable.RestVariableConverter; import org.activiti.rest.service.api.engine.variable.RestVariableConverter;
import org.activiti.rest.service.api.engine.variable.ShortRestVariableConverter; import org.activiti.rest.service.api.engine.variable.ShortRestVariableConverter;
import org.activiti.rest.service.api.engine.variable.StringRestVariableConverter; import org.activiti.rest.service.api.engine.variable.StringRestVariableConverter;
import org.activiti.rest.service.api.engine.variable.RestVariable.RestVariableScope;
import org.activiti.rest.service.api.form.FormDataResponse; import org.activiti.rest.service.api.form.FormDataResponse;
import org.activiti.rest.service.api.form.RestEnumFormProperty; import org.activiti.rest.service.api.form.RestEnumFormProperty;
import org.activiti.rest.service.api.form.RestFormProperty; import org.activiti.rest.service.api.form.RestFormProperty;
...@@ -79,10 +79,10 @@ import org.activiti.rest.service.api.identity.UserResponse; ...@@ -79,10 +79,10 @@ import org.activiti.rest.service.api.identity.UserResponse;
import org.activiti.rest.service.api.management.JobResponse; import org.activiti.rest.service.api.management.JobResponse;
import org.activiti.rest.service.api.management.TableResponse; import org.activiti.rest.service.api.management.TableResponse;
import org.activiti.rest.service.api.repository.DeploymentResourceResponse; import org.activiti.rest.service.api.repository.DeploymentResourceResponse;
import org.activiti.rest.service.api.repository.DeploymentResourceResponse.DeploymentResourceType;
import org.activiti.rest.service.api.repository.DeploymentResponse; import org.activiti.rest.service.api.repository.DeploymentResponse;
import org.activiti.rest.service.api.repository.ModelResponse; import org.activiti.rest.service.api.repository.ModelResponse;
import org.activiti.rest.service.api.repository.ProcessDefinitionResponse; import org.activiti.rest.service.api.repository.ProcessDefinitionResponse;
import org.activiti.rest.service.api.repository.DeploymentResourceResponse.DeploymentResourceType;
import org.activiti.rest.service.api.runtime.process.ExecutionResponse; import org.activiti.rest.service.api.runtime.process.ExecutionResponse;
import org.activiti.rest.service.api.runtime.process.ProcessInstanceResponse; import org.activiti.rest.service.api.runtime.process.ProcessInstanceResponse;
import org.activiti.rest.service.api.runtime.task.TaskResponse; import org.activiti.rest.service.api.runtime.task.TaskResponse;
...@@ -430,6 +430,7 @@ public class RestResponseFactory { ...@@ -430,6 +430,7 @@ public class RestResponseFactory {
result.setId(processInstance.getId()); result.setId(processInstance.getId());
result.setProcessDefinitionId(processInstance.getProcessDefinitionId()); result.setProcessDefinitionId(processInstance.getProcessDefinitionId());
result.setProcessDefinitionUrl(securedResource.createFullResourceUrl(RestUrls.URL_PROCESS_DEFINITION, processInstance.getProcessDefinitionId())); result.setProcessDefinitionUrl(securedResource.createFullResourceUrl(RestUrls.URL_PROCESS_DEFINITION, processInstance.getProcessDefinitionId()));
result.setEnded(processInstance.isEnded());
result.setSuspended(processInstance.isSuspended()); result.setSuspended(processInstance.isSuspended());
result.setUrl(securedResource.createFullResourceUrl(RestUrls.URL_PROCESS_INSTANCE, processInstance.getId())); result.setUrl(securedResource.createFullResourceUrl(RestUrls.URL_PROCESS_INSTANCE, processInstance.getId()));
result.setTenantId(processInstance.getTenantId()); result.setTenantId(processInstance.getTenantId());
......
...@@ -87,7 +87,7 @@ public class ProcessInstanceResource extends SecuredResource { ...@@ -87,7 +87,7 @@ public class ProcessInstanceResource extends SecuredResource {
} }
ActivitiUtil.getRuntimeService().suspendProcessInstanceById(processInstance.getId()); ActivitiUtil.getRuntimeService().suspendProcessInstanceById(processInstance.getId());
ProcessInstanceResponse response = getApplication(ActivitiRestServicesApplication.class).getRestResponseFactory() ProcessInstanceResponse response = getApplication(ActivitiRestServicesApplication.class).getRestResponseFactory()
.createProcessInstanceResponse(this, processInstance); .createProcessInstanceResponse(this, processInstance);
// No need to re-fetch the instance, just alter the suspended state of the result-object // No need to re-fetch the instance, just alter the suspended state of the result-object
......
...@@ -26,6 +26,7 @@ public class ProcessInstanceResponse { ...@@ -26,6 +26,7 @@ public class ProcessInstanceResponse {
protected String url; protected String url;
protected String businessKey; protected String businessKey;
protected boolean suspended; protected boolean suspended;
protected boolean ended;
protected String processDefinitionId; protected String processDefinitionId;
protected String processDefinitionUrl; protected String processDefinitionUrl;
protected String activityId; protected String activityId;
...@@ -64,6 +65,14 @@ public class ProcessInstanceResponse { ...@@ -64,6 +65,14 @@ public class ProcessInstanceResponse {
this.suspended = suspended; this.suspended = suspended;
} }
public boolean isEnded() {
return ended;
}
public void setEnded(boolean ended) {
this.ended = ended;
}
public String getProcessDefinitionId() { public String getProcessDefinitionId() {
return processDefinitionId; return processDefinitionId;
} }
......
...@@ -298,6 +298,11 @@ public class ProcessInstanceCollectionResourceTest extends BaseRestTestCase { ...@@ -298,6 +298,11 @@ public class ProcessInstanceCollectionResourceTest extends BaseRestTestCase {
client.post(requestNode); client.post(requestNode);
assertEquals(Status.SUCCESS_CREATED, client.getResponse().getStatus()); assertEquals(Status.SUCCESS_CREATED, client.getResponse().getStatus());
JsonNode responseNode = objectMapper.readTree(client.getResponseEntity().getStream());
assertEquals("processTask", responseNode.get("activityId").asText());
assertEquals(false, responseNode.get("ended").asBoolean());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().singleResult(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().singleResult();
assertNotNull(processInstance); assertNotNull(processInstance);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册