Refactor enum converters (#2389)

Fixed #2371

Author: altro3

openapi-adoc/src/main/java/io/micronaut/openapi/adoc/utils/SwaggerUtils.java

@@ -57,7 +57,7 @@ public static OpenAPI readOpenApi(String swaggerFileContent, boolean isJson) {
     public static OpenAPI readOpenApiFromLocation(String location) {
 
         var isJson = location.endsWith(".json");
-        var adjustedLocation = location.replace("\\\\", "/").replace("\\", "/").toLowerCase();
+        var adjustedLocation = location.replace("\\\\", "/").replace("\\", "/");
         try {
             if (adjustedLocation.startsWith("jar:")) {
                 try (var in = new URI(adjustedLocation).toURL().openStream()) {

openapi-adoc/src/main/resources/template/content.ftl

@@ -3,7 +3,7 @@
   <#list content as mediaTypeName, mediaType>
       <#if mediaType.getExample()?has_content><#assign example = mediaType.getExample() /><#include template_examples /></#if>
       <#assign schemaType = mediaType.getSchema() />
-${mediaTypeName}:: <#include template_schemaType />
+${mediaTypeName}:: <#include template_schemaType /><@renderSchemaType schemaType=schemaType />
 
       <#assign propSchema = schemaType />
       <#include template_propertyDescription />

openapi-adoc/src/main/resources/template/headers.ftl

@@ -35,7 +35,7 @@ __explode__
       </#if>
     </#compress>
 
-<.<!<#assign schemaType = header.getSchema() /><#include template_schemaType />
+<.<!<#assign schemaType = header.getSchema() /><#include template_schemaType /><@renderSchemaType schemaType=schemaType />
   </#list>
 !===
 </#if>

openapi-adoc/src/main/resources/template/parameters.ftl

@@ -50,7 +50,7 @@ Style: ${parameter.getStyle()} +
       <#assign content = parameter.getContent() />
       <#include template_content />
     </#if>
-<.<|<#if parameter.getSchema()??><#assign schemaType = parameter.getSchema() /><#include template_schemaType /></#if>
+<.<|<#if parameter.getSchema()??><#assign schemaType = parameter.getSchema() /><#include template_schemaType /><@renderSchemaType schemaType=schemaType /></#if>
   </#list>
 |===
 </#if>

openapi-adoc/src/main/resources/template/properties.ftl

@@ -12,7 +12,7 @@
 __required__
 </#if>
 <.<|<#include template_propertyDescription />
-<.<|<#assign schemaType = propSchema /><#include template_schemaType />
+<.<|<#assign schemaType = propSchema /><#include template_schemaType /><@renderSchemaType schemaType=schemaType />
 </#list>
 |===
 </#if>

openapi-adoc/src/main/resources/template/schemaType.ftl

@@ -1,3 +1,4 @@
+<#macro renderSchemaType schemaType>
 <#compress>
 <#if schemaType.getItems()??>
   <#if schemaType.getItems().getType()??>
@@ -13,10 +14,17 @@ enum (${schemaType.getEnum()?join(", ")})
   <#if schemaType.getType()??>
 ${schemaType.getType()}
   <#else>
+    <#if schemaType.get$ref()??>
 <<${schemaType.get$ref()?replace("#", "")?replace("/", "_")},${schemaType.get$ref()?remove_beginning("#/components/schemas/")}>>
+    <#else>
+      <#list schemaType.getAllOf() as allOfSchema>
+<@renderSchemaType schemaType=allOfSchema />
+      </#list>
+    </#if>
   </#if>
   <#if schemaType.getFormat()?has_content>
 (${schemaType.getFormat()})
   </#if>
 </#if>
 </#compress>
+</#macro>

openapi-adoc/src/test/java/io/micronaut/openapi/adoc/OpenApiToAdocConverterTest.java

@@ -1,6 +1,7 @@
 package io.micronaut.openapi.adoc;
 
 import freemarker.template.TemplateException;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -17,7 +18,7 @@ class OpenApiToAdocConverterTest {
     final Path outputDir = Path.of("build/test/freemarker");
 
     @BeforeEach
-    void setup() throws IOException {
+    void beforeEach() throws IOException {
         if (Files.exists(outputDir)) {
             Files.walk(outputDir)
                 .sorted(Comparator.reverseOrder())
@@ -26,10 +27,27 @@ void setup() throws IOException {
         }
     }
 
+    @AfterEach
+    void afterEach() throws IOException {
+        if (Files.exists(outputDir)) {
+            Files.walk(outputDir)
+                .sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                .forEach(File::delete);
+        }
+
+        System.clearProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_ENABLED);
+        System.clearProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OPENAPI_PATH);
+        System.clearProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OUTPUT_FILENAME);
+        System.clearProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OUTPUT_DIR_PATH);
+        System.clearProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_TEMPLATES_DIR_PATH);
+        System.clearProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_TEMPLATE_PREFIX + "links");
+    }
+
     @Test
     void testFreemarker() throws IOException, TemplateException {
 
-        System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OPENAPI_PATH, "/yaml/swagger_petstore.yaml");
+        System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OPENAPI_PATH, "/yaml/swagger_petstore.yml");
         System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OUTPUT_FILENAME, "myresult.adoc");
         System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OUTPUT_DIR_PATH, outputDir.toString());
         System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_TEMPLATES_DIR_PATH, "classpath:/customDir");
@@ -43,4 +61,20 @@ void testFreemarker() throws IOException, TemplateException {
         var adoc = Files.readString(resultFile);
         assertTrue(adoc.contains("!!!!!!test custom template"));
     }
+
+    @Test
+    void testSchemaWithAllOf() throws IOException, TemplateException {
+
+        System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OPENAPI_PATH, "/yaml/schemaWithAllOf.yml");
+        System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OUTPUT_FILENAME, "myresult.adoc");
+        System.setProperty(OpenApiToAdocConfigProperty.MICRONAUT_OPENAPI_ADOC_OUTPUT_DIR_PATH, outputDir.toString());
+
+        OpenApiToAdocConverter.convert();
+
+        var resultFile = outputDir.resolve("myresult.adoc");
+        assertTrue(Files.exists(resultFile));
+
+        var adoc = Files.readString(resultFile);
+        assertTrue(adoc.contains("<.<|<<_components_schemas_MyDto,MyDto>>"));
+    }
 }

openapi-adoc/src/test/resources/yaml/schemaWithAllOf.yml

@@ -0,0 +1,33 @@
+openapi: 3.0.1
+info:
+  title: Service
+  version: 1.0.0
+paths:
+  /:
+    get:
+      operationId: fetchOffers
+      parameters:
+        - name: p
+          in: query
+          explode: false
+          schema:
+            nullable: true
+            allOf:
+              - $ref: "#/components/schemas/MyDto"
+      responses:
+        "201":
+          description: fetchOffers 201 response
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/MyDto"
+components:
+  schemas:
+    MyDto:
+      type: object
+      properties:
+        payload:
+          type: string
+          format: byte
+        payload2:
+          type: string