- adds a serializer to handle actions & functions with primitive return types

Author: baywet

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

@@ -0,0 +1,47 @@
+package com.microsoft.graph.serializer;
+
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.microsoft.graph.logger.ILogger;
+
+public class EdmNativeTypeSerializer {
+    public static <T> T deserialize(final JsonElement json, final Class<T> type, final ILogger logger) throws JsonParseException {
+        if (json == null || !(type instanceof Class)) {
+			return null;
+        } else if(json.isJsonPrimitive()) {
+            return getPrimitiveValue(json, type);
+		} else if(json.isJsonObject()) {
+            final JsonElement element = json.getAsJsonObject().get("@odata.null");
+            if(element != null && element.isJsonPrimitive()) {
+                return getPrimitiveValue(element, type);
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+    @SuppressWarnings("unchecked")
+    private static <T> T getPrimitiveValue(final JsonElement json, final Class<T> type) {
+        if(type == Boolean.class) {
+            return (T) Boolean.valueOf(json.getAsBoolean());
+        } else if(type == String.class) {
+            return (T)json.getAsString();
+        } else if(type == Integer.class) {
+            return (T) Integer.valueOf(json.getAsInt());
+        } else if(type == UUID.class) {
+            return (T) UUID.fromString(json.getAsString());
+        } else if(type == Long.class) {
+            return (T) Long.valueOf(json.getAsLong());
+        } else if (type == Float.class) {
+            return (T) Float.valueOf(json.getAsFloat());
+        } else if (type == BigDecimal.class) {
+            return (T) json.getAsBigDecimal();
+        } else {
+            return null;
+        }
+    }
+}

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

@@ -37,10 +37,12 @@
 
 import com.microsoft.graph.models.extensions.TimeOfDay;
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.EnumSet;
 import java.util.GregorianCalendar;
+import java.util.UUID;
 
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
@@ -244,8 +246,78 @@ public TimeOfDay deserialize(final JsonElement json,
             }
         };
 
+        final JsonDeserializer<Boolean> booleanJsonDeserializer = new JsonDeserializer<Boolean>() {
+            @Override
+            public Boolean deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Boolean.class, logger);
+            }
+        };
+
+        final JsonDeserializer<String> stringJsonDeserializer = new JsonDeserializer<String>() {
+            @Override
+            public String deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, String.class, logger);
+            }
+        };
+
+        final JsonDeserializer<BigDecimal> bigDecimalJsonDeserializer = new JsonDeserializer<BigDecimal>() {
+            @Override
+            public BigDecimal deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, BigDecimal.class, logger);
+            }
+        };
+
+        final JsonDeserializer<Integer> integerJsonDeserializer = new JsonDeserializer<Integer>() {
+            @Override
+            public Integer deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Integer.class, logger);
+            }
+        };
+
+        final JsonDeserializer<Long> longJsonDeserializer = new JsonDeserializer<Long>() {
+            @Override
+            public Long deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Long.class, logger);
+            }
+        };
+
+        final JsonDeserializer<UUID> uuidJsonDeserializer = new JsonDeserializer<UUID>() {
+            @Override
+            public UUID deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, UUID.class, logger);
+            }
+        };
+
+        final JsonDeserializer<Float> floatJsonDeserializer = new JsonDeserializer<Float>() {
+            @Override
+            public Float deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Float.class, logger);
+            }
+        };
+
         return new GsonBuilder()
                 .excludeFieldsWithoutExposeAnnotation()
+                .registerTypeAdapter(Boolean.class, booleanJsonDeserializer)
+                .registerTypeAdapter(String.class, stringJsonDeserializer)
+                .registerTypeAdapter(Float.class, floatJsonDeserializer)
+                .registerTypeAdapter(Integer.class, integerJsonDeserializer)
+                .registerTypeAdapter(BigDecimal.class, bigDecimalJsonDeserializer)
+                .registerTypeAdapter(UUID.class, uuidJsonDeserializer)
+                .registerTypeAdapter(Long.class, longJsonDeserializer)
                 .registerTypeAdapter(Calendar.class, calendarJsonSerializer)
                 .registerTypeAdapter(Calendar.class, calendarJsonDeserializer)
                 .registerTypeAdapter(GregorianCalendar.class, calendarJsonSerializer)

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

@@ -0,0 +1,76 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import com.microsoft.graph.logger.DefaultLogger;
+
+import org.junit.Test;
+
+public class EdmNativeTypeSerializerTests {
+    @Test
+    public void testBoolean() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":true}";
+        final Boolean result = serializer.deserializeObject(source, Boolean.class);
+
+        assertEquals(Boolean.valueOf(true), result);
+    }
+    @Test
+    public void testInteger() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
+        final Integer result = serializer.deserializeObject(source, Integer.class);
+
+        assertEquals(Integer.valueOf(12), result);
+    }
+    @Test
+    public void testString() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":\"toto\"}";
+        final String result = serializer.deserializeObject(source, String.class);
+
+        assertEquals("toto", result);
+    }
+    @Test
+    public void testFloat() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12.5}";
+        final Float result = serializer.deserializeObject(source, Float.class);
+
+        assertEquals(Float.valueOf("12.5"), result);
+    }
+    @Test
+    public void testLong() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
+        final Long result = serializer.deserializeObject(source, Long.class);
+
+        assertEquals(Long.valueOf(12), result);
+    }
+    @Test
+    public void testBigDecimal() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
+        final BigDecimal result = serializer.deserializeObject(source, BigDecimal.class);
+
+        assertEquals(BigDecimal.valueOf(12), result);
+    }
+    @Test
+    public void testUUID() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":\"0E6558C3-9640-4385-860A-2A894AC5C246\"}";
+        final UUID result = serializer.deserializeObject(source, UUID.class);
+
+        assertEquals(UUID.fromString("0E6558C3-9640-4385-860A-2A894AC5C246"), result);
+    }
+}