Include java getters for ignore checks (#842)

Co-authored-by: Shane Myrick <[email protected]>

Author: smyrick

graphql-kotlin-schema-generator/src/main/kotlin/com/expediagroup/graphql/generator/extensions/kPropertyExtensions.kt

@@ -33,6 +33,7 @@ internal fun KProperty<*>.isPropertyGraphQLID(parentClass: KClass<*>): Boolean =
 internal fun KProperty<*>.isPropertyGraphQLIgnored(parentClass: KClass<*>): Boolean = when {
     this.isGraphQLIgnored() -> true
     getConstructorParameter(parentClass)?.isGraphQLIgnored().isTrue() -> true
+    this.getter.isGraphQLIgnored() -> true
     else -> false
 }
 

graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/extensions/KPropertyExtensionsKtTest.kt

@@ -45,6 +45,9 @@ internal class KPropertyExtensionsKtTest {
         @GraphQLName("nameOnConstructor")
         val constructorAnnotation: String,
 
+        @get:GraphQLIgnore
+        val getterAnnotation: String,
+
         val noAnnotations: String
     )
 
@@ -59,6 +62,7 @@ internal class KPropertyExtensionsKtTest {
     fun isPropertyGraphQLIgnored() {
         assertTrue(MyDataClass::propertyAnnotation.isPropertyGraphQLIgnored(MyDataClass::class))
         assertTrue(MyDataClass::constructorAnnotation.isPropertyGraphQLIgnored(MyDataClass::class))
+        assertTrue(MyDataClass::getterAnnotation.isPropertyGraphQLIgnored(MyDataClass::class))
         assertFalse(MyDataClass::noAnnotations.isPropertyGraphQLIgnored(MyDataClass::class))
     }
 

graphql-kotlin-schema-generator/src/test/kotlin/com/expediagroup/graphql/generator/types/GenerateDirectiveTest.kt

@@ -18,6 +18,7 @@ package com.expediagroup.graphql.generator.types
 
 import com.expediagroup.graphql.annotations.GraphQLDescription
 import com.expediagroup.graphql.annotations.GraphQLDirective
+import com.expediagroup.graphql.annotations.GraphQLIgnore
 import com.expediagroup.graphql.generator.SchemaGenerator
 import com.expediagroup.graphql.generator.extensions.isTrue
 import com.expediagroup.graphql.getTestSchemaConfigWithMockedDirectives
@@ -28,12 +29,19 @@ import kotlin.reflect.KClass
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-internal class GenerateDirectiveTest {
+class GenerateDirectiveTest {
 
     @GraphQLDirective
-    internal annotation class DirectiveWithString(val string: String)
+    annotation class DirectiveWithString(val string: String)
 
-    internal enum class Type {
+    @GraphQLDirective
+    annotation class DirectiveWithIgnoredArgs(
+        val string: String,
+        @get:GraphQLIgnore
+        val ignoreMe: String
+    )
+
+    enum class Type {
         @DirectiveWithString("my string")
         @DirectiveWithClass(SimpleDirective::class)
         ONE,
@@ -43,12 +51,12 @@ internal class GenerateDirectiveTest {
     }
 
     @GraphQLDirective
-    internal annotation class DirectiveWithEnum(val type: Type)
+    annotation class DirectiveWithEnum(val type: Type)
 
     @GraphQLDirective
-    internal annotation class DirectiveWithClass(val kclass: KClass<*>)
+    annotation class DirectiveWithClass(val kclass: KClass<*>)
 
-    internal class MyClass {
+    class MyClass {
 
         fun noAnnotation(string: String) = string
 
@@ -69,9 +77,12 @@ internal class GenerateDirectiveTest {
 
         @DirectiveWithClass(kclass = Type::class)
         fun directiveWithClass(string: String) = string
+
+        @DirectiveWithIgnoredArgs(string = "foo", ignoreMe = "bar")
+        fun directiveWithIgnoredArgs(string: String) = string
     }
 
-    internal data class MyClassWithConstructorArgs(
+    data class MyClassWithConstructorArgs(
         @SimpleDirective val noPrefix: String,
         @property:SimpleDirective val propertyPrefix: String,
         val noDirective: String
@@ -178,6 +189,14 @@ internal class GenerateDirectiveTest {
         assertEquals(expected = 0, actual = noPrefixResult.size)
     }
 
+    @Test
+    fun `exlude directive arguments @GraphQLIgnore`() {
+        val directives = generateDirectives(basicGenerator, MyClass::directiveWithIgnoredArgs)
+        assertEquals(expected = 1, actual = directives.size)
+        assertEquals(expected = 1, actual = directives.first().arguments.size)
+        assertEquals(expected = "string", actual = directives.first().arguments.first().name)
+    }
+
     companion object {
         @AfterAll
         fun cleanUp(generateDirectiveTest: GenerateDirectiveTest) {