Fix issues with java file without any constructor

kozaxinan · Oct 2, 2020 · 28058ea · 28058ea
1 parent a30b477
commit 28058ea
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/checks/src/main/java/com/kozaxinan/android/checks/NetworkLayerClassJsonDetector.kt b/checks/src/main/java/com/kozaxinan/android/checks/NetworkLayerClassJsonDetector.kt
@@ -29,23 +29,26 @@ internal class NetworkLayerClassJsonDetector : RetrofitReturnTypeDetector() {
           .mapNotNull { it.containingClass }
           .toSet()
 
-      val constructorParamsWithJson: MutableList<String> = mutableListOf()
+      val checkedFields = allFields
+          .filterNot(::hasJsonNameAnnotation)
+          .map { it.name }
+          .toMutableList()
+
+      if (checkedFields.isNotEmpty()) {
+          val constructorParamsWithJson: MutableList<String> = mutableListOf()
 
-      val constructorParameter: List<JvmParameter> = classes
-          .map { it.constructors.first().parameters }
-          .fold(mutableListOf(), { acc, arrayOfJvmParameters -> acc.apply { addAll(arrayOfJvmParameters) } })
+          val constructorParameter: List<JvmParameter> = classes
+            .mapNotNull { it.constructors.firstOrNull()?.parameters }
+            .fold(mutableListOf(), { acc, arrayOfJvmParameters -> acc.apply { addAll(arrayOfJvmParameters) } })
 
-      constructorParameter.forEach { parameter ->
-          val name = parameter.name
-          if (name != null && parameter.annotations.any { annotation -> annotation.qualifiedName?.endsWith("Json") == true }) {
-            constructorParamsWithJson.add(name)
+          constructorParameter.forEach { parameter ->
+            val name = parameter.name
+            if (name != null && parameter.annotations.any { annotation -> annotation.qualifiedName?.endsWith("Json") == true }) {
+              constructorParamsWithJson.add(name)
+            }
           }
+          checkedFields -= constructorParamsWithJson
       }
-
-      val checkedFields = allFields
-          .filterNot(::hasJsonNameAnnotation)
-          .map { it.name } - constructorParamsWithJson
-
       if (checkedFields.isNotEmpty()) {
         context.report(
             issue = ISSUE_NETWORK_LAYER_CLASS_JSON_RULE,

diff --git a/checks/src/test/java/com/kozaxinan/android/checks/NetworkLayerClassJsonDetectorTest.kt b/checks/src/test/java/com/kozaxinan/android/checks/NetworkLayerClassJsonDetectorTest.kt
@@ -505,11 +505,6 @@ internal class NetworkLayerClassJsonDetectorTest {
                 class Dto {
                     @Json(name = "a") final int totalResults;
                     @Json(name = "b") final int totalNewResults;
-
-                    Dto(int totalResults, int totalNewResults) {
-                      this.totalResult = totalResults;
-                      this.totalNewResults = totalNewResults;
-                    }
                 }
                 """.trimIndent()
             )