Merge pull request #360 from Kopilov/enum

Enum values with their own anonymous classes

Author: cbeust

klaxon/src/main/kotlin/com/beust/klaxon/EnumConverter.kt

@@ -6,7 +6,14 @@ package com.beust.klaxon
 class EnumConverter: Converter {
     override fun toJson(value: Any): String {
         val enum = value as Enum<*>
-        val field = value.javaClass.declaredFields.find { it.name == enum.name }
+        val enumClass = if (value.javaClass.isEnum) {
+            value.javaClass
+        } else if (value.javaClass.superclass.isEnum) {
+            value.javaClass.superclass
+        } else {
+            throw IllegalArgumentException("Could not find associated enum class for $value")
+        }
+        val field = enumClass.declaredFields.find { it.name == enum.name }
             ?: throw IllegalArgumentException("Could not find associated enum field for $value")
         return "\"${field.getAnnotation(Json::class.java)?.name ?: enum.name}\""
     }

klaxon/src/test/kotlin/com/beust/klaxon/Issue311Test.kt

@@ -0,0 +1,26 @@
+
+package com.beust.klaxon
+
+import org.assertj.core.api.Assertions.assertThat
+import org.testng.annotations.Test
+
+
+@Test(description = "Serialing Enum values with their own anonymous classes")
+class Issue311Test {
+    enum class ProtocolState {
+        WAITING {
+            override fun signal() = TALKING
+        },
+        TALKING {
+            override fun signal() = WAITING
+        };
+        abstract fun signal(): ProtocolState
+    }
+
+    class Klass(val state: ProtocolState)
+
+    fun issue311() {
+        val klass = Klass(ProtocolState.WAITING)
+        assertThat(Klaxon().toJsonString(klass)).isEqualTo("""{"state" : "WAITING"}""")
+    }
+}