GH-280 Support x-enum-descriptions for enums

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

@@ -42,31 +42,41 @@ class TypeSchemaGenerator(val context: AnnotationProcessorContext) {
 
                 val namingStrategy = source.getAnnotation(OpenApiNaming::class.java)?.value
                 val values = createArrayNode()
+                val descriptions = createArrayNode()
 
                 source.enclosedElements
                     .filterIsInstance<VariableElement>()
                     .filter { it.modifiers.contains(Modifier.STATIC) }
                     .filter { context.isAssignable(it.asType(), type.mirror) }
                     .map { element ->
                         val customName = element.getAnnotation(OpenApiName::class.java)
-                        when {
+                        val description = element.getAnnotation(OpenApiDescription::class.java)
+                        val name = when {
                             customName != null -> customName.value
                             namingStrategy != null -> translatePropertyName(namingStrategy, element.toSimpleName())
                             else -> element.toSimpleName()
                         }
+
+                        Pair(name, description?.value ?: "")
                     }
-                    .forEach { name ->
+                    .forEach { (name, description) ->
                         if (enumType != null && enumType.type != "string") {
                             values.add(jsonMapper.readTree(name))
                         } else {
                             values.add(name)
                         }
+
+                        descriptions.add(description)
                     }
 
                 schema.put("type", enumType?.type ?: "string")
                 enumType?.format?.also { schema.put("format", it) }
                 schema.set<JsonNode>("enum", values)
 
+                if (descriptions.find({ description -> description.isTextual && description.asText().isNotEmpty()}) != null) {
+                    schema.set<JsonNode>("x-enum-descriptions", descriptions)
+                }
+
                 val extra = source.findExtra(context)
                 schema.addExtra(extra)
             }

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

@@ -418,6 +418,39 @@ internal class TypeMappersTest : OpenApiAnnotationProcessorSpecification() {
             ))
     }
 
+    private enum class XEnumDescriptionsEnum {
+        @OpenApiName("1")
+        @OpenApiDescription("Description of 1")
+        REQUEST_TYPE_1,
+        @OpenApiName("2")
+        @OpenApiDescription("Description of 2")
+        REQUEST_TYPE_2
+    }
+
+    @OpenApi(
+        path = "x-enum-descriptions-enum",
+        versions = ["should_support_x_enum_descriptions_enum"],
+        responses = [OpenApiResponse(status = "200", content = [OpenApiContent(from = XEnumDescriptionsEnum::class)])]
+    )
+    @Test
+    fun should_support_x_enum_descriptions_enum() = withOpenApi("should_support_x_enum_descriptions_enum") {
+        println(it)
+
+        assertThatJson(it)
+            .inPath("$.components.schemas.XEnumDescriptionsEnum")
+            .isObject
+            .isEqualTo(json(
+                // language=json
+                """
+                {
+                  "type": "string",
+                  "enum": ["1", "2"],
+                  "x-enum-descriptions": ["Description of 1", "Description of 2"]
+                }
+                """
+            ))
+    }
+
     @OpenApiDescription("A regular string enum with description")
     private enum class DescribedStringEnum {
         ALPHA,