Merge pull request #170 from kitherill/bugfix/time_of_day_deseralization

Fix for #168 TimeOfDay deseralization

Author: deepak2016

src/main/java/com/microsoft/graph/models/extensions/TimeOfDay.java

@@ -1,6 +1,7 @@
 package com.microsoft.graph.models.extensions;
 
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Locale;
 
@@ -51,7 +52,7 @@ public static TimeOfDay parse(final String timeStr) throws ParseException {
         // unpack this array
         int hour = Integer.parseInt(timeInfo[indHour]);
         int minute = Integer.parseInt(timeInfo[indMinute]);
-        int second = Integer.parseInt(timeInfo[indSecond]);
+        int second = new BigDecimal(timeInfo[indSecond]).intValue();
 
         return new TimeOfDay(hour, minute, second);
     }

src/main/java/com/microsoft/graph/serializer/GsonFactory.java

@@ -34,6 +34,7 @@
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.models.extensions.DateOnly;
 
+import com.microsoft.graph.models.extensions.TimeOfDay;
 import java.lang.reflect.Type;
 import java.text.ParseException;
 import java.util.Calendar;
@@ -209,6 +210,20 @@ public Duration deserialize(final JsonElement json,
                 }
             }
         };
+
+        final JsonDeserializer<TimeOfDay> timeOfDayJsonDeserializer = new JsonDeserializer<TimeOfDay>() {
+            @Override
+            public TimeOfDay deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                try {
+                    return TimeOfDay.parse(json.getAsString());
+                } catch (Exception e) {
+                    return null;
+                }
+            }
+        };
+
         return new GsonBuilder()
                 .excludeFieldsWithoutExposeAnnotation()
                 .registerTypeAdapter(Calendar.class, calendarJsonSerializer)
@@ -223,6 +238,7 @@ public Duration deserialize(final JsonElement json,
                 .registerTypeAdapter(EnumSet.class, enumSetJsonDeserializer)
                 .registerTypeAdapter(Duration.class, durationJsonSerializer)
                 .registerTypeAdapter(Duration.class, durationJsonDeserializer)
+                .registerTypeAdapter(TimeOfDay.class, timeOfDayJsonDeserializer)
                 .registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger))
                 .create();
     }

src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java

@@ -36,4 +36,12 @@ public void testTimeOfDayDeserializerIndefinite() throws Exception{
         assertEquals(1, time.getSecond());
     }
 
+    @Test
+    public void testTimeOfDayDeserializerWithFraction() throws Exception{
+        TimeOfDay time = TimeOfDay.parse("12:30:44.0000000");
+        assertEquals(12, time.getHour());
+        assertEquals(30, time.getMinute());
+        assertEquals(44, time.getSecond());
+    }
+
 }