[nifi] branch master updated: NIFI-6814: - Restored JAXB Adapter

[mcgilman]

This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new c947e57  NIFI-6814: - Restored JAXB Adapter
c947e57 is described below

commit c947e57d5e4dda8682a6ec1c6bc6850a65ab912e
Author: Joe Ferner <joe.fern...@gmail.com>
AuthorDate: Fri Nov 8 14:54:10 2019 -0500

    NIFI-6814:
    - Restored JAXB Adapter
    
    This closes #3880
---
 .../main/java/org/apache/nifi/web/api/dto/AsynchronousRequestDTO.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AsynchronousRequestDTO.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AsynchronousRequestDTO.java
index 180d4f5..318d6e9 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AsynchronousRequestDTO.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AsynchronousRequestDTO.java
@@ -17,7 +17,9 @@
 package org.apache.nifi.web.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.nifi.web.api.dto.util.TimestampAdapter;
 
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.util.Date;
 import java.util.List;
 
@@ -51,6 +53,7 @@ public abstract class AsynchronousRequestDTO<T extends 
UpdateStepDTO> {
         this.uri = uri;
     }
 
+    @XmlJavaTypeAdapter(TimestampAdapter.class)
     @ApiModelProperty(value = "The timestamp of when the request was 
submitted", readOnly =  true)
     public Date getSubmissionTime() {
         return submissionTime;
@@ -60,6 +63,7 @@ public abstract class AsynchronousRequestDTO<T extends 
UpdateStepDTO> {
         this.submissionTime = submissionTime;
     }
 
+    @XmlJavaTypeAdapter(TimestampAdapter.class)
     @ApiModelProperty(value = "The timestamp of when the request was last 
updated", readOnly = true)
     public Date getLastUpdated() {
         return lastUpdated;