Update json check logic and remove getText method

kozaxinan · Oct 9, 2020 · 5c79732 · 5c79732
1 parent f855193
commit 5c79732
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 28 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
@@ -71,15 +71,11 @@ internal class NetworkLayerClassJsonDetector : RetrofitReturnTypeDetector() {
     }
 
     private fun hasJsonNameAnnotation(field: UField): Boolean {
-      return try {
-        field.text.contains("@Json")
-      } catch (ignored: Throwable) {
-        context
-          .evaluator
-          .getAllAnnotations(field as UAnnotated, true)
-          .mapNotNull { uAnnotation -> uAnnotation.qualifiedName }
-          .any { it.endsWith("Json") }
-      }
+      return context
+        .evaluator
+        .getAllAnnotations(field as UAnnotated, true)
+        .mapNotNull { uAnnotation -> uAnnotation.qualifiedName }
+        .any { it.endsWith("Json") }
     }
 
     private fun hasJsonClassAnnotation(clazz: PsiClass): Boolean {

diff --git a/checks/src/test/java/com/kozaxinan/android/checks/NetworkLayerClassJsonDetectorTest.kt b/checks/src/test/java/com/kozaxinan/android/checks/NetworkLayerClassJsonDetectorTest.kt
@@ -103,22 +103,22 @@ internal class NetworkLayerClassJsonDetectorTest {
                 import com.squareup.moshi.JsonClass
                 
                 @JsonClass(generateAdapter = true)
-                data class Dto(
+                internal data class Dto(
+                    @Json(name = "inner") val inners: List<InnerDto>
+                ) {
+                
+                  @JsonClass(generateAdapter = true)
+                  data class InnerDto(
                     @Json(name = "type") val type: PremiumType
-                )
-                """.trimIndent()
-            ),
-            kotlin(
-                """
-                package foo
-
-                import com.squareup.moshi.Json
-                import com.squareup.moshi.JsonClass
+                  ) {
+                  
+                    enum class PremiumType {
 
-                enum class PremiumType {
-
-                  @Json(name = "SCHUFA") SCHUFA,
-                  ARVATO;
+                      @Json(name = "SCHUFA") 
+                      SCHUFA,
+                      ARVATO
+                    }
+                  }
                 }
                 """.trimIndent()
             )
@@ -127,11 +127,7 @@ internal class NetworkLayerClassJsonDetectorTest {
         .run()
         .expect(
             """
-              src/foo/Api.kt:8: Information: Return type doesn't have @JsonClass annotation for [KtLightClassImpl:enum class PremiumType {
-
-                @Json(name = "SCHUFA") SCHUFA,
-                ARVATO;
-              }] classes. [NetworkLayerClassJsonClassRule]
+              src/foo/Api.kt:8: Information: Return type doesn't have @JsonClass annotation for [PsiClass:PremiumType] classes. [NetworkLayerClassJsonClassRule]
                 fun get(): Dto
                     ~~~
               src/foo/Api.kt:8: Information: Return type doesn't have @Json annotation for [ARVATO] fields. [NetworkLayerClassJsonRule]