fix: allow for abstract properties and functions (ExpediaGroup#205)

* fix: allow for abstract properties and functions

* Update src/test/kotlin/com/expedia/graphql/generator/extensions/KClassExtensionsTest.kt

Co-Authored-By: smyrick <[email protected]>

Author: smyrick

src/main/kotlin/com/expedia/graphql/generator/extensions/kClassExtensions.kt

@@ -14,18 +14,20 @@ import kotlin.reflect.full.declaredMemberFunctions
 import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.full.findParameterByName
 import kotlin.reflect.full.isSubclassOf
+import kotlin.reflect.full.memberFunctions
+import kotlin.reflect.full.memberProperties
 import kotlin.reflect.full.primaryConstructor
 import kotlin.reflect.full.superclasses
 
 private const val INPUT_SUFFIX = "Input"
 
 internal fun KClass<*>.getValidProperties(hooks: SchemaGeneratorHooks): List<KProperty<*>> =
-    this.declaredMemberProperties
+    this.memberProperties
         .filter { hooks.isValidProperty(it) }
         .filter { prop -> propertyFilters.all { it.invoke(prop, this) } }
 
 internal fun KClass<*>.getValidFunctions(hooks: SchemaGeneratorHooks): List<KFunction<*>> =
-    this.declaredMemberFunctions
+    this.memberFunctions
         .filter { hooks.isValidFunction(it) }
         .filter { func -> functionFilters.all { it.invoke(func) } }
 

src/test/kotlin/com/expedia/graphql/generator/extensions/KClassExtensionsTest.kt

@@ -17,6 +17,24 @@ import kotlin.test.assertTrue
 @Suppress("Detekt.UnusedPrivateClass")
 open class KClassExtensionsTest {
 
+    interface SomeInterface {
+        val someField: String?
+
+        fun someFunction(): String?
+    }
+
+    abstract class SomeAbstractClass : SomeInterface {
+        override val someField: String = "Hello"
+
+        override fun someFunction(): String? = "Goodbye"
+
+        abstract val justAnotherField: String?
+    }
+
+    class SomeConcreteClass : SomeAbstractClass() {
+        override val justAnotherField: String? = "Default value"
+    }
+
     @Suppress("Detekt.FunctionOnlyReturningConstant", "Detekt.UnusedPrivateMember")
     private class MyTestClass(
         val publicProperty: String = "public",
@@ -90,6 +108,12 @@ open class KClassExtensionsTest {
         assertEquals(listOf("publicProperty"), properties.map { it.name })
     }
 
+    @Test
+    fun `test getting valid properties from abstract classes`() {
+        val concreteProperties = SomeConcreteClass::class.getValidProperties(noopHooks)
+        assertEquals(listOf("justAnotherField", "someField"), concreteProperties.map { it.name })
+    }
+
     @Test
     fun `test getting valid functions with no hooks`() {
         val properties = MyTestClass::class.getValidFunctions(noopHooks)
@@ -102,6 +126,12 @@ open class KClassExtensionsTest {
         assertEquals(listOf("publicFunction"), properties.map { it.name })
     }
 
+    @Test
+    fun `test getting functions from abstract classes`() {
+        val properties = SomeConcreteClass::class.getValidFunctions(noopHooks)
+        assertEquals(listOf("someFunction"), properties.map { it.name })
+    }
+
     @Test
     fun `test getting valid superclass with no hooks`() {
         val superclasses = InterfaceSuperclass::class.getValidSuperclasses(noopHooks)