GH-147 Support inheritance (Resolve #147)

Author: dzikoysk

openapi-annotation-processor/src/main/kotlin/io/javalin/openapi/processor/generators/OpenApiGenerator.kt

@@ -370,7 +370,7 @@ internal class OpenApiGenerator {
         }
     }
 
-    fun detectContentType(typeMirror: TypeMirror): String = context.inContext {
+    private fun detectContentType(typeMirror: TypeMirror): String = context.inContext {
         val model = typeMirror.toClassDefinition()
 
         when {

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

@@ -0,0 +1,43 @@
+package io.javalin.openapi.processor
+
+import io.javalin.openapi.OpenApi
+import io.javalin.openapi.OpenApiContent
+import io.javalin.openapi.OpenApiResponse
+import io.javalin.openapi.processor.specification.OpenApiAnnotationProcessorSpecification
+import net.javacrumbs.jsonunit.assertj.JsonAssertions.json
+import net.javacrumbs.jsonunit.assertj.assertThatJson
+import org.junit.jupiter.api.Test
+
+internal class SchemeTest : OpenApiAnnotationProcessorSpecification() {
+
+    private open class BaseType {
+        val baseField: String = "Test"
+    }
+
+    private class FinalClass : BaseType() {
+        val finalField: String = "Test"
+    }
+
+    @OpenApi(
+        path = "content-types",
+        versions = ["should_generate_reference_with_inherited_properties"],
+        responses = [OpenApiResponse(status = "200", content = [OpenApiContent(from = FinalClass::class)])]
+    )
+    @Test
+    fun should_generate_reference_with_inherited_properties() = withOpenApi("should_generate_reference_with_inherited_properties") {
+        assertThatJson(it)
+            .inPath("$.components.schemas.FinalClass.properties")
+            .isObject
+            .isEqualTo(json("""
+                {
+                  "baseField": {
+                    "type": "string"
+                  },
+                  "finalField": {
+                    "type": "string"
+                  }
+                }
+            """))
+    }
+
+}

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

@@ -41,9 +41,14 @@ class AnnotationProcessorContext(
     fun getClassDefinitions(mirrors: Set<TypeMirror>): Set<ClassDefinition> =
         mirrors.map { getClassDefinition(it) }.toSet()
 
-    fun forTypeElement(name: String): TypeElement? = env.elementUtils.getTypeElement(name)
+    fun forTypeElement(name: String): TypeElement? =
+        env.elementUtils.getTypeElement(name)
 
-    fun isAssignable(implementation: TypeMirror, superclass: TypeMirror): Boolean = env.typeUtils.isAssignable(implementation, superclass)
+    fun forTypeElement(mirror: TypeMirror): TypeElement =
+        env.typeUtils.asElement(mirror) as TypeElement
+
+    fun isAssignable(implementation: TypeMirror, superclass: TypeMirror): Boolean =
+        env.typeUtils.isAssignable(implementation, superclass)
 
     fun hasElement(type: TypeElement, element: Element): Boolean =
         when (element) {

openapi-specification/src/main/kotlin/io/javalin/openapi/experimental/processor/generators/TypeSchemaGenerator.kt

@@ -199,7 +199,7 @@ internal fun ClassDefinition.findAllProperties(requireNonNulls: Boolean): Collec
     inDebug { it.info("TypeSchemaGenerator#findAllProperties | Enclosed elements of ${mirror}: ${source.enclosedElements}") }
     val properties = mutableListOf<Property>()
 
-    for (property in source.enclosedElements) {
+    for (property in context.env.elementUtils.getAllMembers(context.forTypeElement(mirror))) {
         if (property is Element) {
             if (context.configuration.propertyInSchemeFilter?.filter(context, this@findAllProperties, property) == false) {
                 continue