GH-147 Adjust scripting API to the new inheritance model

Author: dzikoysk

openapi-annotation-processor/src/test/compile/openapi.groovy

@@ -5,7 +5,6 @@ import io.javalin.openapi.experimental.ExperimentalCompileOpenApiConfiguration
 import io.javalin.openapi.experimental.OpenApiAnnotationProcessorConfiguration
 import io.javalin.openapi.experimental.OpenApiAnnotationProcessorConfigurer
 import io.javalin.openapi.experimental.SimpleType
-import org.jetbrains.annotations.Nullable
 
 import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
@@ -22,13 +21,18 @@ class OpenApiConfiguration implements OpenApiAnnotationProcessorConfigurer {
 
         // Used by UserCasesTest
         configuration.propertyInSchemeFilter = { AnnotationProcessorContext ctx, ClassDefinition type, Element property ->
-            @Nullable TypeElement specificRecord = ctx.forTypeElement('io.javalin.openapi.processor.UserCasesTest.SpecificRecord')
+            TypeElement specificRecord = ctx.forTypeElement('io.javalin.openapi.processor.UserCasesTest.SpecificRecord')
+            TypeElement specificRecordBase = ctx.forTypeElement('io.javalin.openapi.processor.UserCasesTest.SpecificRecordBase')
 
-            if (specificRecord != null && ctx.isAssignable(type.mirror, specificRecord.asType())) {
-                return !ctx.hasElement(specificRecord, property)
+            if (ctx.isAssignable(type.mirror, specificRecord.asType()) && ctx.hasElement(specificRecord, property)) {
+                return false // exclude
             }
 
-            return true
+            if (ctx.isAssignable(type.mirror, specificRecordBase.asType()) && ctx.hasElement(specificRecordBase, property)) {
+                return false // exclude
+            }
+
+            return true // include
         }
 
         // Used by CustomTypeMappingsTest

openapi-annotation-processor/src/test/kotlin/io/javalin/openapi/processor/UserCasesTest.kt

@@ -57,10 +57,9 @@ internal class UserCasesTest : OpenApiAnnotationProcessorSpecification() {
     }
 
     open class SpecificRecordBase {
-        fun getRecordBase(): String = "RecordBase" // it'll be excluded, because annotation processor only takes declared properties from the main class
+        fun getRecordBase(): String = "RecordBase" // it'll be excluded
     }
 
-    @OpenApiByFields
     class EmailRequest(val email: String) : SpecificRecordBase(), SpecificRecord {
         override fun getRecord(): String = "Record" // it will be excluded by `compile/openapi.groovy` script
     }
@@ -72,12 +71,10 @@ internal class UserCasesTest : OpenApiAnnotationProcessorSpecification() {
     )
     @Test
     fun gh108() = withOpenApi("gh-108") {
-        println(it)
-
         assertThatJson(it)
             .inPath("$.components.schemas.EmailRequest")
             .isObject
-            .containsEntry("required", json("['getEmail']"))
+            .containsEntry("required", json("['email']"))
     }
 
 }

openapi-specification/src/main/kotlin/io/javalin/openapi/experimental/AnnotationProcessorContext.kt

@@ -52,7 +52,9 @@ class AnnotationProcessorContext(
 
     fun hasElement(type: TypeElement, element: Element): Boolean =
         when (element) {
-            is ExecutableElement -> type.enclosedElements.filterIsInstance<ExecutableElement>().any { env.elementUtils.overrides(element, it, type) }
+            is ExecutableElement -> env.elementUtils.getAllMembers(type).let { members ->
+                members.contains(element) || members.filterIsInstance<ExecutableElement>().any { env.elementUtils.overrides(element, it, type) }
+            }
             else -> false
         }