bugfix: fix #94

Author: kezhenxu94

src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/KotlinDataClass.kt

@@ -23,7 +23,11 @@ data class KotlinDataClass(
                     append(annotationsCode).append("\n")
                 }
             }
-            append("data class ").append(name).append("(").append("\n")
+            if (properties.isEmpty()) {
+                append("class ").append(name).append("(").append("\n")
+            } else {
+                append("data class ").append(name).append("(").append("\n")
+            }
             properties.forEach {
                 val code = it.getCode()
                 val addIndentCode = code.split("\n").joinToString("\n") { indent + it }
@@ -99,4 +103,4 @@ data class KotlinDataClass(
 
     }
 
-}
+}

src/main/kotlin/wu/seal/jsontokotlin/utils/SimplifiedMethods.kt

@@ -8,6 +8,8 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.project.Project
 import wu.seal.jsontokotlin.ConfigManager
+import java.lang.IllegalStateException
+import java.util.regex.Pattern
 
 /**
  * File contains functions which simply other functions's invoke
@@ -50,7 +52,12 @@ fun getClassesStringList(classesString: String): List<String> {
  * export the class name from class block string
  */
 fun getClassNameFromClassBlockString(classBlockString: String): String {
-    return classBlockString.substringAfter("data class").substringBefore("(").trim()
+    val pattern = Pattern.compile("(data )?class (?<className>[^(]+).*")
+    val matcher = pattern.matcher(classBlockString)
+    if (matcher.find()) {
+        return matcher.group("className").trim()
+    }
+    throw IllegalStateException("cannot find class name in classBlockString: $classBlockString")
 }
 
 fun replaceClassNameToClassBlockString(classBlockString: String, newClassName: String): String {
@@ -88,4 +95,4 @@ fun <E> List<E>.firstIndexAfterSpecificIndex(element: E, afterIndex: Int): Int {
 
 fun getCommentCode(comment: String): String {
     return comment.replace(Regex("[\n\r]"), "")
-}
+}

src/main/kotlin/wu/seal/jsontokotlin/utils/classblockparse/NestedClassModelClassesCodeParser.kt

@@ -31,7 +31,7 @@ class NestedClassModelClassesCodeParser(private val nestedClassCode: String) {
         var backParenthesesCount = 0
         var backBigParenthesesCount = 0
         lines.forEach {
-            if (it.startsWith("data class")) {
+            if (it.matches("^(data )?class.+".toRegex())) {
                 classStringBuilder.append("\n")
                 classStringBuilder.append(it)
                 dataclassStringCount++
@@ -58,4 +58,4 @@ class NestedClassModelClassesCodeParser(private val nestedClassCode: String) {
         }
         return classStrings
     }
-}
+}

src/test/kotlin/wu/seal/jsontokotlin/regression/Issue094Test.kt

@@ -1,9 +1,8 @@
 package wu.seal.jsontokotlin.regression
 
 import com.winterbe.expekt.should
-import org.junit.Before
 import org.junit.Test
-import wu.seal.jsontokotlin.KotlinCodeMaker
+import wu.seal.jsontokotlin.KotlinDataClassCodeMaker
 import wu.seal.jsontokotlin.test.TestConfig
 
 /**
@@ -15,22 +14,19 @@ class Issue094Test {
     private val testJson = """
     { "test": {} }
     """.trimIndent()
-    private val expected = """
-data class A(
-    @SerializedName("test") val test: Test = Test()
+    private val expected = """data class A(
+    @SerializedName("test")
+    val test: Test = Test()
 ) {
-    
     class Test(
     )
 }"""
 
-    @Before
-    fun setUp() {
-        TestConfig.setToTestInitState()
-    }
-
     @Test
-    fun testIssue087() {
-        KotlinCodeMaker("A", testJson).makeKotlinData().should.be.equal(expected)
+    fun testIssue094() {
+        TestConfig.setToTestInitState()
+        val generated = KotlinDataClassCodeMaker("A", testJson).makeKotlinDataClassCode()
+        println("generated = ${generated}")
+        generated.should.be.equal(expected)
     }
 }