Commit 6067a2e5 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents dbbf71b6 cdeb325e

src/main/java/com/inteligr8/activiti/model/Job.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public class Job extends Datum { 
    private String exceptionMessage;

    @JsonProperty("dueDate")

    private OffsetDateTime dueDate;

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    @JsonProperty("tenantId")

    private String tenantId;

src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi { 
		return this.getApi(AppVersionApi.class);

	}

    

    default HistoricApi getHistoricProcessInstancesApi() {

    default HistoricApi getHistoricApi() {

        return this.getApi(HistoricApi.class);

    }

src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import javax.ws.rs.Produces; 
import javax.ws.rs.QueryParam;



import com.inteligr8.alfresco.activiti.model.AssigneeIdentifier;

import com.inteligr8.alfresco.activiti.model.HistoricTaskQueryRepresentation;

import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;

import com.inteligr8.alfresco.activiti.model.Task;

import com.inteligr8.alfresco.activiti.model.TaskFilterRepresentation;

import com.inteligr8.alfresco.activiti.model.TaskQueryRepresentation;

import com.inteligr8.alfresco.activiti.model.TaskUpdate;

import com.inteligr8.alfresco.activiti.model.UserIdentifier;
@@ -64,7 +64,7 @@ public interface TasksApi { 
    @Path("filter")

    @Consumes({ "application/json" })

    @Produces({ "application/json" })

    ResultListDataRepresentation<Task> query(HistoricTaskQueryRepresentation request);

    ResultListDataRepresentation<Task> filter(TaskFilterRepresentation request);



    @PUT

    @Path("{taskId}/action/assign")

src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ public class HistoricProcessInstanceQueryRepresentation { 
    @JsonProperty("finished")

    private Boolean finished;

    @JsonProperty("finishedAfter")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime finishedAfter;

    @JsonProperty("finishedBefore")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime finishedBefore;

    @JsonProperty("includeProcessVariables")

    private Boolean includeProcessVariables;
@@ -73,10 +73,10 @@ public class HistoricProcessInstanceQueryRepresentation { 
    @JsonProperty("start")

    private Integer start;

    @JsonProperty("startedAfter")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime startedAfter;

    @JsonProperty("startedBefore")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime startedBefore;

    @JsonProperty("startedBy")

    private String startedBy;

src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java

+9 −9
Original line number Diff line number Diff line
@@ -99,33 +99,33 @@ public class HistoricTaskQueryRepresentation { 
    @JsonProperty("taskCandidateGroup")

    private String taskCandidateGroup;

    @JsonProperty("taskCreatedOn")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime taskCreated;

    @JsonProperty("taskCreatedBefore")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime taskCreatedBefore;

    @JsonProperty("taskCreatedAfter")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime taskCreatedAfter;

    @JsonProperty("dueDate")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime dueDate;

    @JsonProperty("dueDateBefore")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime dueDateBefore;

    @JsonProperty("dueDateAfter")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime dueDateAfter;

    @JsonProperty("withoutDueDate")

    private Boolean withoutDueDate;

    @JsonProperty("taskCompletedOn")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime taskCompleted;

    @JsonProperty("taskCompletedBefore")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime taskCompletedBefore;

    @JsonProperty("taskCompletedAfter")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")

    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")

    private OffsetDateTime taskCompletedAfter;

    @JsonProperty("taskDeleteReason")

    private String taskDeleteReason;