GH-191 Support complex nested structures in additionalProperties (Resolve #191)

Author: dzikoysk

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

@@ -11,7 +11,6 @@ import io.javalin.openapi.OpenApiPropertyType
 import io.javalin.openapi.OpenApiResponse
 import io.javalin.openapi.processor.specification.OpenApiAnnotationProcessorSpecification
 import net.javacrumbs.jsonunit.assertj.JsonAssertions.json
-import net.javacrumbs.jsonunit.assertj.JsonAssertions.value
 import net.javacrumbs.jsonunit.assertj.assertThatJson
 import org.junit.jupiter.api.Test
 import java.math.BigDecimal

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

@@ -54,7 +54,8 @@ internal class TypeMappersTest : OpenApiAnnotationProcessorSpecification() {
         val localDateTime: LocalDateTime,
         val instant: Instant,
         val obj: Object,
-        val map: Map<*, *>
+        val map: Map<*, *>,
+        val mapWithList: Map<*, List<*>>
     )
 
     @OpenApi(
@@ -182,6 +183,15 @@ internal class TypeMappersTest : OpenApiAnnotationProcessorSpecification() {
                     "additionalProperties": {
                       "type": "object"
                     }
+                  },
+                  "mapWithList": {
+                    "type": "object",
+                    "additionalProperties": {
+                      "type": "array",
+                      "items": {
+                        "type": "object"
+                      }
+                    }
                   }
                 }"""
             ))

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

@@ -37,8 +37,10 @@ class ClassDefinition(
             with(context) {
                 with (mirror) {
                     when (this) {
-                        is TypeVariable -> upperBound?.toClassDefinition(generics, type) ?: lowerBound?.toClassDefinition(generics, type)
-                        is ArrayType -> componentType.toClassDefinition(generics, type = ARRAY)
+                        is TypeVariable ->
+                            upperBound?.toClassDefinition(generics, type) ?: lowerBound?.toClassDefinition(generics, type)
+                        is ArrayType ->
+                            componentType.toClassDefinition(generics, type = ARRAY)
                         is PrimitiveType ->
                             ClassDefinition(
                                 context = context,
@@ -47,32 +49,34 @@ class ClassDefinition(
                                 generics = generics,
                                 structureType = type
                             )
-                        is DeclaredType -> when {
-                            types.isAssignable(types.erasure(this), mapType().asType()) ->
-                                ClassDefinition(
-                                    context = context,
-                                    mirror = this,
-                                    source = mapType(),
-                                    generics = listOfNotNull(
-                                        typeArguments.getOrElse(0) { objectType().asType() }.toClassDefinition(),
-                                        typeArguments.getOrElse(1) { objectType().asType() }.toClassDefinition()
-                                    ),
-                                    structureType = DICTIONARY
-                                )
-                            types.isAssignable(types.erasure(this), collectionType().asType()) ->
-                                typeArguments.getOrElse(0) { objectType().asType() }.toClassDefinition(generics, ARRAY)
-                            else ->
-                                ClassDefinition(
-                                    context = context,
-                                    mirror = this,
-                                    source = asElement(),
-                                    generics = typeArguments.mapNotNull { it.toClassDefinition() },
-                                    structureType = type
-                                )
-                        }
-                        else -> types.asElement(this)?.asType()?.toClassDefinition(generics, type)
+                        is DeclaredType ->
+                            when {
+                                types.isAssignable(types.erasure(this), mapType().asType()) ->
+                                    ClassDefinition(
+                                        context = context,
+                                        mirror = this,
+                                        source = mapType(),
+                                        generics = listOfNotNull(
+                                            typeArguments.getOrElse(0) { objectType().asType() }.toClassDefinition(),
+                                            typeArguments.getOrElse(1) { objectType().asType() }.toClassDefinition()
+                                        ),
+                                        structureType = DICTIONARY
+                                    )
+                                types.isAssignable(types.erasure(this), collectionType().asType()) ->
+                                    typeArguments.getOrElse(0) { objectType().asType() }.toClassDefinition(generics, ARRAY)
+                                else ->
+                                    ClassDefinition(
+                                        context = context,
+                                        mirror = this,
+                                        source = asElement(),
+                                        generics = typeArguments.mapNotNull { it.toClassDefinition() },
+                                        structureType = type
+                                    )
+                            }
+                        else ->
+                            types.asElement(this)?.asType()?.toClassDefinition(generics, type)
                     }
-                } ?: objectType().asType().toClassDefinition()
+                } ?: objectType().asType().toClassDefinition(type = type)
             }
 
     }

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

@@ -11,7 +11,25 @@ class DictionaryEmbeddedTypeProcessor : EmbeddedTypeProcessor {
         if (type.structureType == DICTIONARY) {
             scheme.addProperty("type", "object")
             val additionalProperties = JsonObject()
-            parentContext.typeSchemaGenerator.addType(additionalProperties, context.type.generics[1], inlineRefs, references, requiresNonNulls)
+            val additionalType = context.type.generics[1]
+
+            context.parentContext.configuration.embeddedTypeProcessors
+                .firstOrNull {
+                    it.process(
+                        context.copy(
+                            scheme = additionalProperties,
+                            type = additionalType
+                        )
+                    )
+                }
+                ?: parentContext.typeSchemaGenerator.addType(
+                    scheme = additionalProperties,
+                    type = additionalType,
+                    inlineRefs = inlineRefs,
+                    references = references,
+                    requiresNonNulls = requiresNonNulls
+                )
+
             scheme.add("additionalProperties", additionalProperties)
             return true
         }