From 45151dfdc85291071eae53f2445eeaf03a0052ee Mon Sep 17 00:00:00 2001 From: Jeremy Dyer Date: Fri, 13 Jan 2017 12:32:29 -0500 Subject: [PATCH] NIFI-3343 Annotate client dto fields with JsonFormat annotation to allow default Jackson ObjectMapper implementation to be able to deserialize JSON. --- .../nifi-framework/nifi-client-dto/pom.xml | 5 +++++ .../src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java | 2 ++ .../src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java | 4 ++++ .../main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java | 2 ++ .../java/org/apache/nifi/web/api/dto/PreviousValueDTO.java | 2 ++ .../org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java | 2 ++ .../nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java | 2 ++ .../main/java/org/apache/nifi/web/api/dto/TemplateDTO.java | 2 ++ .../java/org/apache/nifi/web/api/dto/action/ActionDTO.java | 2 ++ .../org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java | 3 +++ .../nifi/web/api/dto/action/details/PurgeDetailsDTO.java | 2 ++ .../nifi/web/api/dto/provenance/ProvenanceRequestDTO.java | 3 +++ .../nifi/web/api/dto/provenance/ProvenanceResultsDTO.java | 2 ++ .../java/org/apache/nifi/web/api/entity/ActionEntity.java | 2 ++ 14 files changed, 35 insertions(+) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml index 39f71289b0be..e9529f2dc326 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml @@ -26,5 +26,10 @@ com.wordnik swagger-annotations + + com.fasterxml.jackson.core + jackson-annotations + 2.6.0 + diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java index c33b6ab144a8..708737ad0c7d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; /** * Contains details about this NiFi including the title and version. @@ -158,6 +159,7 @@ public void setBuildBranch(String buildBranch) { value = "Build timestamp", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getBuildTimestamp() { return buildTimestamp; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java index f6a6cf602b65..5bc5e3f40978 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java @@ -24,6 +24,7 @@ import java.util.Date; import java.util.List; import java.util.Set; +import com.fasterxml.jackson.annotation.JsonFormat; /** * Details of a node within this NiFi. @@ -52,6 +53,7 @@ public class NodeDTO { readOnly = true, dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getHeartbeat() { return heartbeat; } @@ -69,6 +71,7 @@ public void setHeartbeat(Date heartbeat) { readOnly = true, dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getConnectionRequested() { return connectionRequested; } @@ -207,6 +210,7 @@ public void setRoles(Set roles) { readOnly = true, dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getNodeStartTime() { return nodeStartTime; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java index 235ce58a8abb..3e01acd77f22 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; +import com.fasterxml.jackson.annotation.JsonFormat; /** * A event for a node within this NiFi cluster. @@ -68,6 +69,7 @@ public void setMessage(String message) { value = "The timestamp of the node event.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getTimestamp() { return timestamp; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java index 43e16040b86c..1952341ba23e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; /** * The previous value for a processor property. @@ -55,6 +56,7 @@ public void setPreviousValue(String previousValue) { value = "The timestamp when the value was modified.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getTimestamp() { return timestamp; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java index df01b82e1a9c..08fe21e10ce3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Collection; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; /** * Details of a remote process group in this NiFi. @@ -333,6 +334,7 @@ public void setContents(RemoteProcessGroupContentsDTO contents) { value = "The timestamp when this remote process group was last refreshed.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getFlowRefreshed() { return flowRefreshed; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java index 1cced181562e..c8f68d673192 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java @@ -25,6 +25,7 @@ import java.util.Date; import java.util.LinkedHashSet; import java.util.Set; +import com.fasterxml.jackson.annotation.JsonFormat; /** * The diagnostics of the system this NiFi is running on. @@ -661,6 +662,7 @@ public void setBuildBranch(String buildBranch) { @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty("Build timestamp") + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getBuildTimestamp() { return buildTimestamp; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java index 83e233971287..732af16961f4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; /** * Defines a template. @@ -114,6 +115,7 @@ public void setDescription(String description) { value = "The timestamp when this template was created.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getTimestamp() { return timestamp; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java index 28279264dce3..a2bde6e22cd5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java @@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; /** * An action performed in this NiFi. @@ -79,6 +80,7 @@ public void setUserIdentity(String userIdentity) { value = "The timestamp of the action.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getTimestamp() { return timestamp; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java index 7fb961543e0c..3c3dc0626234 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; /** * A history query to find desired actions. @@ -74,6 +75,7 @@ public void setSourceId(String sourceId) { value = "The start date of actions to return.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getStartDate() { return startDate; } @@ -90,6 +92,7 @@ public void setStartDate(Date startDate) { value = "The end date of actions to return.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getEndDate() { return endDate; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java index dec6964274f6..1d4502df9c77 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; +import com.fasterxml.jackson.annotation.JsonFormat; /** * Details of a purge operation. @@ -38,6 +39,7 @@ public class PurgeDetailsDTO extends ActionDetailsDTO { value = "The end date for the purge action.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getEndDate() { return endDate; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java index 0cdcb8fdd232..630c82dd4f52 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java @@ -23,6 +23,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonFormat; /** * A request for provenance. @@ -60,6 +61,7 @@ public void setSearchTerms(final Map searchTerms) { value = "The earliest event time to include in the query.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getStartDate() { return startDate; } @@ -76,6 +78,7 @@ public void setStartDate(Date startDate) { value = "The latest event time to include in the query.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getEndDate() { return endDate; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java index 8db81f0f9267..e9b67907f474 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java @@ -25,6 +25,7 @@ import java.util.Date; import java.util.List; import java.util.Set; +import com.fasterxml.jackson.annotation.JsonFormat; /** * Results of a provenance request. @@ -121,6 +122,7 @@ public void setGenerated(Date generated) { value = "The oldest event available in the provenance repository.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getOldestEvent() { return oldestEvent; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java index 3a6aa2140a05..aa9e47894536 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java @@ -23,6 +23,7 @@ import org.apache.nifi.web.api.dto.ReadablePermission; import org.apache.nifi.web.api.dto.action.ActionDTO; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; +import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; @@ -71,6 +72,7 @@ public void setId(Integer id) { value = "The timestamp of the action.", dataType = "string" ) + @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateTimeAdapter.DEFAULT_DATE_TIME_FORMAT) public Date getTimestamp() { return timestamp; }