Change Serializer

Author: lefterisKoutrakis

Identity/src/main/java/gr/indice/identity/protocols/Grand.kt

@@ -1,19 +1,17 @@
 package gr.indice.identity.protocols
 
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.ToNumberPolicy
+import gr.indice.identity.utils.Serializer
 
 interface OAuth2Grant {
     val params: Map<String, String>
     val grantType: String
 }
 
 fun OAuth2Grant.with(authorizationDetails: Any): OAuth2Grant {
-    val extras = "authorization_details" to GsonBuilder()
-        .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
-        .create()
-        .toJson(authorizationDetails)
+
+    Serializer.moshi.adapter(Any::class.java).run { toJson(authorizationDetails) }
+
+    val extras = "authorization_details" to Serializer.moshi.adapter(Any::class.java).run { toJson(authorizationDetails) }
     //Gson().toJson(authorizationDetails)
     return OAuthParamsWrapper(parent = this, extras = extras)
 }

Identity/src/main/java/gr/indice/identity/utils/Serializer.kt

@@ -1,20 +1,27 @@
 package gr.indice.identity.utils
 
 import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonDataException
 import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import gr.indice.identity.adapters.OffsetDateTimeAdapter
 import gr.indice.identity.adapters.UUIDAdapter
+import gr.indice.identity.utils.Serializer.moshiBuilder
+import java.lang.reflect.Type
+import java.math.BigDecimal
 
 object Serializer {
 
     @JvmStatic
     val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(SmartAnyAdapterFactory())
         .add(KotlinJsonAdapterFactory())
         .add(OffsetDateTimeAdapter())
         .add(UUIDAdapter())
-        .add(IntOrDoubleAdapter())
         // .add(OffsetDateTimeAdapter())
         // .add(LocalDateTimeAdapter())
         // .add(LocalDateAdapter())
@@ -53,11 +60,88 @@ object Serializer {
         }
     }
 
-    class IntOrDoubleAdapter {
-        @FromJson
-        fun fromJson(reader: JsonReader): Number {
-            val num = reader.nextDouble()
-            return if (num % 1 == 0.0) num.toInt() else num
+    class SmartAnyAdapterFactory : JsonAdapter.Factory {
+        override fun create(type: Type, annotations: Set<Annotation>, moshi: Moshi): JsonAdapter<*>? {
+            val raw = Types.getRawType(type)
+
+            return when (raw) {
+                Any::class.java -> SmartNumberAnyAdapter()
+                else -> null
+            }
+        }
+    }
+
+    class SmartNumberAnyAdapter() : JsonAdapter<Any>() {
+        override fun fromJson(reader: JsonReader): Any? {
+            return when (reader.peek()) {
+                JsonReader.Token.BEGIN_OBJECT -> {
+                    val map = mutableMapOf<String, Any?>()
+                    reader.beginObject()
+                    while (reader.hasNext()) {
+                        map[reader.nextName()] = fromJson(reader)
+                    }
+                    reader.endObject()
+                    map
+                }
+
+                JsonReader.Token.BEGIN_ARRAY -> {
+                    val list = mutableListOf<Any?>()
+                    reader.beginArray()
+                    while (reader.hasNext()) {
+                        list.add(fromJson(reader))
+                    }
+                    reader.endArray()
+                    list
+                }
+
+                JsonReader.Token.STRING  -> reader.nextString()
+                JsonReader.Token.BOOLEAN -> reader.nextBoolean()
+                JsonReader.Token.NULL    -> reader.nextNull()
+                JsonReader.Token.NUMBER  -> parseNumber(reader.nextString())
+
+                else -> throw JsonDataException("Unexpected token ${reader.peek()}")
+            }
+        }
+
+        override fun toJson(writer: JsonWriter, value: Any?) {
+            when (value) {
+                null -> writer.nullValue()
+                is Number -> writer.value(value)
+                is Boolean -> writer.value(value)
+                is String -> writer.value(value)
+
+                is List<*> -> {
+                    writer.beginArray()
+                    value.forEach { toJson(writer, it) }
+                    writer.endArray()
+                }
+
+                is Map<*, *> -> {
+                    writer.beginObject()
+                    value.forEach { (k, v) ->
+                        writer.name(k.toString())
+                        toJson(writer, v)
+                    }
+                    writer.endObject()
+                }
+
+                else -> throw JsonDataException("Unsupported type ${value::class}")
+            }
+        }
+
+        private fun parseNumber(raw: String): Number {
+            val dec = BigDecimal(raw)
+
+            return try {
+                dec.intValueExact()
+            } catch (_: Exception) {
+                try {
+                    dec.longValueExact()
+                } catch (_: Exception) {
+                    if (dec.scale() == 0) dec
+                    else dec
+                }
+            }
         }
     }
-}
+}