Fix inline resolver for open api generator (#1552)

micronaut-projects · Apr 25, 2024 · ed56347 · ed56347
1 parent 0fb9dc1
commit ed56347
Show file tree

Hide file tree

Showing 13 changed files with 513 additions and 156 deletions.
diff --git a/...-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java b/...-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java
@@ -690,6 +690,11 @@ public String sanitizeTag(String tag) {
         return tag;
     }
 
+    @Override
+    public String toApiName(String name) {
+        return Utils.toApiName(name, apiNamePrefix, apiNameSuffix);
+    }
+
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co,
                                     Map<String, List<CodegenOperation>> operations) {
@@ -732,7 +737,9 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         }
 
         var inlineModelResolver = new MicronautInlineModelResolver(openAPI);
-        inlineModelResolver.flattenPaths();
+        inlineModelResolver.setInlineSchemaNameMapping(inlineSchemaNameMapping);
+        inlineModelResolver.setInlineSchemaOptions(inlineSchemaOption);
+        inlineModelResolver.flatten();
 
         super.preprocessOpenAPI(openAPI);
     }

diff --git a/...enerator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java b/...enerator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java
@@ -73,6 +73,7 @@
 import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE;
 import static org.openapitools.codegen.languages.KotlinClientCodegen.DATE_LIBRARY;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
+import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 /**
  * Base generator for Micronaut.
@@ -675,6 +676,21 @@ public String sanitizeTag(String tag) {
         return tag;
     }
 
+    public String superSanitizeTag(String tag) {
+        tag = camelize(underscore(sanitizeName(tag)));
+
+        // tag starts with numbers
+        if (tag.matches("^\\d.*")) {
+            tag = "Class" + tag;
+        }
+        return tag;
+    }
+
+    @Override
+    public String toApiName(String name) {
+        return Utils.toApiName(name, apiNamePrefix, apiNameSuffix);
+    }
+
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co,
                                     Map<String, List<CodegenOperation>> operations) {
@@ -683,7 +699,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
             return;
         }
 
-        super.addOperationToGroup(super.sanitizeTag(tag), resourcePath, operation, co, operations);
+        super.addOperationToGroup(superSanitizeTag(tag), resourcePath, operation, co, operations);
     }
 
     @Override
@@ -717,7 +733,9 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         }
 
         var inlineModelResolver = new MicronautInlineModelResolver(openAPI);
-        inlineModelResolver.flattenPaths();
+        inlineModelResolver.setInlineSchemaNameMapping(inlineSchemaNameMapping);
+        inlineModelResolver.setInlineSchemaOptions(inlineSchemaOption);
+        inlineModelResolver.flatten();
 
         super.preprocessOpenAPI(openAPI);
     }