From 56da2b51e16d92df07e25277d01c85ad622015a9 Mon Sep 17 00:00:00 2001 From: simplesteph Date: Fri, 14 Oct 2016 17:57:41 +1100 Subject: [PATCH] [NIFI-2900] transformed all datetime fields to string as they don't comply with ISO norms. This closes #1136. --- .../main/java/org/apache/nifi/web/api/dto/AboutDTO.java | 3 ++- .../org/apache/nifi/web/api/dto/BulletinBoardDTO.java | 3 ++- .../java/org/apache/nifi/web/api/dto/BulletinDTO.java | 3 ++- .../java/org/apache/nifi/web/api/dto/ClusterDTO.java | 3 ++- .../org/apache/nifi/web/api/dto/CountersSnapshotDTO.java | 5 ++++- .../java/org/apache/nifi/web/api/dto/DropRequestDTO.java | 6 ++++-- .../apache/nifi/web/api/dto/FlowConfigurationDTO.java | 3 ++- .../org/apache/nifi/web/api/dto/ListingRequestDTO.java | 6 ++++-- .../main/java/org/apache/nifi/web/api/dto/NodeDTO.java | 9 ++++++--- .../java/org/apache/nifi/web/api/dto/NodeEventDTO.java | 3 ++- .../org/apache/nifi/web/api/dto/PreviousValueDTO.java | 3 ++- .../apache/nifi/web/api/dto/RemoteProcessGroupDTO.java | 3 ++- .../nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java | 5 ++++- .../java/org/apache/nifi/web/api/dto/TemplateDTO.java | 3 ++- .../org/apache/nifi/web/api/dto/action/ActionDTO.java | 3 ++- .../org/apache/nifi/web/api/dto/action/HistoryDTO.java | 3 ++- .../apache/nifi/web/api/dto/action/HistoryQueryDTO.java | 6 ++++-- .../nifi/web/api/dto/action/details/PurgeDetailsDTO.java | 3 ++- .../nifi/web/api/dto/flow/ProcessGroupFlowDTO.java | 3 ++- .../nifi/web/api/dto/provenance/ProvenanceDTO.java | 6 ++++-- .../nifi/web/api/dto/provenance/ProvenanceEventDTO.java | 3 ++- .../web/api/dto/provenance/ProvenanceRequestDTO.java | 6 ++++-- .../web/api/dto/provenance/ProvenanceResultsDTO.java | 6 ++++-- .../nifi/web/api/dto/provenance/lineage/LineageDTO.java | 6 ++++-- .../api/dto/provenance/lineage/ProvenanceLinkDTO.java | 3 ++- .../api/dto/provenance/lineage/ProvenanceNodeDTO.java | 3 ++- .../nifi/web/api/dto/status/ConnectionStatusDTO.java | 5 ++++- .../apache/nifi/web/api/dto/status/PortStatusDTO.java | 3 ++- .../nifi/web/api/dto/status/ProcessGroupStatusDTO.java | 3 ++- .../nifi/web/api/dto/status/ProcessorStatusDTO.java | 5 ++++- .../web/api/dto/status/RemoteProcessGroupStatusDTO.java | 3 ++- .../apache/nifi/web/api/dto/status/StatusHistoryDTO.java | 5 ++++- .../org/apache/nifi/web/api/dto/util/TimeAdapter.java | 3 +-- .../apache/nifi/web/api/entity/AccessPolicyEntity.java | 5 +++++ .../org/apache/nifi/web/api/entity/ActionEntity.java | 5 +++++ .../org/apache/nifi/web/api/entity/BulletinEntity.java | 5 +++++ .../nifi/web/api/entity/ControllerServicesEntity.java | 3 ++- .../org/apache/nifi/web/api/entity/TemplatesEntity.java | 5 +++++ .../java/org/apache/nifi/web/api/entity/UsersEntity.java | 5 +++++ 39 files changed, 120 insertions(+), 44 deletions(-) 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 72840d018e..913401b537 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 @@ -103,7 +103,8 @@ public class AboutDTO { @XmlJavaTypeAdapter(TimezoneAdapter.class) @ApiModelProperty( value = "The timezone of the NiFi instance.", - readOnly = true + readOnly = true, + dataType = "string" ) public Date getTimezone() { return timezone; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java index 129bb99e16..f638d736b0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java @@ -53,7 +53,8 @@ public class BulletinBoardDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The timestamp when this report was generated." + value = "The timestamp when this report was generated.", + dataType = "string" ) public Date getGenerated() { return generated; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java index dc95d6b81b..7d509e6378 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java @@ -156,7 +156,8 @@ public class BulletinDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "When this bulletin was generated." + value = "When this bulletin was generated.", + dataType = "string" ) 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/ClusterDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java index 66e19d7c76..03776cec80 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java @@ -52,7 +52,8 @@ public class ClusterDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The timestamp the report was generated." + value = "The timestamp the report was generated.", + dataType = "string" ) public Date getGenerated() { return generated; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java index 1e1b389f37..cdcdb0c751 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java @@ -48,7 +48,10 @@ public class CountersSnapshotDTO implements Cloneable { } @XmlJavaTypeAdapter(TimeAdapter.class) - @ApiModelProperty("The timestamp when the report was generated.") + @ApiModelProperty( + value = "The timestamp when the report was generated.", + dataType = "string" + ) public Date getGenerated() { return generated; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java index 8879054eaa..8b16da0478 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java @@ -87,7 +87,8 @@ public class DropRequestDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The timestamp when the query was submitted." + value = "The timestamp when the query was submitted.", + dataType = "string" ) public Date getSubmissionTime() { return submissionTime; @@ -144,7 +145,8 @@ public class DropRequestDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The last time this drop request was updated." + value = "The last time this drop request was updated.", + dataType = "string" ) public Date getLastUpdated() { return lastUpdated; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java index 969168cd00..9e546b1fd6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java @@ -70,7 +70,8 @@ public class FlowConfigurationDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The current time on the system." + value = "The current time on the system.", + dataType = "string" ) public Date getCurrentTime() { return currentTime; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java index 444aaf5e93..abc8890b94 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java @@ -82,7 +82,8 @@ public class ListingRequestDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The timestamp when the query was submitted." + value = "The timestamp when the query was submitted.", + dataType = "string" ) public Date getSubmissionTime() { return submissionTime; @@ -97,7 +98,8 @@ public class ListingRequestDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The last time this listing request was updated." + value = "The last time this listing request was updated.", + dataType = "string" ) public Date getLastUpdated() { return lastUpdated; 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 fdb5f9e1de..f6a6cf602b 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 @@ -49,7 +49,8 @@ public class NodeDTO { @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( value = "the time of the nodes's last heartbeat.", - readOnly = true + readOnly = true, + dataType = "string" ) public Date getHeartbeat() { return heartbeat; @@ -65,7 +66,8 @@ public class NodeDTO { @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( value = "The time of the node's last connection request.", - readOnly = true + readOnly = true, + dataType = "string" ) public Date getConnectionRequested() { return connectionRequested; @@ -202,7 +204,8 @@ public class NodeDTO { @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( value = "The time at which this Node was last refreshed.", - readOnly = true + readOnly = true, + dataType = "string" ) 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 f0b61a79b0..235ce58a8a 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 @@ -65,7 +65,8 @@ public class NodeEventDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The timestamp of the node event." + value = "The timestamp of the node event.", + dataType = "string" ) 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 558f471e7e..43e16040b8 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 @@ -52,7 +52,8 @@ public class PreviousValueDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The timestamp when the value was modified." + value = "The timestamp when the value was modified.", + dataType = "string" ) 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 1e6739e49d..0afc1d53a2 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 @@ -284,7 +284,8 @@ public class RemoteProcessGroupDTO extends ComponentDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The timestamp when this remote process group was last refreshed." + value = "The timestamp when this remote process group was last refreshed.", + dataType = "string" ) 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 73058373e1..0ff7eadf30 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 @@ -220,7 +220,10 @@ public class SystemDiagnosticsSnapshotDTO implements Cloneable { } @XmlJavaTypeAdapter(TimeAdapter.class) - @ApiModelProperty("When the diagnostics were generated.") + @ApiModelProperty( + value = "When the diagnostics were generated.", + dataType = "string" + ) public Date getStatsLastRefreshed() { return statsLastRefreshed; } 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 d250854901..83e2339712 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 @@ -111,7 +111,8 @@ public class TemplateDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The timestamp when this template was created." + value = "The timestamp when this template was created.", + dataType = "string" ) 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 8479d498c2..28279264dc 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 @@ -76,7 +76,8 @@ public class ActionDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The timestamp of the action." + value = "The timestamp of the action.", + dataType = "string" ) 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/HistoryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java index 15fb086827..bdc121ce47 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java @@ -53,7 +53,8 @@ public class HistoryDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The timestamp when the report was generated." + value = "The timestamp when the report was generated.", + dataType = "string" ) public Date getLastRefreshed() { return lastRefreshed; 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 8dde361983..7fb961543e 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 @@ -71,7 +71,8 @@ public class HistoryQueryDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The start date of actions to return." + value = "The start date of actions to return.", + dataType = "string" ) public Date getStartDate() { return startDate; @@ -86,7 +87,8 @@ public class HistoryQueryDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The end date of actions to return." + value = "The end date of actions to return.", + dataType = "string" ) 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 b83e91d6b3..dec6964274 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 @@ -35,7 +35,8 @@ public class PurgeDetailsDTO extends ActionDetailsDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The end date for the purge action." + value = "The end date for the purge action.", + dataType = "string" ) 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/flow/ProcessGroupFlowDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java index ce5d1e0352..f24ed3c309 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java @@ -115,7 +115,8 @@ public class ProcessGroupFlowDTO { @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The time the flow for the process group was last refreshed." + value = "The time the flow for the process group was last refreshed.", + dataType = "string" ) public Date getLastRefreshed() { return lastRefreshed; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java index bbd958d14d..1a3643f358 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java @@ -74,7 +74,8 @@ public class ProvenanceDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The timestamp when the query was submitted." + value = "The timestamp when the query was submitted.", + dataType = "string" ) public Date getSubmissionTime() { return submissionTime; @@ -89,7 +90,8 @@ public class ProvenanceDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The timestamp when the query will expire." + value = "The timestamp when the query will expire.", + dataType = "string" ) public Date getExpiration() { return expiration; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java index dcc14619e1..afecf3fcfa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java @@ -116,7 +116,8 @@ public class ProvenanceEventDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The timestamp of the event." + value = "The timestamp of the event.", + dataType = "string" ) public Date getEventTime() { return eventTime; 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 4a8d654e9e..0cdcb8fdd2 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 @@ -57,7 +57,8 @@ public class ProvenanceRequestDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The earliest event time to include in the query." + value = "The earliest event time to include in the query.", + dataType = "string" ) public Date getStartDate() { return startDate; @@ -72,7 +73,8 @@ public class ProvenanceRequestDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The latest event time to include in the query." + value = "The latest event time to include in the query.", + dataType = "string" ) 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 fd82df385f..8db81f0f92 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 @@ -102,7 +102,8 @@ public class ProvenanceResultsDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "Then the search was performed." + value = "Then the search was performed.", + dataType = "string" ) public Date getGenerated() { return generated; @@ -117,7 +118,8 @@ public class ProvenanceResultsDTO { */ @XmlJavaTypeAdapter(DateTimeAdapter.class) @ApiModelProperty( - value = "The oldest event available in the provenance repository." + value = "The oldest event available in the provenance repository.", + dataType = "string" ) 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/dto/provenance/lineage/LineageDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java index 46d99bf661..a2d9cbd2a4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java @@ -72,7 +72,8 @@ public class LineageDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "When the lineage query was submitted." + value = "When the lineage query was submitted.", + dataType = "string" ) public Date getSubmissionTime() { return submissionTime; @@ -87,7 +88,8 @@ public class LineageDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "When the lineage query will expire." + value = "When the lineage query will expire.", + dataType = "string" ) public Date getExpiration() { return expiration; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java index f91d1247d2..3e0da69c4f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java @@ -81,7 +81,8 @@ public class ProvenanceLinkDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The timestamp of the link (based on the destination)." + value = "The timestamp of the link (based on the destination).", + dataType = "string" ) 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/provenance/lineage/ProvenanceNodeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java index 5e7e329730..d2c428afde 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java @@ -145,7 +145,8 @@ public class ProvenanceNodeDTO { */ @XmlJavaTypeAdapter(TimestampAdapter.class) @ApiModelProperty( - value = "The timestamp of the node formatted." + value = "The timestamp of the node formatted.", + dataType = "string" ) 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/status/ConnectionStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java index 395ce7cc32..ee23f38fbe 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java @@ -124,7 +124,10 @@ public class ConnectionStatusDTO implements Cloneable { } @XmlJavaTypeAdapter(TimeAdapter.class) - @ApiModelProperty("The timestamp of when the stats were last refreshed") + @ApiModelProperty( + value = "The timestamp of when the stats were last refreshed", + dataType = "string" + ) public Date getStatsLastRefreshed() { return statsLastRefreshed; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java index dd24bccaa6..ed03bceef1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java @@ -113,7 +113,8 @@ public class PortStatusDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The time the status for the process group was last refreshed." + value = "The time the status for the process group was last refreshed.", + dataType = "string" ) public Date getStatsLastRefreshed() { return statsLastRefreshed; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java index 190658a71c..609c24f5e1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java @@ -78,7 +78,8 @@ public class ProcessGroupStatusDTO implements Cloneable { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The time the status for the process group was last refreshed." + value = "The time the status for the process group was last refreshed.", + dataType = "string" ) public Date getStatsLastRefreshed() { return statsLastRefreshed; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java index 4e4e9fcfca..3f140310ee 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java @@ -87,7 +87,10 @@ public class ProcessorStatusDTO implements Cloneable { } @XmlJavaTypeAdapter(TimeAdapter.class) - @ApiModelProperty("The timestamp of when the stats were last refreshed") + @ApiModelProperty( + value="The timestamp of when the stats were last refreshed", + dataType = "string" + ) public Date getStatsLastRefreshed() { return statsLastRefreshed; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java index faae6e67b7..a13749a00f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java @@ -109,7 +109,8 @@ public class RemoteProcessGroupStatusDTO { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The time the status for the process group was last refreshed." + value = "The time the status for the process group was last refreshed.", + dataType = "string" ) public Date getStatsLastRefreshed() { return statsLastRefreshed; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java index 3654e106e7..9c7b7e1ec5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java @@ -42,7 +42,10 @@ public class StatusHistoryDTO { * @return when this status history was generated */ @XmlJavaTypeAdapter(TimeAdapter.class) - @ApiModelProperty("When the status history was generated.") + @ApiModelProperty( + value = "When the status history was generated.", + dataType = "string" + ) public Date getGenerated() { return generated; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java index 100d6c1745..8f3e1954e5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/util/TimeAdapter.java @@ -16,13 +16,12 @@ */ package org.apache.nifi.web.api.dto.util; +import javax.xml.bind.annotation.adapters.XmlAdapter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import javax.xml.bind.annotation.adapters.XmlAdapter; - /** * XmlAdapter for (un)marshalling a time. */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.java index 40b6512aae..d42f4989e8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.web.api.entity; +import com.wordnik.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.AccessPolicyDTO; import org.apache.nifi.web.api.dto.util.TimeAdapter; @@ -49,6 +50,10 @@ public class AccessPolicyEntity extends ComponentEntity { * @return When this content was generated */ @XmlJavaTypeAdapter(TimeAdapter.class) + @ApiModelProperty( + value = "When this content was generated.", + dataType = "string" + ) public Date getGenerated() { return generated; } 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 7cd7a5ac68..3a6aa2140a 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 @@ -19,6 +19,7 @@ package org.apache.nifi.web.api.entity; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import com.wordnik.swagger.annotations.ApiModelProperty; 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; @@ -66,6 +67,10 @@ public class ActionEntity extends Entity implements ReadablePermission { * @return The timestamp of the action. */ @XmlJavaTypeAdapter(DateTimeAdapter.class) + @ApiModelProperty( + value = "The timestamp of the action.", + dataType = "string" + ) 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/entity/BulletinEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinEntity.java index 4b52bf873d..9e93a240c8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinEntity.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.web.api.entity; +import com.wordnik.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.BulletinDTO; import org.apache.nifi.web.api.dto.ReadablePermission; import org.apache.nifi.web.api.dto.util.TimeAdapter; @@ -87,6 +88,10 @@ public class BulletinEntity extends Entity implements ReadablePermission { * @return When this bulletin was generated. */ @XmlJavaTypeAdapter(TimeAdapter.class) + @ApiModelProperty( + value = "When this bulletin was generated.", + dataType = "string" + ) 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/entity/ControllerServicesEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java index f55358ade5..7d7b23644e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java @@ -49,7 +49,8 @@ public class ControllerServicesEntity extends Entity { */ @XmlJavaTypeAdapter(TimeAdapter.class) @ApiModelProperty( - value = "The current time on the system." + value = "The current time on the system.", + dataType = "string" ) public Date getCurrentTime() { return currentTime; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java index 42ea3cdb9c..b6a2bc4441 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.web.api.entity; +import com.wordnik.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimeAdapter; import javax.xml.bind.annotation.XmlRootElement; @@ -49,6 +50,10 @@ public class TemplatesEntity extends Entity { * @return When this content was generated */ @XmlJavaTypeAdapter(TimeAdapter.class) + @ApiModelProperty( + value = "When this content was generated.", + dataType = "string" + ) public Date getGenerated() { return generated; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java index 7969f6bd12..19c3448e33 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.web.api.entity; +import com.wordnik.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimeAdapter; import javax.xml.bind.annotation.XmlRootElement; @@ -50,6 +51,10 @@ public class UsersEntity extends Entity { * @return When this content was generated */ @XmlJavaTypeAdapter(TimeAdapter.class) + @ApiModelProperty( + value = "When this content was generated.", + dataType = "string" + ) public Date getGenerated() { return generated; }