move queue processing to other class

Author: fractalwrench

core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonNames.kt

@@ -1,15 +1,10 @@
 package com.fractalwrench.json2kotlin
 
-import com.google.gson.JsonElement
 
 // TODO move to a symbol pool class (or equivalent)
 
-internal fun nameForArrayField(sanitisedName: String) = "${sanitisedName}Array"
-
-internal fun nameForObjectInArray(it: IndexedValue<JsonElement>, sanitisedName: String): String {
-    return if (it.index > 0) "$sanitisedName${it.index + 1}" else sanitisedName
-}
-
+internal fun nameForArrayField(index: Int, identifier: String): String =
+        if (index == 0) identifier else "$identifier${index + 1}"
 
 // TODO move to a symbol pool class (or equivalent)
 

core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonProcessor.kt

@@ -82,8 +82,8 @@ internal class JsonProcessor { // TODO crappy name
             with(it.value) {
                 when {
                     isJsonPrimitive -> arrayTypes.add(typeForJsonPrimitive(asJsonPrimitive))
-                    isJsonArray -> arrayTypes.add(typeForJsonArray(asJsonArray, nameForArrayField(sanitisedName)))
-                    isJsonObject -> arrayTypes.add(typeForJsonObject(asJsonObject, nameForObjectInArray(it, sanitisedName)))
+                    isJsonArray -> arrayTypes.add(typeForJsonArray(asJsonArray, nameForArrayField(it.index, sanitisedName)))
+                    isJsonObject -> arrayTypes.add(typeForJsonObject(asJsonObject, nameForArrayField(it.index, sanitisedName)))
                     isJsonNull -> nullable = true
                     else -> throw IllegalStateException("Unexpected state in array")
                 }

core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonReader.kt

@@ -28,7 +28,7 @@ class JsonReader(private val jsonParser: JsonParser) {
      * Adds an object as root which wraps the array
      */
     private fun addRootWrapper(jsonArray: JsonArray, className: String): JsonObject {
-        return JsonObject().apply { add(nameForArrayField(className).decapitalize(), jsonArray) }
+        return JsonObject().apply { add(nameForArrayField(0, "${className}Array").decapitalize(), jsonArray) }
     }
 
 }

core/src/main/kotlin/com/fractalwrench/json2kotlin/ReverseJsonTreeTraverser.kt

@@ -61,5 +61,4 @@ internal class ReverseJsonTreeTraverser {
 
     private fun shouldAddToStack(element: JsonElement) = element.isJsonArray || element.isJsonObject
 
-
 }