Merge pull request #1179 from swagger-api/swos-126

ref swagger-api/swagger-core#3273 - updates DateTimeSchema type to OffsetDateTime

Author: frantuma

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -61,12 +61,12 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
+import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import static java.util.Calendar.*;
 
 
 public class OpenAPIDeserializer {
@@ -2448,37 +2448,12 @@ private Object getDecodedObject( Schema schema, String objectString) throws Pars
      * Returns the Date represented by the given RFC3339 date-time string.
      * Returns null if this string can't be parsed as Date.
      */
-    private Date toDateTime( String dateString) {
-        // Note: For this conversion, regex matching is better than SimpleDateFormat, etc.
-        // Optional elements (e.g. milliseconds) are not directly handled by SimpleDateFormat.
-        // Also, SimpleDateFormat is not thread-safe.
-        Matcher matcher = RFC3339_DATE_TIME_PATTERN.matcher( dateString);
+    private OffsetDateTime toDateTime(String dateString) {
 
-        Date dateTime = null;
-        if( matcher.matches()) {
-            try {
-                String year = matcher.group(1);
-                String month = matcher.group(2);
-                String day = matcher.group(3);
-                String hour = matcher.group(4);
-                String min = matcher.group(5);
-                String sec = matcher.group(6);
-                String ms = matcher.group(7);
-                String zone = matcher.group(10);
-
-                Calendar calendar = Calendar.getInstance( TimeZone.getTimeZone( zone == null? "GMT" : "GMT" + zone));
-                calendar.set( YEAR, Integer.parseInt( year));
-                calendar.set( MONTH, Integer.parseInt( month) - 1);
-                calendar.set( DAY_OF_MONTH, Integer.parseInt( day));
-                calendar.set( HOUR_OF_DAY, Integer.parseInt( hour));
-                calendar.set( MINUTE, Integer.parseInt( min));
-                calendar.set( SECOND, Integer.parseInt( sec));
-                calendar.set( MILLISECOND, ms == null? 0 : (int) (Double.parseDouble( ms) * 1000));
-
-                dateTime = calendar.getTime();
-            }
-            catch( Exception ignore) {
-            }
+        OffsetDateTime dateTime = null;
+        try {
+            dateTime = OffsetDateTime.parse(dateString);
+        } catch (Exception ignore) {
         }
 
         return dateTime;

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/OpenAPIDeserializerTest.java

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import io.swagger.v3.core.util.Json;
-import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.OpenAPI;
@@ -50,14 +49,15 @@
 
 import java.math.BigDecimal;
 import java.nio.file.Files;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TimeZone;
 
 import static java.util.Collections.emptyList;
 import static org.testng.Assert.assertEquals;
@@ -1085,52 +1085,30 @@ public void testDeserializeDateTimeString() {
 
         Schema dateTimeModel = resolved.getComponents().getSchemas().get("DateTimeString");
         assertTrue(dateTimeModel instanceof DateTimeSchema);
-        List<Date> dateTimeValues = dateTimeModel.getEnum();
+        List<OffsetDateTime> dateTimeValues = dateTimeModel.getEnum();
         assertEquals(dateTimeValues.size(), 5);
         assertEquals(
           dateTimeValues.get(0),
           null);
         assertEquals(
-          dateTimeValues.get(1),
-          new Calendar.Builder()
-          .setDate( 2019, 0, 1)
-          .setTimeOfDay( 0, 0, 0, 0)
-          .setTimeZone( TimeZone.getTimeZone( "GMT"))
-          .build()
-          .getTime());
+            dateTimeValues.get(1),
+            OffsetDateTime.of(2019,1,1,0,0,0,0, ZoneOffset.UTC));
+
         assertEquals(
-          dateTimeValues.get(2),
-          new Calendar.Builder()
-          .setDate( 2018, 1, 2)
-          .setTimeOfDay( 23, 59, 59, 999)
-          .setTimeZone( TimeZone.getTimeZone( "GMT-05:00"))
-          .build()
-          .getTime());
+            dateTimeValues.get(2),
+            OffsetDateTime.of(2018,2,2,23,59,59,999000000, ZoneOffset.ofHours(-5)));
+
         assertEquals(
-          dateTimeValues.get(3),
-          new Calendar.Builder()
-          .setDate( 2017, 2, 3)
-          .setTimeOfDay( 11, 22, 33, 0)
-          .setTimeZone( TimeZone.getTimeZone( "GMT+06:00"))
-          .build()
-          .getTime());
+            dateTimeValues.get(3),
+            OffsetDateTime.of(2017,3,3,11,22,33,0, ZoneOffset.ofHours(6)));
+
         assertEquals(
-          dateTimeValues.get(4),
-          new Calendar.Builder()
-          .setDate( 2016, 3, 4)
-          .setTimeOfDay( 22, 33, 44, 555)
-          .setTimeZone( TimeZone.getTimeZone( "GMT"))
-          .build()
-          .getTime());
+            dateTimeValues.get(4),
+            OffsetDateTime.of(2016,4,4,22,33,44,555000000, ZoneOffset.UTC));
 
         assertEquals(
-          dateTimeModel.getDefault(),
-          new Calendar.Builder()
-          .setDate( 2019, 0, 1)
-          .setTimeOfDay( 0, 0, 0, 0)
-          .setTimeZone( TimeZone.getTimeZone( "GMT"))
-          .build()
-          .getTime());
+                dateTimeModel.getDefault(),
+                OffsetDateTime.of(2019,1,1,0,0,0,0, ZoneOffset.UTC));
 
         assertEquals(
           result.getMessages(),