Issue OpenAPITools#795: Add microprofile OpenAPI annotations for quar…

…kus library in JaxRsSpec
miguelborges99 · May 3, 2023 · 4c68904 · 4c68904
1 parent a717e68
commit 4c68904
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -613,14 +613,14 @@ void generateApis(List<File> files, List<OperationsMap> allOperations, List<Mode
                         .filter(Objects::nonNull)
                         .filter(tag::equalsIgnoreCase)
                         .findFirst()
-                        .ifPresent(tagName -> operation.put("tagName", tagName));
-                operation.put("tagDescription", "");
+                        .ifPresent(tagName -> operation.put("operationTagName", tagName));
+                operation.put("operationTagDescription", "");
                 Optional.ofNullable(openAPI.getTags()).orElseGet(Collections::emptyList).stream()
                         .filter(t -> tag.equalsIgnoreCase(t.getName()))
                         .map(Tag::getDescription)
                         .filter(Objects::nonNull)
                         .findFirst()
-                        .ifPresent(description -> operation.put("tagDescription", description));
+                        .ifPresent(description -> operation.put("operationTagDescription", description));
                 Optional.ofNullable(config.additionalProperties().get("appVersion")).ifPresent(version -> operation.put("version", version));
                 operation.put("apiPackage", config.apiPackage());
                 operation.put("modelPackage", config.modelPackage());

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/api.mustache
@@ -39,11 +39,11 @@ import {{javaxPackage}}.validation.Valid;{{/useBeanValidation}}
 
 {{#useMicroProfileOpenAPIAnnotations}}@OpenAPIDefinition(
    info = @Info(
-        title = "{{{tagName}}}", version="{{{version}}}", description="{{{tagDescription}}}"{{#license}},
+        title = "{{{operationTagName}}}", version="{{{version}}}", description="{{{operationTagDescription}}}"{{#license}},
         license = @License(name = "{{{name}}}", url = "{{{url}}}"){{/license}}{{#contact}},
         contact = @Contact(name = "{{{name}}}", email = "{{{email}}}"){{/contact}}
    ),
-   tags = @Tag(name="{{{tagName}}}", description="{{{tagDescription}}}")
+   tags = @Tag(name="{{{operationTagName}}}", description="{{{operationTagDescription}}}")
 ){{#hasAuthMethods}}
 @SecuritySchemes(value = {
     {{#authMethods}}{{#isOAuth}}@SecurityScheme(securitySchemeName = "{{name}}", type = SecuritySchemeType.OAUTH2,