inteligr8/aps-public-rest-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-aps1

Browse Source
This commit is contained in:
Brian Long 2023-01-19 17:00:50 -05:00
commit 9f6d6661e2
4 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/inteligr8/alfresco/activiti/api/HistoricProcessInstancesApi.java
View File

@ -27,6 +27,7 @@ import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
public interface HistoricProcessInstancesApi { public interface HistoricProcessInstancesApi {
@POST @POST
@Path("query")
@Consumes({ "application/json" }) @Consumes({ "application/json" })
@Produces({ "application/json" }) @Produces({ "application/json" })
ResultListDataRepresentation<ProcessInstance> query(HistoricProcessInstanceQueryRepresentation request); ResultListDataRepresentation<ProcessInstance> query(HistoricProcessInstanceQueryRepresentation request);

1
src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java
View File

@ -40,6 +40,7 @@ public interface ProcessInstancesApi {
ProcessInstance create(CreateProcessInstance processInstance); ProcessInstance create(CreateProcessInstance processInstance);
@POST @POST
@Path("query")
@Consumes({ "application/json" }) @Consumes({ "application/json" })
@Produces({ "application/json" }) @Produces({ "application/json" })
ResultListDataRepresentation<ProcessInstance> query(ProcessInstanceQueryRepresentation request); ResultListDataRepresentation<ProcessInstance> query(ProcessInstanceQueryRepresentation request);

54
src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
View File

@ -3,7 +3,7 @@
package com.inteligr8.alfresco.activiti.model; package com.inteligr8.alfresco.activiti.model;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.ArrayList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
@ -39,15 +39,15 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
public class HistoricProcessInstanceQueryRepresentation { public class HistoricProcessInstanceQueryRepresentation {
@JsonProperty("excludeSubprocesses") @JsonProperty("excludeSubprocesses")
private boolean excludeSubprocesses; private Boolean excludeSubprocesses;
@JsonProperty("finished") @JsonProperty("finished")
private boolean finished; private Boolean finished;
@JsonProperty("finishedAfter") @JsonProperty("finishedAfter")
private OffsetDateTime finishedAfter; private OffsetDateTime finishedAfter;
@JsonProperty("finishedBefore") @JsonProperty("finishedBefore")
private OffsetDateTime finishedBefore; private OffsetDateTime finishedBefore;
@JsonProperty("includeProcessVariables") @JsonProperty("includeProcessVariables")
private boolean includeProcessVariables; private Boolean includeProcessVariables;
@JsonProperty("involvedUser") @JsonProperty("involvedUser")
private String involvedUser; private String involvedUser;
@JsonProperty("order") @JsonProperty("order")
@ -63,11 +63,11 @@ public class HistoricProcessInstanceQueryRepresentation {
@JsonProperty("processInstanceIds") @JsonProperty("processInstanceIds")
private List<String> processInstanceIds; private List<String> processInstanceIds;
@JsonProperty("size") @JsonProperty("size")
private int size; private Integer size;
@JsonProperty("sort") @JsonProperty("sort")
private String sort; private String sort;
@JsonProperty("start") @JsonProperty("start")
private int start; private Integer start;
@JsonProperty("startedAfter") @JsonProperty("startedAfter")
private OffsetDateTime startedAfter; private OffsetDateTime startedAfter;
@JsonProperty("startedBefore") @JsonProperty("startedBefore")
@ -81,9 +81,9 @@ public class HistoricProcessInstanceQueryRepresentation {
@JsonProperty("tenantIdLike") @JsonProperty("tenantIdLike")
private String tenantIdLike; private String tenantIdLike;
@JsonProperty("variables") @JsonProperty("variables")
private List<QueryVariable> variables = new ArrayList<QueryVariable>(); private List<QueryVariable> variables;
@JsonProperty("withoutTenantId") @JsonProperty("withoutTenantId")
private boolean withoutTenantId; private Boolean withoutTenantId;
/** /**
* No args constructor for use in serialization * No args constructor for use in serialization
@ -91,28 +91,28 @@ public class HistoricProcessInstanceQueryRepresentation {
public HistoricProcessInstanceQueryRepresentation() { public HistoricProcessInstanceQueryRepresentation() {
} }
public boolean isExcludeSubprocesses() { public Boolean isExcludeSubprocesses() {
return excludeSubprocesses; return excludeSubprocesses;
} }
public void setExcludeSubprocesses(boolean excludeSubprocesses) { public void setExcludeSubprocesses(Boolean excludeSubprocesses) {
this.excludeSubprocesses = excludeSubprocesses; this.excludeSubprocesses = excludeSubprocesses;
} }
public HistoricProcessInstanceQueryRepresentation withExcludeSubprocesses(boolean excludeSubprocesses) { public HistoricProcessInstanceQueryRepresentation withExcludeSubprocesses(Boolean excludeSubprocesses) {
this.excludeSubprocesses = excludeSubprocesses; this.excludeSubprocesses = excludeSubprocesses;
return this; return this;
} }
public boolean isFinished() { public Boolean isFinished() {
return finished; return finished;
} }
public void setFinished(boolean finished) { public void setFinished(Boolean finished) {
this.finished = finished; this.finished = finished;
} }
public HistoricProcessInstanceQueryRepresentation withFinished(boolean finished) { public HistoricProcessInstanceQueryRepresentation withFinished(Boolean finished) {
this.finished = finished; this.finished = finished;
return this; return this;
} }
@ -143,15 +143,15 @@ public class HistoricProcessInstanceQueryRepresentation {
return this; return this;
} }
public boolean isIncludeProcessVariables() { public Boolean isIncludeProcessVariables() {
return includeProcessVariables; return includeProcessVariables;
} }
public void setIncludeProcessVariables(boolean includeProcessVariables) { public void setIncludeProcessVariables(Boolean includeProcessVariables) {
this.includeProcessVariables = includeProcessVariables; this.includeProcessVariables = includeProcessVariables;
} }
public HistoricProcessInstanceQueryRepresentation withIncludeProcessVariables(boolean includeProcessVariables) { public HistoricProcessInstanceQueryRepresentation withIncludeProcessVariables(Boolean includeProcessVariables) {
this.includeProcessVariables = includeProcessVariables; this.includeProcessVariables = includeProcessVariables;
return this; return this;
} }
@ -247,15 +247,15 @@ public class HistoricProcessInstanceQueryRepresentation {
return this; return this;
} }
public int getSize() { public Integer getSize() {
return size; return size;
} }
public void setSize(int size) { public void setSize(Integer size) {
this.size = size; this.size = size;
} }
public HistoricProcessInstanceQueryRepresentation withSize(int size) { public HistoricProcessInstanceQueryRepresentation withSize(Integer size) {
this.size = size; this.size = size;
return this; return this;
} }
@ -273,15 +273,15 @@ public class HistoricProcessInstanceQueryRepresentation {
return this; return this;
} }
public int getStart() { public Integer getStart() {
return start; return start;
} }
public void setStart(int start) { public void setStart(Integer start) {
this.start = start; this.start = start;
} }
public HistoricProcessInstanceQueryRepresentation withStart(int start) { public HistoricProcessInstanceQueryRepresentation withStart(Integer start) {
this.start = start; this.start = start;
return this; return this;
} }
@ -365,6 +365,8 @@ public class HistoricProcessInstanceQueryRepresentation {
} }
public List<QueryVariable> getVariables() { public List<QueryVariable> getVariables() {
if (variables == null)
variables = new LinkedList<>();
return variables; return variables;
} }
@ -377,15 +379,15 @@ public class HistoricProcessInstanceQueryRepresentation {
return this; return this;
} }
public boolean isWithoutTenantId() { public Boolean isWithoutTenantId() {
return withoutTenantId; return withoutTenantId;
} }
public void setWithoutTenantId(boolean withoutTenantId) { public void setWithoutTenantId(Boolean withoutTenantId) {
this.withoutTenantId = withoutTenantId; this.withoutTenantId = withoutTenantId;
} }
public HistoricProcessInstanceQueryRepresentation withWithoutTenantId(boolean withoutTenantId) { public HistoricProcessInstanceQueryRepresentation withWithoutTenantId(Boolean withoutTenantId) {
this.withoutTenantId = withoutTenantId; this.withoutTenantId = withoutTenantId;
return this; return this;
} }

24
src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstanceQueryRepresentation.java
View File

@ -40,17 +40,17 @@ public class ProcessInstanceQueryRepresentation {
} }
@JsonProperty("appDefinitionId") @JsonProperty("appDefinitionId")
private long appDefinitionId; private Long appDefinitionId;
@JsonProperty("processDefinitionId") @JsonProperty("processDefinitionId")
private String processDefinitionId; private String processDefinitionId;
@JsonProperty("processInstanceId") @JsonProperty("processInstanceId")
private String processInstanceId; private String processInstanceId;
@JsonProperty("size") @JsonProperty("size")
private int size; private Integer size;
@JsonProperty("sort") @JsonProperty("sort")
private Sort sort; private Sort sort;
@JsonProperty("start") @JsonProperty("start")
private int start; private Integer start;
@JsonProperty("state") @JsonProperty("state")
private State state; private State state;
@ -60,15 +60,15 @@ public class ProcessInstanceQueryRepresentation {
public ProcessInstanceQueryRepresentation() { public ProcessInstanceQueryRepresentation() {
} }
public long getAppDefinitionId() { public Long getAppDefinitionId() {
return appDefinitionId; return appDefinitionId;
} }
public void setAppDefinitionId(long appDefinitionId) { public void setAppDefinitionId(Long appDefinitionId) {
this.appDefinitionId = appDefinitionId; this.appDefinitionId = appDefinitionId;
} }
public ProcessInstanceQueryRepresentation withAppDefinitionId(long appDefinitionId) { public ProcessInstanceQueryRepresentation withAppDefinitionId(Long appDefinitionId) {
this.appDefinitionId = appDefinitionId; this.appDefinitionId = appDefinitionId;
return this; return this;
} }
@ -99,15 +99,15 @@ public class ProcessInstanceQueryRepresentation {
return this; return this;
} }
public int getSize() { public Integer getSize() {
return size; return size;
} }
public void setSize(int size) { public void setSize(Integer size) {
this.size = size; this.size = size;
} }
public ProcessInstanceQueryRepresentation withSize(int size) { public ProcessInstanceQueryRepresentation withSize(Integer size) {
this.size = size; this.size = size;
return this; return this;
} }
@ -125,15 +125,15 @@ public class ProcessInstanceQueryRepresentation {
return this; return this;
} }
public int getStart() { public Integer getStart() {
return start; return start;
} }
public void setStart(int start) { public void setStart(Integer start) {
this.start = start; this.start = start;
} }
public ProcessInstanceQueryRepresentation withStart(int start) { public ProcessInstanceQueryRepresentation withStart(Integer start) {
this.start = start; this.start = start;
return this; return this;
} }