replace use of ISO8601DateFormat and ISO8601Utils with StdDateFormat

fixes OpenAPITools#5779
jonfreedman · Apr 1, 2020 · bcbb878 · bcbb878
1 parent 7a26ce5
commit bcbb878
Show file tree

Hide file tree

Showing 19 changed files with 390 additions and 144 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache
@@ -1,21 +1,34 @@
 {{>licenseInfo}}
 package {{invokerPackage}};
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
+
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
 
-  // Same as ISO8601DateFormat but serializing milliseconds.
   @Override
   public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
+    return fmt.format(date, toAppendTo, fieldPosition);
   }
 
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/RFC3339DateFormat.mustache
@@ -1,19 +1,33 @@
 package {{apiPackage}};
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-    // Same as ISO8601DateFormat but serializing milliseconds.
-    @Override
-    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-        String value = ISO8601Utils.format(date, true);
-        toAppendTo.append(value);
-        return toAppendTo;
-    }
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
 
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
+
+  @Override
+  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+    return fmt.format(date, toAppendTo, fieldPosition);
+  }
+
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/RFC3339DateFormat.mustache
@@ -1,19 +1,33 @@
 package {{invokerPackage}};
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-    // Same as ISO8601DateFormat but serializing milliseconds.
-    @Override
-    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-        String value = ISO8601Utils.format(date, true);
-        toAppendTo.append(value);
-        return toAppendTo;
-    }
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
 
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
+
+  @Override
+  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+    return fmt.format(date, toAppendTo, fieldPosition);
+  }
+
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/...-generator/src/main/resources/JavaSpring/libraries/spring-boot/RFC3339DateFormat.mustache b/...-generator/src/main/resources/JavaSpring/libraries/spring-boot/RFC3339DateFormat.mustache
@@ -1,22 +1,33 @@
 package {{basePackage}};
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
 
-  private static final long serialVersionUID = 1L;
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
 
-  // Same as ISO8601DateFormat but serializing milliseconds.
   @Override
   public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
+    return fmt.format(date, toAppendTo, fieldPosition);
   }
 
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/...i-generator/src/main/resources/JavaSpring/libraries/spring-mvc/RFC3339DateFormat.mustache b/...i-generator/src/main/resources/JavaSpring/libraries/spring-mvc/RFC3339DateFormat.mustache
@@ -1,22 +1,33 @@
 package {{configPackage}};
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
 
-  private static final long serialVersionUID = 1L;
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
 
-  // Same as ISO8601DateFormat but serializing milliseconds.
   @Override
   public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
+    return fmt.format(date, toAppendTo, fieldPosition);
   }
 
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/RFC3339DateFormat.mustache
@@ -1,19 +1,33 @@
 package {{apiPackage}};
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-    // Same as ISO8601DateFormat but serializing milliseconds.
-    @Override
-    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-        String value = ISO8601Utils.format(date, true);
-        toAppendTo.append(value);
-        return toAppendTo;
-    }
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
 
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
+
+  @Override
+  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+    return fmt.format(date, toAppendTo, fieldPosition);
+  }
+
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/RFC3339DateFormat.mustache
@@ -1,20 +1,33 @@
 package {{basePackage}};
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
+
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
 
-  // Same as ISO8601DateFormat but serializing milliseconds.
   @Override
   public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
+    return fmt.format(date, toAppendTo, fieldPosition);
   }
 
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/...s/client/petstore/java/feign/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/...s/client/petstore/java/feign/src/main/java/org/openapitools/client/RFC3339DateFormat.java
@@ -12,21 +12,34 @@
 
 package org.openapitools.client;
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
+
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
 
-  // Same as ISO8601DateFormat but serializing milliseconds.
   @Override
   public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
+    return fmt.format(date, toAppendTo, fieldPosition);
   }
 
+  @Override
+  public Object clone() {
+    return this;
+  }
 }
diff --git a/...lient/petstore/java/feign10x/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/...lient/petstore/java/feign10x/src/main/java/org/openapitools/client/RFC3339DateFormat.java
@@ -12,21 +12,34 @@
 
 package org.openapitools.client;
 
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 
+import java.text.DateFormat;
 import java.text.FieldPosition;
+import java.text.ParsePosition;
 import java.util.Date;
+import java.util.TimeZone;
 
+public class RFC3339DateFormat extends DateFormat {
+  private static final long serialVersionUID = 1L;
+  private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
 
-public class RFC3339DateFormat extends ISO8601DateFormat {
+  private final StdDateFormat fmt = new StdDateFormat()
+          .withTimeZone(TIMEZONE_Z)
+          .withColonInTimeZone(true);
+
+  @Override
+  public Date parse(String source, ParsePosition pos) {
+    return fmt.parse(source, pos);
+  }
 
-  // Same as ISO8601DateFormat but serializing milliseconds.
   @Override
   public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
+    return fmt.format(date, toAppendTo, fieldPosition);
   }
 
+  @Override
+  public Object clone() {
+    return this;
+  }
 }