Commit 20a95043 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents b4b57b75 117e9464

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:ss.SSSXXX")

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

    @JsonProperty("tenantId")

    private String tenantId;

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:ss.SSSXXX")

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

    private OffsetDateTime finishedAfter;

    @JsonProperty("finishedBefore")

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

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

    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:ss.SSSXXX")

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

    private OffsetDateTime startedAfter;

    @JsonProperty("startedBefore")

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

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

    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:ss.SSSXXX")

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

    private OffsetDateTime taskCreated;

    @JsonProperty("taskCreatedBefore")

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

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

    private OffsetDateTime taskCreatedBefore;

    @JsonProperty("taskCreatedAfter")

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

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

    private OffsetDateTime taskCreatedAfter;

    @JsonProperty("dueDate")

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

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

    private OffsetDateTime dueDate;

    @JsonProperty("dueDateBefore")

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

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

    private OffsetDateTime dueDateBefore;

    @JsonProperty("dueDateAfter")

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

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

    private OffsetDateTime dueDateAfter;

    @JsonProperty("withoutDueDate")

    private Boolean withoutDueDate;

    @JsonProperty("taskCompletedOn")

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

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

    private OffsetDateTime taskCompleted;

    @JsonProperty("taskCompletedBefore")

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

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

    private OffsetDateTime taskCompletedBefore;

    @JsonProperty("taskCompletedAfter")

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

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

    private OffsetDateTime taskCompletedAfter;

    @JsonProperty("taskDeleteReason")

    private String taskDeleteReason;

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

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class ProcessInstance extends Datum { 
    @JsonProperty("businessKey")

    private String businessKey;

    @JsonProperty("ended")

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

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

    private OffsetDateTime ended;

    @JsonProperty("graphicalNotationDefined")

    private Boolean graphicalNotationDefined;
@@ -64,7 +64,7 @@ public class ProcessInstance extends Datum { 
    @JsonProperty("startFormDefined")

    private Boolean startFormDefined;

    @JsonProperty("started")

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

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

    private OffsetDateTime started;

    @JsonProperty("startedBy")

    private UserLight startedBy;

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

+3 −3
Original line number Diff line number Diff line
@@ -56,18 +56,18 @@ public class Task extends Datum { 
    @JsonProperty("category")

    private String category;

    @JsonProperty("created")

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

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

    private OffsetDateTime created;

    @JsonProperty("description")

    private String description;

    @JsonProperty("dueDate")

    private OffsetDateTime dueDate;

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

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

    @JsonProperty("duration")

    private Long duration;

    @JsonProperty("endDate")

    private OffsetDateTime endDate;

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

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

    @JsonProperty("executionId")

    private String executionId;

    @JsonProperty("formKey")