🐛 fix JsonSchema type error when refer to non-object definitions (#368)

Author: TedZen

src/main/kotlin/wu/seal/jsontokotlin/utils/classgenerator/DataClassGeneratorByJSONSchema.kt

@@ -56,18 +56,8 @@ class DataClassGeneratorByJSONSchema(private val rootClassName: String, private
         isRequired: Boolean,
         includeConst: Boolean = true
     ): Property {
-        val typeClass = if (jsonProp.typeString == "array") {
-            val innerProperty = resolveProperty(
-                jsonProp.items
-                    ?: throw IllegalArgumentException("Array `items` must be defined (property: $propertyName)"),
-                propertyName,
-                false
-            )
-            GenericListClass(generic = innerProperty.typeObject)
-        } else {
-            val (jsonClassName, realDef) = getRealDefinition(jsonProp)
-            resolveTypeClass(realDef.typeString, jsonClassName, realDef, propertyName)
-        }
+        val (jsonClassName, realDef) = getRealDefinition(jsonProp)
+        val typeClass = resolveTypeClass(realDef.typeString, jsonClassName, realDef, propertyName)
         val value = if (isRequired || !jsonProp.isTypeNullable) getDefaultValue(typeClass.name) else null
         return Property(
             originName = propertyName,
@@ -89,6 +79,15 @@ class DataClassGeneratorByJSONSchema(private val rootClassName: String, private
     ): KotlinClass {
         val simpleName = jsonClassName ?: propertyName.capitalize()
         return when {
+            realDefJsonType == "array" -> {
+                val innerProperty = resolveProperty(
+                    realDef.items
+                        ?: throw IllegalArgumentException("Array `items` must be defined (property: $propertyName)"),
+                    propertyName,
+                    false
+                )
+                GenericListClass(generic = innerProperty.typeObject)
+            }
             checkEnum && realDef.enum != null -> resolveEnumClass(realDef, simpleName)
             checkSealed && realDef.anyOf != null -> resolveSealedClass(realDef, simpleName)
             realDefJsonType != null && (jsonClassName != null || realDefJsonType == "object") -> generateClass(
@@ -204,11 +203,13 @@ class DataClassGeneratorByJSONSchema(private val rootClassName: String, private
     /** resolves `ref`, `oneOf` and `allOf` then returns a real property definition */
     private fun getRealDefinition(def: PropertyDef): Pair<String? /* ClassName */, PropertyDef> {
         return when {
+            (def.typeString != null && def.typeString != "object") -> Pair(null, def)
             (def.properties != null) -> Pair(def.tryGetClassName(), def)
-            (def.ref != null) -> Pair(
-                def.tryGetClassName(),
-                getRealDefinition(jsonSchema.resolveDefinition(def.ref)).second
-            )
+            (def.ref != null) -> {
+                val (cls, pd) = getRealDefinition(jsonSchema.resolveDefinition(def.ref))
+                val className = if (pd.typeString != "object" && pd.enum.isNullOrEmpty()) cls else def.tryGetClassName()
+                Pair(className, pd)
+            }
             (def.oneOf != null) -> getRealDefinition(def.oneOf.firstOrNull { it.typeString != "null" }
                 ?: def.oneOf.first())
             (def.allOf != null) -> {

src/test/kotlin/wu/seal/jsontokotlin/JsonSchemaGeneratorTest.kt

@@ -1076,7 +1076,7 @@ enum class LogEventType(val value: Int) {
                 /**
                  * Gets a collection JsonConverter that will be used during serialization.
                  */
-                val Converters: JsonConverterCollection?,
+                val Converters: List<JsonConverter>?,
                 /**
                  * Gets or sets the contract resolver used by the serializer whenserializing .NET objects to JSON and vice versa.
                  */
@@ -1131,11 +1131,17 @@ enum class LogEventType(val value: Int) {
                 val CheckAdditionalContent: Boolean
             )
 
+            /**
+             * Used to resolve references when serializing and deserializing JSON by the JsonSerializer.
+             */
+            class IReferenceResolver
 
+            class SerializationBinder
 
-
-
-
+            /**
+             * Allows users to control class loading and mandate what class to load.
+             */
+            class ISerializationBinder
 
             /**
              * Represents a trace writer.
@@ -1147,7 +1153,7 @@ enum class LogEventType(val value: Int) {
                 val LevelFilter: TraceLevel?
             )
 
-
+            class IEqualityComparer
 
             /**
              * Specifies type name handling options for the JsonSerializer.
@@ -1266,9 +1272,24 @@ enum class LogEventType(val value: Int) {
                 Ignore(2);
             }
 
+            /**
+             * Converts an object to and from JSON.
+             */
+            data class JsonConverter(
+                /**
+                 * Gets a value indicating whether this JsonConverter can read JSON.
+                 */
+                val CanRead: Boolean,
+                /**
+                 * Gets a value indicating whether this JsonConverter can write JSON.
+                 */
+                val CanWrite: Boolean
+            )
 
-
-
+            /**
+             * Used by JsonSerializer to resolve a JsonContract for a given Type.
+             */
+            class IContractResolver
 
             data class StreamingContext(
                 val State: StreamingContextStates?,

src/test/kotlin/wu/seal/jsontokotlin/TestIssue329.kt

@@ -98,17 +98,17 @@ class TestIssue329 {
             ) {
                 data class Target(
                     @SerializedName("A")
-                    val a: Aa = Aa(),
+                    val a: String = "",
                     @SerializedName("B")
                     val b: Bb = Bb()
                 ) {
                     data class Bb(
                         @SerializedName("Bba")
-                        val bba: Aa = Aa(),
+                        val bba: String = "",
                         @SerializedName("Bbb")
-                        val bbb: Aa = Aa(),
+                        val bbb: String = "",
                         @SerializedName("Bbc")
-                        val bbc: Aa = Aa()
+                        val bbc: String = ""
                     )
                 }
             }