Fix #28 - Add Enum Outer Class template and values cache

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java

@@ -5,12 +5,15 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.EnumSet;
 import java.util.List;
 
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.DefaultGenerator;
 import org.openapitools.codegen.config.GlobalSettings;
 
+import io.quarkiverse.openapi.generator.providers.ApiKeyIn;
+
 /**
  * Wrapper for the OpenAPIGen tool.
  * This is the same as calling the Maven plugin or the CLI.
@@ -39,7 +42,7 @@ public OpenApiClientGeneratorWrapper(final Path specFilePath, final Path outputD
         // logging
         GlobalSettings.setProperty(VERBOSE, FALSE.toString());
         GlobalSettings.setProperty(ONCE_LOGGER, TRUE.toString());
-
+        EnumSet<ApiKeyIn> values = EnumSet.allOf(ApiKeyIn.class);
         this.configurator = new QuarkusCodegenConfigurator();
         this.configurator.setInputSpec(specFilePath.toString());
         this.configurator.setOutputDir(outputDir.toString());

deployment/src/main/resources/templates/enumClass.qute

@@ -11,6 +11,9 @@
         {/if}
         {/if}
 
+        // caching enum access
+        private static final java.util.EnumSet<{e.datatypeWithEnum}> values = java.util.EnumSet.allOf({e.datatypeWithEnum}.class);
+
         {e.dataType} value;
 
         {e.datatypeWithEnum} ({e.dataType} v) {
@@ -26,14 +29,12 @@
             return String.valueOf(value);
         }
 
-        {#if e.withXml}
-        public static {e.datatypeWithEnum} fromValue(String, v) {
-            for ({#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if} b : {#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if}.values()) {
+        public static {e.datatypeWithEnum} fromValue(String v) {
+            for ({#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if} b : values) {
                 if (String.valueOf(b.value).equals(v)) {
                     return b;
                 }
             }
             {#if e.useNullForUnknownEnumValue}return null;{#else}throw new IllegalArgumentException("Unexpected value '" + v + "'");{/if}
         }
-        {/if}
     }

deployment/src/main/resources/templates/enumOuterClass.qute

@@ -1,11 +1,20 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import java.util.EnumSet;
+
 /**
  * {#insert e.description}Gets or Sets {e.name}{/}{#if e.description}{description}{/}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 {#include additionalEnumTypeAnnotations.qute e=e/}public enum {#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if} {
+    {#if e.allowableValues}
+    {#for v in e.allowableValues.enumVars}{v.name}({e.dataType}.valueOf({v.value})){#if v_hasNext}, {#else};{/if}{/for}
+    {/if}
+
+    // caching enum access
+    private static final EnumSet<{#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if}> values = EnumSet.allOf({#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if}.class);
+
     private {e.dataType} value;
 
     {#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if}({e.dataType} value){
@@ -20,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
     @JsonCreator
     public static {#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if} fromValue(String text) {
-        for ({#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if} b : {#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if}.values()) {
+        for ({#if e.datatypeWithEnum}{e.datatypeWithEnum}{#else}{e.classname}{/if} b : values) {
             if (String.valueOf(b.value).equals(text)) {
                 return b;
             }

deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java

@@ -46,6 +46,20 @@ void verifyAuthBearerGenerated() throws URISyntaxException {
         assertTrue(generatedFiles.stream().anyMatch(f -> f.getName().equals("CompositeAuthenticationProvider.java")));
     }
 
+    @Test
+    void verifyEnumGeneration() throws URISyntaxException {
+        final Path petstoreOpenApi = Path
+                .of(requireNonNull(this.getClass().getResource("/openapi/issue-28.yaml")).toURI());
+        final Path targetPath = Paths.get(getTargetDir(), "openapi-gen");
+        final OpenApiClientGeneratorWrapper generatorWrapper = new OpenApiClientGeneratorWrapper(petstoreOpenApi, targetPath)
+                .withBasePackage("org.issue28")
+                .withApiPackage("org.issue28.api")
+                .withModelPackage("org.issue28.package");
+        final List<File> generatedFiles = generatorWrapper.generate();
+
+        // TODO: add verification via java parser
+    }
+
     private String getTargetDir() throws URISyntaxException {
         return Paths.get(requireNonNull(getClass().getResource("/")).toURI()).getParent().toString();
     }