use SealedTypeAdapterFactory.kt

Author: HighKo

kotlin-insight-client/kotlin-insight-client-api/src/main/kotlin/com/linkedplanet/kotlininsightclient/api/impl/GsonUtil.kt

@@ -32,8 +32,11 @@ class GsonUtil {
     companion object {
         fun gsonBuilder(): GsonBuilder = GsonBuilder()
             .registerTypeAdapter(ZonedDateTime::class.java, zonedDateTimeAdapter)
-            .registerTypeAdapterFactory(insightAttributeAdapter)
-            .registerTypeAdapterFactory(insightSchemaAttributeAdapter)
+            .registerTypeAdapterFactory(SealedTypeAdapterFactory.of(InsightAttribute::class))
+            .registerTypeAdapterFactory(SealedTypeAdapterFactory.of(ObjectTypeSchemaAttribute::class,
+                typeFieldName = "type",
+                jsonNameForType = { it.simpleName!!.removeSuffix("Schema") to it }
+            ))
 
 
         private val zonedDateTimeAdapter = object : TypeAdapter<ZonedDateTime>() {
@@ -45,52 +48,5 @@ class GsonUtil {
                 return ZonedDateTime.parse(`in`.nextString())
             }
         }
-
-        private val insightAttributeAdapter =
-            RuntimeTypeAdapterFactory.of(InsightAttribute::class.java, "type", true)
-                .registerSubtype(InsightAttribute.Text::class.java)
-                .registerSubtype(InsightAttribute.Integer::class.java)
-                .registerSubtype(InsightAttribute.Bool::class.java)
-                .registerSubtype(InsightAttribute.DoubleNumber::class.java)
-                .registerSubtype(InsightAttribute.Select::class.java)
-                .registerSubtype(InsightAttribute.Date::class.java)
-                .registerSubtype(InsightAttribute.Time::class.java)
-                .registerSubtype(InsightAttribute.DateTime::class.java)
-                .registerSubtype(InsightAttribute.Url::class.java)
-                .registerSubtype(InsightAttribute.Email::class.java)
-                .registerSubtype(InsightAttribute.Textarea::class.java)
-                .registerSubtype(InsightAttribute.Ipaddress::class.java)
-                .registerSubtype(InsightAttribute.Reference::class.java)
-                .registerSubtype(InsightAttribute.User::class.java)
-                .registerSubtype(InsightAttribute.Confluence::class.java)
-                .registerSubtype(InsightAttribute.Group::class.java)
-                .registerSubtype(InsightAttribute.Version::class.java)
-                .registerSubtype(InsightAttribute.Project::class.java)
-                .registerSubtype(InsightAttribute.Status::class.java)
-                .registerSubtype(InsightAttribute.Unknown::class.java)!!
-
-        private val insightSchemaAttributeAdapter =
-            RuntimeTypeAdapterFactory.of(ObjectTypeSchemaAttribute::class.java, "type", true)
-                .registerSubtype(ObjectTypeSchemaAttribute.TextSchema::class.java, "Text")
-                .registerSubtype(ObjectTypeSchemaAttribute.IntegerSchema::class.java, "Integer")
-                .registerSubtype(ObjectTypeSchemaAttribute.BoolSchema::class.java, "Bool")
-                .registerSubtype(ObjectTypeSchemaAttribute.DoubleNumberSchema::class.java, "DoubleNumber")
-                .registerSubtype(ObjectTypeSchemaAttribute.SelectSchema::class.java, "Select")
-                .registerSubtype(ObjectTypeSchemaAttribute.DateSchema::class.java, "Date")
-                .registerSubtype(ObjectTypeSchemaAttribute.TimeSchema::class.java, "Time")
-                .registerSubtype(ObjectTypeSchemaAttribute.DateTimeSchema::class.java, "DateTime")
-                .registerSubtype(ObjectTypeSchemaAttribute.UrlSchema::class.java, "Url")
-                .registerSubtype(ObjectTypeSchemaAttribute.EmailSchema::class.java, "Email")
-                .registerSubtype(ObjectTypeSchemaAttribute.TextareaSchema::class.java, "Textarea")
-                .registerSubtype(ObjectTypeSchemaAttribute.IpaddressSchema::class.java, "Ipaddress")
-                .registerSubtype(ObjectTypeSchemaAttribute.ReferenceSchema::class.java, "Reference")
-                .registerSubtype(ObjectTypeSchemaAttribute.UserSchema::class.java, "User")
-                .registerSubtype(ObjectTypeSchemaAttribute.ConfluenceSchema::class.java, "Confluence")
-                .registerSubtype(ObjectTypeSchemaAttribute.GroupSchema::class.java, "Group")
-                .registerSubtype(ObjectTypeSchemaAttribute.VersionSchema::class.java, "Version")
-                .registerSubtype(ObjectTypeSchemaAttribute.ProjectSchema::class.java, "Project")
-                .registerSubtype(ObjectTypeSchemaAttribute.StatusSchema::class.java, "Status")
-                .registerSubtype(ObjectTypeSchemaAttribute.UnknownSchema::class.java, "Unknown")
     }
-
 }