addressed review comments

apache · Sep 18, 2024 · 8ccdba4 · 8ccdba4
1 parent e2d921a
commit 8ccdba4
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/gobblin-api/src/main/java/org/apache/gobblin/util/io/GsonInterfaceAdapter.java b/gobblin-api/src/main/java/org/apache/gobblin/util/io/GsonInterfaceAdapter.java
@@ -193,13 +193,13 @@ private <S> S readValue(JsonObject jsonObject, TypeToken<S> defaultTypeToken) th
 
   public static <T> Gson getGson(Class<T> clazz) {
     Gson gson = new GsonBuilder()
-        .setObjectToNumberStrategy(INTEGERNUMBERPOLICY.INTEGER_OR_LONG_OR_DOUBLE)
+        .setObjectToNumberStrategy(CustomToNumberPolicy.INTEGER_OR_LONG_OR_DOUBLE)
         .registerTypeAdapterFactory(new GsonInterfaceAdapter(clazz))
         .create();
     return gson;
   }
 
-  public enum INTEGERNUMBERPOLICY implements ToNumberStrategy {
+  public enum CustomToNumberPolicy implements ToNumberStrategy {
     INTEGER_OR_LONG_OR_DOUBLE {
       @Override
       public Number readNumber(JsonReader in) throws IOException {

diff --git a/gobblin-api/src/test/java/org/apache/gobblin/util/io/GsonInterfaceAdapterTest.java b/gobblin-api/src/test/java/org/apache/gobblin/util/io/GsonInterfaceAdapterTest.java
@@ -51,14 +51,51 @@ public void testObjectToIntegerDeserialize() {
     String ser = gson.toJson(test);
     Object deser = gson.fromJson(ser, Object.class);
     Assert.assertNotEquals(test, deser);
+    Assert.assertTrue(deser instanceof Double);
 
     Gson customGson = new GsonBuilder()
-        .setObjectToNumberStrategy(GsonInterfaceAdapter.INTEGERNUMBERPOLICY.INTEGER_OR_LONG_OR_DOUBLE)
+        .setObjectToNumberStrategy(GsonInterfaceAdapter.CustomToNumberPolicy.INTEGER_OR_LONG_OR_DOUBLE)
         .create();
 
     Object deser2 = customGson.fromJson(ser, Object.class);
     Assert.assertEquals(test, deser2);
+    Assert.assertTrue(deser2 instanceof Integer);
+  }
+
+  @Test
+  public void testObjectToLongDeserialize() {
+    Gson gson = new GsonBuilder().create();
+    Long test = 1234567890123456789L;
+    String ser = gson.toJson(test);
+    Object deser = gson.fromJson(ser, Object.class);
+    Assert.assertNotEquals(test, deser);
+    Assert.assertTrue(deser instanceof Double);
 
+    Gson customGson = new GsonBuilder()
+        .setObjectToNumberStrategy(GsonInterfaceAdapter.CustomToNumberPolicy.INTEGER_OR_LONG_OR_DOUBLE)
+        .create();
+
+    Object deser2 = customGson.fromJson(ser, Object.class);
+    Assert.assertEquals(test, deser2);
+    Assert.assertTrue(deser2 instanceof Long);
+  }
+
+  @Test
+  public void testObjectToDoubleDeserialize() {
+    Gson gson = new GsonBuilder().create();
+    Double test = 5.0;
+    String ser = gson.toJson(test);
+    Object deser = gson.fromJson(ser, Object.class);
+    Assert.assertEquals(test, deser);
+    Assert.assertTrue(deser instanceof Double);
+
+    Gson customGson = new GsonBuilder()
+        .setObjectToNumberStrategy(GsonInterfaceAdapter.CustomToNumberPolicy.INTEGER_OR_LONG_OR_DOUBLE)
+        .create();
+
+    Object deser2 = customGson.fromJson(ser, Object.class);
+    Assert.assertEquals(test, deser2);
+    Assert.assertTrue(deser2 instanceof Double);
   }
 
 }