From cdeb325e745a8b412269a5f5fc0423dc87ec0086 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 30 May 2023 12:46:22 -0400 Subject: [PATCH] fixed date/time format --- .../java/com/inteligr8/activiti/model/Job.java | 2 +- .../alfresco/activiti/ApsPublicRestApi.java | 2 +- .../alfresco/activiti/api/TasksApi.java | 4 ++-- ...oricProcessInstanceQueryRepresentation.java | 8 ++++---- .../model/HistoricTaskQueryRepresentation.java | 18 +++++++++--------- .../activiti/model/ProcessInstance.java | 4 ++-- .../alfresco/activiti/model/Task.java | 6 +++--- .../alfresco/activiti/model/TaskFilter.java | 4 ++-- .../model/TaskQueryRepresentation.java | 4 ++-- .../alfresco/activiti/model/TaskUpdate.java | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/inteligr8/activiti/model/Job.java b/src/main/java/com/inteligr8/activiti/model/Job.java index 8414439..a2e34ad 100644 --- a/src/main/java/com/inteligr8/activiti/model/Job.java +++ b/src/main/java/com/inteligr8/activiti/model/Job.java @@ -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; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java index d7a7010..66ed2aa 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java @@ -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); } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java index 672fdb5..ec81680 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java @@ -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 query(HistoricTaskQueryRepresentation request); + ResultListDataRepresentation filter(TaskFilterRepresentation request); @PUT @Path("{taskId}/action/assign") diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java index 16b754f..5e1b8ae 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java @@ -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; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java index 97d30fb..cdc2f47 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricTaskQueryRepresentation.java @@ -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; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java b/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java index 52c16f6..570da23 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java @@ -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:ssXXX") + @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") 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:ssXXX") + @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private OffsetDateTime started; @JsonProperty("startedBy") private UserLight startedBy; 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 f94ffe0..fa15626 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Task.java @@ -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:ssXXX") + @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") private OffsetDateTime created; @JsonProperty("description") private String description; @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("duration") private Long duration; @JsonProperty("endDate") private OffsetDateTime endDate; - @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("executionId") private String executionId; @JsonProperty("formKey") diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java index 7561d9c..93c9b8b 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskFilter.java @@ -39,10 +39,10 @@ public class TaskFilter extends Datum { @JsonProperty("assignment") private String assignment; @JsonProperty("dueBefore") - @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 dueBefore; @JsonProperty("dueAfter") - @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 dueAfter; @JsonProperty("processDefinitionId") private String processDefinitionId; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java index 05bf318..0497734 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskQueryRepresentation.java @@ -54,10 +54,10 @@ public class TaskQueryRepresentation { @JsonProperty("text") private String text; @JsonProperty("dueBefore") - @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 dueBefore; @JsonProperty("dueAfter") - @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 dueAfter; @JsonProperty("taskId") private String taskId; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java index 708c725..adbed7a 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/model/TaskUpdate.java @@ -37,7 +37,7 @@ public class TaskUpdate { @JsonProperty("descriptionSet") private Boolean descriptionSet; @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("dueDateSet") private Boolean dueDateSet;