Release 2.2.0.1-eap

update some code

Author: sealkingking

build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.intellij'
 
 group 'wu.seal'
-version '2.2-eap'
+version '2.2.0.1-eap'
 
 intellij {
     version '2017.1'

src/main/kotlin/wu/seal/jsontokotlin/interceptor/InterceptorManager.kt

@@ -4,21 +4,22 @@ import wu.seal.jsontokotlin.ConfigManager
 
 object InterceptorManager {
 
-    fun getEnabledKotlinDataClassInterceptors() :List<IKotlinDataClassInterceptor>{
+    fun getEnabledKotlinDataClassInterceptors(): List<IKotlinDataClassInterceptor> {
 
-        val interceptors = mutableListOf<IKotlinDataClassInterceptor>()
-        if (ConfigManager.enableMinimalAnnotation) {
-            interceptors.add(MinimalAnnotationKotlinDataClassInterceptor())
-        }
+        return mutableListOf<IKotlinDataClassInterceptor>().apply {
+
+            if (ConfigManager.enableMinimalAnnotation) {
+                add(MinimalAnnotationKotlinDataClassInterceptor())
+            }
 
-        if (ConfigManager.parenClassTemplate.isNotBlank()) {
-            interceptors.add(ParentClassTemplateKotlinDataClassInterceptor())
+            if (ConfigManager.parenClassTemplate.isNotBlank()) {
+                add(ParentClassTemplateKotlinDataClassInterceptor())
+            }
         }
-        return interceptors
     }
 
 
-    fun getEnabledImportClassDeclarationInterceptors(): List<IImportClassDeclarationInterceptor>{
+    fun getEnabledImportClassDeclarationInterceptors(): List<IImportClassDeclarationInterceptor> {
 
         return mutableListOf<IImportClassDeclarationInterceptor>().apply {
 

src/main/kotlin/wu/seal/jsontokotlin/interceptor/MinimalAnnotationKotlinDataClassInterceptor.kt

@@ -4,6 +4,8 @@ import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
 
 /**
  * interceptor to make the code to be like the minimal annotation
+ * which means that if the property name is the same as raw name then remove the
+ * annotations contains %s
  */
 class MinimalAnnotationKotlinDataClassInterceptor() : IKotlinDataClassInterceptor {
 
@@ -27,14 +29,7 @@ class MinimalAnnotationKotlinDataClassInterceptor() : IKotlinDataClassIntercepto
             }
         }
 
-        return if (kotlinDataClass.nestedClasses.isNotEmpty()) {
-
-            val newNestedClasses = kotlinDataClass.nestedClasses.map { intercept(it) }
-            kotlinDataClass.copy(properties = newProperties, nestedClasses = newNestedClasses)
-
-        } else {
-            kotlinDataClass.copy(properties = newProperties)
-        }
+        return kotlinDataClass.copy(properties = newProperties)
 
     }