From 1c88782ccb3664a88d691f8e3a54fa3870d80850 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 24 Sep 2024 16:35:34 -0400 Subject: [PATCH 1/2] fix int/long data types --- .../activiti/api/AppDeploymentsApi.java | 2 +- .../activiti/api/ProcessDefinitionsApi.java | 2 +- .../activiti/model/AppDefinition.java | 24 +-- .../model/AppDefinitionRepresentation.java | 195 +----------------- .../alfresco/activiti/model/Task.java | 16 +- 5 files changed, 23 insertions(+), 216 deletions(-) diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java index f5f616f..2340ad6 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java @@ -51,7 +51,7 @@ public interface AppDeploymentsApi { @Produces({ MediaType.APPLICATION_JSON }) ResultListDataRepresentation query( @QueryParam("nameLike") String nameLike, - @QueryParam("tenantId") Integer tenantId, + @QueryParam("tenantId") Long tenantId, @QueryParam("latest") Boolean latest, @QueryParam("start") Integer start, @QueryParam("sort") String sort, diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java index 26da6f4..196fac2 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java @@ -29,7 +29,7 @@ public interface ProcessDefinitionsApi { @Produces({ "application/json" }) ResultListDataRepresentation get( @QueryParam("latest") Boolean latest, - @QueryParam("appDefinitionId") Integer appDefinitionId, + @QueryParam("appDefinitionId") Long appDefinitionId, @QueryParam("deploymentId") String deploymentId); } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java index 5dcaf73..f27042c 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinition.java @@ -40,13 +40,13 @@ public class AppDefinition { @JsonProperty("icon") private String icon; @JsonProperty("id") - private Integer id; + private Long id; @JsonProperty("modelId") - private Integer modelId; + private Long modelId; @JsonProperty("name") private String name; @JsonProperty("tenantId") - private Integer tenantId; + private Long tenantId; @JsonProperty("theme") private String theme; @JsonIgnore @@ -113,31 +113,31 @@ public class AppDefinition { } @JsonProperty("id") - public Integer getId() { + public Long getId() { return id; } @JsonProperty("id") - public void setId(Integer id) { + public void setId(Long id) { this.id = id; } - public AppDefinition withId(Integer id) { + public AppDefinition withId(Long id) { this.id = id; return this; } @JsonProperty("modelId") - public Integer getModelId() { + public Long getModelId() { return modelId; } @JsonProperty("modelId") - public void setModelId(Integer modelId) { + public void setModelId(Long modelId) { this.modelId = modelId; } - public AppDefinition withModelId(Integer modelId) { + public AppDefinition withModelId(Long modelId) { this.modelId = modelId; return this; } @@ -158,16 +158,16 @@ public class AppDefinition { } @JsonProperty("tenantId") - public Integer getTenantId() { + public Long getTenantId() { return tenantId; } @JsonProperty("tenantId") - public void setTenantId(Integer tenantId) { + public void setTenantId(Long tenantId) { this.tenantId = tenantId; } - public AppDefinition withTenantId(Integer tenantId) { + public AppDefinition withTenantId(Long tenantId) { this.tenantId = tenantId; return this; } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java index a7175ec..09afeaa 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/AppDefinitionRepresentation.java @@ -1,205 +1,12 @@ package com.inteligr8.alfresco.activiti.model; -import java.util.HashMap; -import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - - /** * AppDefinitionRepresentation *

* * */ -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "defaultAppId", - "deploymentId", - "description", - "icon", - "id", - "modelId", - "name", - "tenantId", - "theme" -}) -public class AppDefinitionRepresentation { - - @JsonProperty("defaultAppId") - private String defaultAppId; - @JsonProperty("deploymentId") - private String deploymentId; - @JsonProperty("description") - private String description; - @JsonProperty("icon") - private String icon; - @JsonProperty("id") - private Integer id; - @JsonProperty("modelId") - private Integer modelId; - @JsonProperty("name") - private String name; - @JsonProperty("tenantId") - private Integer tenantId; - @JsonProperty("theme") - private String theme; - @JsonIgnore - private Map additionalProperties = new HashMap(); - - @JsonProperty("defaultAppId") - public String getDefaultAppId() { - return defaultAppId; - } - - @JsonProperty("defaultAppId") - public void setDefaultAppId(String defaultAppId) { - this.defaultAppId = defaultAppId; - } - - public AppDefinitionRepresentation withDefaultAppId(String defaultAppId) { - this.defaultAppId = defaultAppId; - return this; - } - - @JsonProperty("deploymentId") - public String getDeploymentId() { - return deploymentId; - } - - @JsonProperty("deploymentId") - public void setDeploymentId(String deploymentId) { - this.deploymentId = deploymentId; - } - - public AppDefinitionRepresentation withDeploymentId(String deploymentId) { - this.deploymentId = deploymentId; - return this; - } - - @JsonProperty("description") - public String getDescription() { - return description; - } - - @JsonProperty("description") - public void setDescription(String description) { - this.description = description; - } - - public AppDefinitionRepresentation withDescription(String description) { - this.description = description; - return this; - } - - @JsonProperty("icon") - public String getIcon() { - return icon; - } - - @JsonProperty("icon") - public void setIcon(String icon) { - this.icon = icon; - } - - public AppDefinitionRepresentation withIcon(String icon) { - this.icon = icon; - return this; - } - - @JsonProperty("id") - public Integer getId() { - return id; - } - - @JsonProperty("id") - public void setId(Integer id) { - this.id = id; - } - - public AppDefinitionRepresentation withId(Integer id) { - this.id = id; - return this; - } - - @JsonProperty("modelId") - public Integer getModelId() { - return modelId; - } - - @JsonProperty("modelId") - public void setModelId(Integer modelId) { - this.modelId = modelId; - } - - public AppDefinitionRepresentation withModelId(Integer modelId) { - this.modelId = modelId; - return this; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - public AppDefinitionRepresentation withName(String name) { - this.name = name; - return this; - } - - @JsonProperty("tenantId") - public Integer getTenantId() { - return tenantId; - } - - @JsonProperty("tenantId") - public void setTenantId(Integer tenantId) { - this.tenantId = tenantId; - } - - public AppDefinitionRepresentation withTenantId(Integer tenantId) { - this.tenantId = tenantId; - return this; - } - - @JsonProperty("theme") - public String getTheme() { - return theme; - } - - @JsonProperty("theme") - public void setTheme(String theme) { - this.theme = theme; - } - - public AppDefinitionRepresentation withTheme(String theme) { - this.theme = theme; - return this; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public AppDefinitionRepresentation withAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - return this; - } +public class AppDefinitionRepresentation extends AppDefinition { } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java b/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java index 010fef6..844f3b8 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java @@ -91,7 +91,7 @@ public class Task extends Datum { @JsonProperty("parentTaskName") private String parentTaskName; @JsonProperty("priority") - private Long priority; + private Integer priority; @JsonProperty("processDefinitionCategory") private String processDefinitionCategory; @JsonProperty("processDefinitionDeploymentId") @@ -105,7 +105,7 @@ public class Task extends Datum { @JsonProperty("processDefinitionName") private String processDefinitionName; @JsonProperty("processDefinitionVersion") - private Long processDefinitionVersion; + private Integer processDefinitionVersion; @JsonProperty("processInstanceId") private String processInstanceId; @JsonProperty("processInstanceName") @@ -370,15 +370,15 @@ public class Task extends Datum { return this; } - public Long getPriority() { + public Integer getPriority() { return priority; } - public void setPriority(Long priority) { + public void setPriority(Integer priority) { this.priority = priority; } - public Task withPriority(Long priority) { + public Task withPriority(Integer priority) { this.priority = priority; return this; } @@ -461,15 +461,15 @@ public class Task extends Datum { return this; } - public Long getProcessDefinitionVersion() { + public Integer getProcessDefinitionVersion() { return processDefinitionVersion; } - public void setProcessDefinitionVersion(Long processDefinitionVersion) { + public void setProcessDefinitionVersion(Integer processDefinitionVersion) { this.processDefinitionVersion = processDefinitionVersion; } - public Task withProcessDefinitionVersion(Long processDefinitionVersion) { + public Task withProcessDefinitionVersion(Integer processDefinitionVersion) { this.processDefinitionVersion = processDefinitionVersion; return this; } From 3e0a6d776706364caa1adf7794b1efe1ee392a17 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 24 Sep 2024 17:18:18 -0400 Subject: [PATCH 2/2] remove default impls in jaxrs interfaces --- .../inteligr8/activiti/api/BaseJobsApi.java | 22 +-- .../inteligr8/activiti/api/ExecutionApi.java | 137 +++++------------- .../activiti/api/ProcessDefinitionApi.java | 63 -------- .../activiti/api/ProcessInstanceApi.java | 130 ++++++----------- .../alfresco/activiti/api/TemplatesApi.java | 7 +- 5 files changed, 88 insertions(+), 271 deletions(-) diff --git a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java index 956a245..990543a 100644 --- a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java +++ b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java @@ -17,6 +17,11 @@ package com.inteligr8.activiti.api; import java.io.File; import java.time.LocalDate; +import com.inteligr8.activiti.model.Job; +import com.inteligr8.activiti.model.ProcessInstanceAction; +import com.inteligr8.activiti.model.ResultList; +import com.inteligr8.activiti.model.SortOrder; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -27,12 +32,6 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import com.inteligr8.activiti.model.ProcessInstanceAction; -import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue; -import com.inteligr8.activiti.model.Job; -import com.inteligr8.activiti.model.ResultList; -import com.inteligr8.activiti.model.SortOrder; - public interface BaseJobsApi { @GET @@ -53,17 +52,6 @@ public interface BaseJobsApi { @PathParam("jobId") String jobId, ProcessInstanceAction execute); - default void executeJob( - String jobId, - ActionValue action) { - this.executeJob(jobId, new ProcessInstanceAction(action)); - } - - default void executeJob( - String jobId) { - this.executeJob(jobId, new ProcessInstanceAction(ActionValue.Execute)); - } - @GET @Path("{jobId}/execution-stacktrace") @Produces({ MediaType.APPLICATION_OCTET_STREAM }) diff --git a/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java b/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java index 3047ded..6e87c56 100644 --- a/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java @@ -16,6 +16,13 @@ package com.inteligr8.activiti.api; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.inteligr8.activiti.model.Execution; +import com.inteligr8.activiti.model.ProcessInstanceAction; +import com.inteligr8.activiti.model.ResultList; +import com.inteligr8.activiti.model.SortOrder; +import com.inteligr8.activiti.model.Variable; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -26,15 +33,6 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.inteligr8.activiti.model.ProcessInstanceAction; -import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue; -import com.inteligr8.activiti.model.Execution; -import com.inteligr8.activiti.model.ResultList; -import com.inteligr8.activiti.model.SignalEventAction; -import com.inteligr8.activiti.model.SortOrder; -import com.inteligr8.activiti.model.Variable; - @Path("/api/runtime/executions") public interface ExecutionApi { @@ -68,35 +66,6 @@ public interface ExecutionApi { List getActiveActivities( @PathParam("executionId") String executionId); - default Execution signal( - String processInstanceId, - List variables) { - ProcessInstanceAction action = new ProcessInstanceAction(ActionValue.Signal); - if (variables != null && !variables.isEmpty()) - action.setVariables(variables); - return this.execute(processInstanceId, action); - } - - default Execution signalReceived( - String processInstanceId, - String signal, - List variables) { - ProcessInstanceAction action = new SignalEventAction(ActionValue.SignalReceived, signal); - if (variables != null && !variables.isEmpty()) - action.setVariables(variables); - return this.execute(processInstanceId, action); - } - - default Execution messageReceived( - String processInstanceId, - String message, - List variables) { - ProcessInstanceAction action = new SignalEventAction(ActionValue.MessageReceived, message); - if (variables != null && !variables.isEmpty()) - action.setVariables(variables); - return this.execute(processInstanceId, action); - } - @PUT @Path("{executionId}") @Consumes({ MediaType.APPLICATION_JSON }) @@ -105,61 +74,39 @@ public interface ExecutionApi { @PathParam("executionId") String executionId, ProcessInstanceAction action); - default ResultList getWithoutTenant( - String executionId, - String activityId, - String processDefinitionKey, - String processDefinitionId, - String processInstanceId, - String messageEventSubscriptionName, - String signalEventSubscriptionName, - String parentId, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId, - messageEventSubscriptionName, signalEventSubscriptionName, parentId, null, null, true, - sort, sortOrder, pageStart, pageSize); - } + @GET + @Produces({ MediaType.APPLICATION_JSON }) + ResultList getByTenant( + @QueryParam("id") String executionId, + @QueryParam("activityId") String activityId, + @QueryParam("processDefinitionKey") String processDefinitionKey, + @QueryParam("processDefinitionId") String processDefinitionId, + @QueryParam("processInstanceId") String processInstanceId, + @QueryParam("messageEventSubscriptionName") String messageEventSubscriptionName, + @QueryParam("signalEventSubscriptionName") String signalEventSubscriptionName, + @QueryParam("parentId") String parentId, + @QueryParam("tenantId") String tenantId, + @QueryParam("sort") Sort sort, + @QueryParam("order") SortOrder sortOrder, + @QueryParam("start") Integer pageStart, + @QueryParam("size") Integer pageSize); - default ResultList getByTenant( - String executionId, - String activityId, - String processDefinitionKey, - String processDefinitionId, - String processInstanceId, - String messageEventSubscriptionName, - String signalEventSubscriptionName, - String parentId, - String tenantId, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId, - messageEventSubscriptionName, signalEventSubscriptionName, parentId, tenantId, null, false, - sort, sortOrder, pageStart, pageSize); - } - - default ResultList getByTenants( - String executionId, - String activityId, - String processDefinitionKey, - String processDefinitionId, - String processInstanceId, - String messageEventSubscriptionName, - String signalEventSubscriptionName, - String parentId, - String tenantIdLike, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(executionId, activityId, processDefinitionKey, processDefinitionId, processInstanceId, - messageEventSubscriptionName, signalEventSubscriptionName, parentId, null, tenantIdLike, false, - sort, sortOrder, pageStart, pageSize); - } + @GET + @Produces({ MediaType.APPLICATION_JSON }) + ResultList getByTenants( + @QueryParam("id") String executionId, + @QueryParam("activityId") String activityId, + @QueryParam("processDefinitionKey") String processDefinitionKey, + @QueryParam("processDefinitionId") String processDefinitionId, + @QueryParam("processInstanceId") String processInstanceId, + @QueryParam("messageEventSubscriptionName") String messageEventSubscriptionName, + @QueryParam("signalEventSubscriptionName") String signalEventSubscriptionName, + @QueryParam("parentId") String parentId, + @QueryParam("tenantIdLike") String tenantIdLike, + @QueryParam("sort") Sort sort, + @QueryParam("order") SortOrder sortOrder, + @QueryParam("start") Integer pageStart, + @QueryParam("size") Integer pageSize); @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -207,12 +154,6 @@ public interface ExecutionApi { void updateVariables( @PathParam("executionId") String executionId, List variables); - - default void updateVariable( - String executionId, - Variable variable) { - this.updateVariable(executionId, variable.getName(), variable); - } @PUT @Path("{executionId}/variables/{variableName}") diff --git a/src/main/java/com/inteligr8/activiti/api/ProcessDefinitionApi.java b/src/main/java/com/inteligr8/activiti/api/ProcessDefinitionApi.java index f331e2f..4a5435e 100644 --- a/src/main/java/com/inteligr8/activiti/api/ProcessDefinitionApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ProcessDefinitionApi.java @@ -19,7 +19,6 @@ import com.inteligr8.activiti.model.ProcessDefinition; import com.inteligr8.activiti.model.ProcessDefinitionAction; import com.inteligr8.activiti.model.ResultList; import com.inteligr8.activiti.model.SortOrder; -import com.inteligr8.activiti.model.ProcessDefinitionAction.ActionValue; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -39,16 +38,6 @@ public interface ProcessDefinitionApi { ProcessDefinition get( @PathParam("processDefinitionId") String processDefinitionId); - default void activate( - String processDefinitionId) { - this.act(processDefinitionId, new ProcessDefinitionAction(ActionValue.Activate)); - } - - default void suspend( - String processDefinitionId) { - this.act(processDefinitionId, new ProcessDefinitionAction(ActionValue.Suspend)); - } - @PUT @Path("{processDefinitionId}") @Consumes({ MediaType.APPLICATION_JSON }) @@ -56,58 +45,6 @@ public interface ProcessDefinitionApi { @PathParam("processDefinitionId") String processDefinitionId, ProcessDefinitionAction action); - default ResultList getByTenant( - String category, - String categoryLike, - String categoryNotEquals, - String key, - String keyLike, - String name, - String nameLike, - String resourceName, - String resourceNameLike, - String version, - Boolean suspended, - boolean latest, - String deploymentId, - String startableByUser, - String tenantId, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(category, categoryLike, categoryNotEquals, key, keyLike, - name, nameLike, resourceName, resourceNameLike, version, - suspended, latest, deploymentId, startableByUser, - tenantId, null, sort, sortOrder, pageStart, pageSize); - } - - default ResultList getByTenants( - String category, - String categoryLike, - String categoryNotEquals, - String key, - String keyLike, - String name, - String nameLike, - String resourceName, - String resourceNameLike, - String version, - Boolean suspended, - boolean latest, - String deploymentId, - String startableByUser, - String tenantIdLike, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(category, categoryLike, categoryNotEquals, key, keyLike, - name, nameLike, resourceName, resourceNameLike, version, - suspended, latest, deploymentId, startableByUser, - null, tenantIdLike, sort, sortOrder, pageStart, pageSize); - } - @GET @Produces({ MediaType.APPLICATION_JSON }) public ResultList getByAny( diff --git a/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java b/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java index be69db3..83b31fc 100644 --- a/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java @@ -17,6 +17,13 @@ package com.inteligr8.activiti.api; import java.io.File; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.inteligr8.activiti.model.ProcessInstanceAction; +import com.inteligr8.activiti.model.ResultList; +import com.inteligr8.activiti.model.SortOrder; +import com.inteligr8.activiti.model.Variable; +import com.inteligr8.alfresco.activiti.model.ProcessInstance; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -28,14 +35,6 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.inteligr8.activiti.model.ProcessInstanceAction; -import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue; -import com.inteligr8.activiti.model.ResultList; -import com.inteligr8.activiti.model.SortOrder; -import com.inteligr8.activiti.model.Variable; -import com.inteligr8.alfresco.activiti.model.ProcessInstance; - @Path("/api/runtime/process-instances") public interface ProcessInstanceApi { @@ -61,16 +60,6 @@ public interface ProcessInstanceApi { void delete( @PathParam("processInstanceId") String processInstanceId); - default void activate( - String processInstanceId) { - this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Activate)); - } - - default void suspend( - String processInstanceId) { - this.act(processInstanceId, new ProcessInstanceAction(ActionValue.Suspend)); - } - @PUT @Path("{processInstanceId}") @Consumes({ MediaType.APPLICATION_JSON }) @@ -78,70 +67,43 @@ public interface ProcessInstanceApi { @PathParam("processInstanceId") String processInstanceId, ProcessInstanceAction action); - default ResultList getWithoutTenant( - String processInstanceId, - String processDefinitionKey, - String processDefinitionId, - String businessKey, - String involvedUser, - Boolean suspended, - String superProcessInstanceId, - String subProcessInstanceId, - Boolean excludeSubprocesses, - Boolean includeProcessVariables, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId, - businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId, - excludeSubprocesses, includeProcessVariables, null, null, true, - sort, sortOrder, pageStart, pageSize); - } + @GET + @Produces({ MediaType.APPLICATION_JSON }) + public ResultList getByTenant( + @QueryParam("id") String processInstanceId, + @QueryParam("processDefinitionKey") String processDefinitionKey, + @QueryParam("processDefinitionId") String processDefinitionId, + @QueryParam("businessKey") String businessKey, + @QueryParam("involvedUser") String involvedUser, + @QueryParam("suspended") Boolean suspended, + @QueryParam("superProcessInstanceId") String superProcessInstanceId, + @QueryParam("subProcessInstanceId") String subProcessInstanceId, + @QueryParam("excludeSubprocesses") Boolean excludeSubprocesses, + @QueryParam("includeProcessVariables") Boolean includeProcessVariables, + @QueryParam("tenantId") String tenantId, + @QueryParam("sort") Sort sort, + @QueryParam("order") SortOrder sortOrder, + @QueryParam("start") Integer pageStart, + @QueryParam("size") Integer pageSize); - default ResultList getByTenant( - String processInstanceId, - String processDefinitionKey, - String processDefinitionId, - String businessKey, - String involvedUser, - Boolean suspended, - String superProcessInstanceId, - String subProcessInstanceId, - Boolean excludeSubprocesses, - Boolean includeProcessVariables, - String tenantId, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId, - businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId, - excludeSubprocesses, includeProcessVariables, tenantId, null, false, - sort, sortOrder, pageStart, pageSize); - } - - default ResultList getByTenants( - String processInstanceId, - String processDefinitionKey, - String processDefinitionId, - String businessKey, - String involvedUser, - Boolean suspended, - String superProcessInstanceId, - String subProcessInstanceId, - Boolean excludeSubprocesses, - Boolean includeProcessVariables, - String tenantIdLike, - Sort sort, - SortOrder sortOrder, - Integer pageStart, - Integer pageSize) { - return this.getByAny(processInstanceId, processDefinitionKey, processDefinitionId, - businessKey, involvedUser, suspended, superProcessInstanceId, subProcessInstanceId, - excludeSubprocesses, includeProcessVariables, null, tenantIdLike, false, - sort, sortOrder, pageStart, pageSize); - } + @GET + @Produces({ MediaType.APPLICATION_JSON }) + public ResultList getByTenants( + @QueryParam("id") String processInstanceId, + @QueryParam("processDefinitionKey") String processDefinitionKey, + @QueryParam("processDefinitionId") String processDefinitionId, + @QueryParam("businessKey") String businessKey, + @QueryParam("involvedUser") String involvedUser, + @QueryParam("suspended") Boolean suspended, + @QueryParam("superProcessInstanceId") String superProcessInstanceId, + @QueryParam("subProcessInstanceId") String subProcessInstanceId, + @QueryParam("excludeSubprocesses") Boolean excludeSubprocesses, + @QueryParam("includeProcessVariables") Boolean includeProcessVariables, + @QueryParam("tenantIdLike") String tenantIdLike, + @QueryParam("sort") Sort sort, + @QueryParam("order") SortOrder sortOrder, + @QueryParam("start") Integer pageStart, + @QueryParam("size") Integer pageSize); @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -196,12 +158,6 @@ public interface ProcessInstanceApi { void updateVariables( @PathParam("processInstanceId") String processInstanceId, List variables); - - default void updateVariable( - String processInstanceId, - Variable variable) { - this.updateVariable(processInstanceId, variable.getName(), variable); - } @PUT @Path("{processInstanceId}/variables/{variableName}") diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java index 3ab9932..22317bb 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java @@ -138,11 +138,6 @@ public interface TemplatesApi { @QueryParam("sort") TemplateSort sort, @QueryParam("tenantId") Long tenantId); - default Response getDocumentTemplate( - DocumentTemplateLight template) { - return this.getDocumentTemplate(template.getId(), System.currentTimeMillis()); - } - @GET @Path("document-templates/{templateId}") @Produces({ MediaType.APPLICATION_JSON }) @@ -158,7 +153,7 @@ public interface TemplatesApi { }) public Response getDocumentTemplate( @PathParam("templateId") long id, - @QueryParam("version") long version); + @QueryParam("version") Long version); @DELETE @Path("document-templates/{templateId}")