From 47bac4ff42e482209290e98bb32a3b621c3ac531 Mon Sep 17 00:00:00 2001 From: Tijs Rademakers Date: Mon, 7 Apr 2014 11:23:33 +0200 Subject: [PATCH] Increased DB id size + added REST API create process instance response test --- .../org/activiti/engine/ProcessEngineConfiguration.java | 2 +- .../activiti/rest/service/api/RestResponseFactory.java | 5 +++-- .../api/runtime/process/ProcessInstanceResource.java | 2 +- .../api/runtime/process/ProcessInstanceResponse.java | 9 +++++++++ .../runtime/ProcessInstanceCollectionResourceTest.java | 5 +++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineConfiguration.java b/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineConfiguration.java index c4cc510835..787f3f6390 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineConfiguration.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineConfiguration.java @@ -96,7 +96,7 @@ public abstract class ProcessEngineConfiguration implements EngineServices { public static final String NO_TENANT_ID = ""; protected String processEngineName = ProcessEngines.NAME_DEFAULT; - protected int idBlockSize = 100; + protected int idBlockSize = 2500; protected String history = HistoryLevel.AUDIT.getKey(); protected boolean jobExecutorActivate; diff --git a/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestResponseFactory.java b/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestResponseFactory.java index 7c7488dfd9..023b457b05 100644 --- a/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestResponseFactory.java +++ b/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestResponseFactory.java @@ -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.QueryVariable; 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.ShortRestVariableConverter; 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.RestEnumFormProperty; import org.activiti.rest.service.api.form.RestFormProperty; @@ -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.TableResponse; 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.ModelResponse; 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.ProcessInstanceResponse; import org.activiti.rest.service.api.runtime.task.TaskResponse; @@ -430,6 +430,7 @@ public class RestResponseFactory { result.setId(processInstance.getId()); result.setProcessDefinitionId(processInstance.getProcessDefinitionId()); result.setProcessDefinitionUrl(securedResource.createFullResourceUrl(RestUrls.URL_PROCESS_DEFINITION, processInstance.getProcessDefinitionId())); + result.setEnded(processInstance.isEnded()); result.setSuspended(processInstance.isSuspended()); result.setUrl(securedResource.createFullResourceUrl(RestUrls.URL_PROCESS_INSTANCE, processInstance.getId())); result.setTenantId(processInstance.getTenantId()); diff --git a/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResource.java b/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResource.java index 7e9516d11e..fba6363353 100644 --- a/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResource.java +++ b/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResource.java @@ -87,7 +87,7 @@ public class ProcessInstanceResource extends SecuredResource { } ActivitiUtil.getRuntimeService().suspendProcessInstanceById(processInstance.getId()); - ProcessInstanceResponse response = getApplication(ActivitiRestServicesApplication.class).getRestResponseFactory() + ProcessInstanceResponse response = getApplication(ActivitiRestServicesApplication.class).getRestResponseFactory() .createProcessInstanceResponse(this, processInstance); // No need to re-fetch the instance, just alter the suspended state of the result-object diff --git a/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResponse.java b/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResponse.java index 843522da97..7dc13bc5a4 100644 --- a/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResponse.java +++ b/modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResponse.java @@ -26,6 +26,7 @@ public class ProcessInstanceResponse { protected String url; protected String businessKey; protected boolean suspended; + protected boolean ended; protected String processDefinitionId; protected String processDefinitionUrl; protected String activityId; @@ -64,6 +65,14 @@ public class ProcessInstanceResponse { this.suspended = suspended; } + public boolean isEnded() { + return ended; + } + + public void setEnded(boolean ended) { + this.ended = ended; + } + public String getProcessDefinitionId() { return processDefinitionId; } diff --git a/modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java b/modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java index bd3a08a08e..a769ac57d5 100644 --- a/modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java +++ b/modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java @@ -298,6 +298,11 @@ public class ProcessInstanceCollectionResourceTest extends BaseRestTestCase { client.post(requestNode); 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(); assertNotNull(processInstance); -- GitLab