[Micronaut] Improvements for Server and Client (#12297)

* Add the applicationName parameter to support generation of multiple clients

* Change indentation in application.yml to double-space

* Update swagger annotations version, and option to choose not to generate the annotations

* Generate operations only in the first defined tag class for micronaut server

* Improve micronaut client options by setting the correct default values in the JavaMicronautAbstractCodegen constructor

* Fix visitor pattern having abstract method in non-abstract class. Update samples

* Update server sample FILES

* Minor refactor

* Fix for context path

docs/generators/java-micronaut-client.md

@@ -22,8 +22,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |apiPackage|package for generated api classes| |org.openapitools.api|
+|applicationName|Micronaut application name (Defaults to the artifactId value)| |openapi-micronaut-client|
 |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-micronaut|
+|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-micronaut-client|
 |artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
 |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
@@ -43,6 +44,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
+|generateOperationOnlyForFirstTag|When false, the operation method will be duplicated in each of the tags if multiple tags are assigned to this operation. If true, each operation will be generated only once in the first assigned tag.| |false|
+|generateSwaggerAnnotations|Specify if you want to generate swagger annotations and which version|<dl><dt>**swagger2**</dt><dd>Use io.swagger.core.v3:swagger-annotations for annotating operations and schemas</dd><dt>**true**</dt><dd>Equivalent to &quot;swagger2&quot;</dd><dt>**false**</dt><dd>Do not generate swagger annotations</dd><dt>**swagger1**</dt><dd>Use io.swagger:swagger-annotations for annotating operations and schemas</dd></dl>|false|
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
@@ -52,7 +55,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
-|micronautVersion|Micronaut version, only &gt;=3.0.0 versions are supported| |3.3.1|
+|micronautVersion|Micronaut version, only &gt;=3.0.0 versions are supported| |3.4.3|
 |modelPackage|package for generated models| |org.openapitools.model|
 |openApiNullable|Enable OpenAPI Jackson Nullable library| |true|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|

docs/generators/java-micronaut-server.md

@@ -21,6 +21,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |additionalEnumTypeAnnotations|Additional annotations for enum type(class level annotations)| |null|
 |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|applicationName|Micronaut application name (Defaults to the artifactId value)| |openapi-micronaut|
 |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
 |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-micronaut|
 |artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
@@ -44,7 +45,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
 |generateControllerAsAbstract|Generate an abstract class for controller to be extended. (apiPackage is then used for the abstract class, and controllerPackage is used for implementation that extends it.)| |false|
 |generateControllerFromExamples|Generate the implementation of controller and tests from parameter and return examples that will verify that the api works as desired (for testing)| |false|
+|generateOperationOnlyForFirstTag|When false, the operation method will be duplicated in each of the tags if multiple tags are assigned to this operation. If true, each operation will be generated only once in the first assigned tag.| |true|
 |generateOperationsToReturnNotImplemented|Return HTTP 501 Not Implemented instead of an empty response in the generated controller methods.| |true|
+|generateSwaggerAnnotations|Specify if you want to generate swagger annotations and which version|<dl><dt>**swagger2**</dt><dd>Use io.swagger.core.v3:swagger-annotations for annotating operations and schemas</dd><dt>**true**</dt><dd>Equivalent to &quot;swagger2&quot;</dd><dt>**false**</dt><dd>Do not generate swagger annotations</dd><dt>**swagger1**</dt><dd>Use io.swagger:swagger-annotations for annotating operations and schemas</dd></dl>|swagger2|
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
@@ -54,7 +57,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
-|micronautVersion|Micronaut version, only &gt;=3.0.0 versions are supported| |3.3.1|
+|micronautVersion|Micronaut version, only &gt;=3.0.0 versions are supported| |3.4.3|
 |modelPackage|package for generated models| |org.openapitools.model|
 |openApiNullable|Enable OpenAPI Jackson Nullable library| |true|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java

@@ -1,5 +1,7 @@
 package org.openapitools.codegen.languages;
 
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.features.BeanValidationFeatures;
@@ -10,11 +12,15 @@ import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
 import org.openapitools.codegen.model.OperationMap;
 import org.openapitools.codegen.model.OperationsMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE;
+import static org.openapitools.codegen.utils.StringUtils.camelize;
+import static org.openapitools.codegen.utils.StringUtils.underscore;
 
 public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen implements BeanValidationFeatures, OptionalFeatures {
     public static final String OPT_TITLE = "title";
@@ -35,6 +41,15 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
     public static final String OPT_DATETIME_FORMAT = "datetimeFormat";
     public static final String OPT_REACTIVE = "reactive";
     public static final String OPT_WRAP_IN_HTTP_RESPONSE = "wrapInHttpResponse";
+    public static final String OPT_APPLICATION_NAME = "applicationName";
+    public static final String OPT_GENERATE_SWAGGER_ANNOTATIONS = "generateSwaggerAnnotations";
+    public static final String OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1 = "swagger1";
+    public static final String OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2 = "swagger2";
+    public static final String OPT_GENERATE_SWAGGER_ANNOTATIONS_TRUE = "true";
+    public static final String OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE = "false";
+    public static final String OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG = "generateOperationOnlyForFirstTag";
+
+    protected final Logger LOGGER = LoggerFactory.getLogger(JavaMicronautAbstractCodegen.class);
 
     protected String title;
     protected boolean useBeanValidation;
@@ -46,6 +61,9 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
     protected String micronautVersion;
     protected boolean reactive;
     protected boolean wrapInHttpResponse;
+    protected String appName;
+    protected String generateSwaggerAnnotations;
+    protected boolean generateOperationOnlyForFirstTag;
 
     public static final String CONTENT_TYPE_APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
     public static final String CONTENT_TYPE_APPLICATION_JSON = "application/json";
@@ -64,18 +82,24 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
         visitable = false;
         buildTool = OPT_BUILD_ALL;
         testTool = OPT_TEST_JUNIT;
-        outputFolder = "generated-code/java-micronaut-client";
+        outputFolder = this instanceof JavaMicronautClientCodegen ?
+                "generated-code/java-micronaut-client" : "generated-code/java-micronaut";
         apiPackage = "org.openapitools.api";
         modelPackage = "org.openapitools.model";
         invokerPackage = "org.openapitools";
-        artifactId = "openapi-micronaut";
+        artifactId = this instanceof JavaMicronautClientCodegen ?
+                "openapi-micronaut-client" : "openapi-micronaut";
         embeddedTemplateDir = templateDir = "java-micronaut";
         apiDocPath = "docs/apis";
         modelDocPath = "docs/models";
         dateLibrary = OPT_DATE_LIBRARY_JAVA8;
-        micronautVersion = "3.3.1";
+        micronautVersion = "3.4.3";
         reactive = true;
         wrapInHttpResponse = false;
+        appName = artifactId;
+        generateSwaggerAnnotations = this instanceof JavaMicronautClientCodegen ?
+                OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE : OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2;
+        generateOperationOnlyForFirstTag = this instanceof JavaMicronautServerCodegen;
 
         // Set implemented features for user information
         modifyFeatureSet(features -> features
@@ -106,12 +130,15 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
 
         cliOptions.add(new CliOption(OPT_TITLE, "Client service name").defaultValue(title));
         cliOptions.add(new CliOption(OPT_MICRONAUT_VERSION, "Micronaut version, only >=3.0.0 versions are supported").defaultValue(micronautVersion));
+        cliOptions.add(new CliOption(OPT_APPLICATION_NAME, "Micronaut application name (Defaults to the " + CodegenConstants.ARTIFACT_ID + " value)").defaultValue(appName));
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation));
         cliOptions.add(CliOption.newBoolean(USE_OPTIONAL, "Use Optional container for optional parameters", useOptional));
         cliOptions.add(CliOption.newBoolean(OPT_VISITABLE, "Generate visitor for subtypes with a discriminator", visitable));
         cliOptions.add(CliOption.newBoolean(OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR, "Allow only to create models with all the required properties provided in constructor", requiredPropertiesInConstructor));
         cliOptions.add(CliOption.newBoolean(OPT_REACTIVE, "Make the responses use Reactor Mono as wrapper", reactive));
         cliOptions.add(CliOption.newBoolean(OPT_WRAP_IN_HTTP_RESPONSE, "Wrap the response in HttpResponse object", wrapInHttpResponse));
+        cliOptions.add(CliOption.newBoolean(OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG, "When false, the operation method will be duplicated in each of the tags if multiple tags are assigned to this operation. " +
+                "If true, each operation will be generated only once in the first assigned tag.", generateOperationOnlyForFirstTag));
 
         CliOption buildToolOption = new CliOption(OPT_BUILD, "Specify for which build tool to generate files").defaultValue(buildTool);
         Map<String, String> buildToolOptionMap = new HashMap<>();
@@ -128,6 +155,15 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
         testToolOption.setEnum(testToolOptionMap);
         cliOptions.add(testToolOption);
 
+        CliOption generateSwaggerAnnotationsOption = new CliOption(OPT_GENERATE_SWAGGER_ANNOTATIONS, "Specify if you want to generate swagger annotations and which version").defaultValue(generateSwaggerAnnotations);
+        Map<String, String> generateSwaggerAnnotationsOptionMap = new HashMap<>();
+        generateSwaggerAnnotationsOptionMap.put(OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1, "Use io.swagger:swagger-annotations for annotating operations and schemas");
+        generateSwaggerAnnotationsOptionMap.put(OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2, "Use io.swagger.core.v3:swagger-annotations for annotating operations and schemas");
+        generateSwaggerAnnotationsOptionMap.put(OPT_GENERATE_SWAGGER_ANNOTATIONS_TRUE, "Equivalent to \"" + OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2 + "\"");
+        generateSwaggerAnnotationsOptionMap.put(OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE, "Do not generate swagger annotations");
+        generateSwaggerAnnotationsOption.setEnum(generateSwaggerAnnotationsOptionMap);
+        cliOptions.add(generateSwaggerAnnotationsOption);
+
         cliOptions.add(new CliOption(OPT_DATE_FORMAT, "Specify the format pattern of date as a string"));
         cliOptions.add(new CliOption(OPT_DATETIME_FORMAT, "Specify the format pattern of date-time as a string"));
 
@@ -168,6 +204,12 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
             additionalProperties.put(OPT_MICRONAUT_VERSION, micronautVersion);
         }
 
+        if (additionalProperties.containsKey(OPT_APPLICATION_NAME)) {
+            appName = (String) additionalProperties.get(OPT_APPLICATION_NAME);
+        } else {
+            additionalProperties.put(OPT_APPLICATION_NAME, artifactId);
+        }
+
         // Get boolean properties
         if (additionalProperties.containsKey(USE_BEANVALIDATION)) {
             this.setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION));
@@ -199,6 +241,11 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
         }
         writePropertyBack(OPT_WRAP_IN_HTTP_RESPONSE, wrapInHttpResponse);
 
+        if (additionalProperties.containsKey(OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG)) {
+            this.generateOperationOnlyForFirstTag = convertPropertyToBoolean(OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG);
+        }
+        writePropertyBack(OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG, generateOperationOnlyForFirstTag);
+
         // Get enum properties
         if (additionalProperties.containsKey(OPT_BUILD)) {
             switch ((String) additionalProperties.get(OPT_BUILD)) {
@@ -230,6 +277,29 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
             additionalProperties.put("isTestSpock", true);
         }
 
+        if (additionalProperties.containsKey(OPT_GENERATE_SWAGGER_ANNOTATIONS)) {
+            String value = String.valueOf(additionalProperties.get(OPT_GENERATE_SWAGGER_ANNOTATIONS));
+            switch (value) {
+                case OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1:
+                    this.generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1;
+                    break;
+                case OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2:
+                case OPT_GENERATE_SWAGGER_ANNOTATIONS_TRUE:
+                    this.generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2;
+                    break;
+                case OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE:
+                    this.generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE;
+                    break;
+                default:
+                    throw new RuntimeException("Value \"" + value + "\" for the " + OPT_GENERATE_SWAGGER_ANNOTATIONS + " parameter is unsupported or misspelled");
+            }
+        }
+        if (OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1.equals(this.generateSwaggerAnnotations)) {
+            additionalProperties.put("generateSwagger1Annotations", true);
+        } else if (OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2.equals(this.generateSwaggerAnnotations)) {
+            additionalProperties.put("generateSwagger2Annotations", true);
+        }
+
         // Add all the supporting files
         String resourceFolder = projectFolder + "/resources";
         supportingFiles.add(new SupportingFile("common/configuration/application.yml.mustache", resourceFolder, "application.yml").doNotOverwrite());
@@ -372,6 +442,24 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
         return visitable;
     }
 
+    @Override
+    public String sanitizeTag(String tag) {
+        // Skip sanitization to get the original tag name in the addOperationToGroup() method.
+        // Inside that method tag is manually sanitized.
+        return tag;
+    }
+
+    @Override
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation
+            co, Map<String, List<CodegenOperation>> operations) {
+        if (generateOperationOnlyForFirstTag && !co.tags.get(0).getName().equals(tag)) {
+            // This is not the first assigned to this operation tag;
+            return;
+        }
+
+        super.addOperationToGroup(super.sanitizeTag(tag), resourcePath, operation, co, operations);
+    }
+
     @Override
     public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
         objs = super.postProcessOperationsWithModels(objs, allModels);
@@ -445,6 +533,14 @@ public abstract class JavaMicronautAbstractCodegen extends AbstractJavaCodegen i
         return objs;
     }
 
+    @Override
+    public CodegenModel fromModel(String name, Schema model) {
+        CodegenModel codegenModel = super.fromModel(name, model);
+        codegenModel.imports.remove("ApiModel");
+        codegenModel.imports.remove("ApiModelProperty");
+        return codegenModel;
+    }
+
     @Override
     public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs) {
         objs = super.postProcessAllModels(objs);

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java

@@ -5,14 +5,10 @@ import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 public class JavaMicronautClientCodegen extends JavaMicronautAbstractCodegen {
 
-    private final Logger LOGGER = LoggerFactory.getLogger(JavaMicronautClientCodegen.class);
-
     public static final String OPT_CONFIGURE_AUTH = "configureAuth";
 
     public static final String NAME = "java-micronaut-client";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java

@@ -7,8 +7,6 @@ import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.OperationMap;
 import org.openapitools.codegen.model.OperationsMap;
 import org.openapitools.codegen.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
@@ -29,8 +27,6 @@ public class JavaMicronautServerCodegen extends JavaMicronautAbstractCodegen {
     public static final String DENY_ALL_ROLE_KEY = "denyAll()";
     public static final String DENY_ALL_ROLE = "SecurityRule.DENY_ALL";
 
-    private final Logger LOGGER = LoggerFactory.getLogger(JavaMicronautServerCodegen.class);
-
     public static final String NAME = "java-micronaut-server";
 
     protected String controllerPackage = "org.openapitools.controller";
@@ -47,7 +43,7 @@ public class JavaMicronautServerCodegen extends JavaMicronautAbstractCodegen {
     public JavaMicronautServerCodegen() {
         super();
 
-        title = "OpenAPI Micronaut Server";;
+        title = "OpenAPI Micronaut Server";
         apiPackage = "org.openapitools.api";
         apiDocPath = "docs/controllers";
 

modules/openapi-generator/src/main/resources/java-micronaut/client/api.mustache

@@ -14,7 +14,8 @@ import reactor.core.publisher.Mono;
 {{#wrapInHttpResponse}}
 import io.micronaut.http.HttpResponse;
 {{/wrapInHttpResponse}}
-{{#imports}}import {{import}};
+{{#imports}}
+import {{import}};
 {{/imports}}
 import javax.annotation.Generated;
 {{^fullJavaUtil}}
@@ -26,37 +27,27 @@ import java.util.Map;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 {{/useBeanValidation}}
+{{#generateSwagger1Annotations}}
+import io.swagger.annotations.*;
+{{/generateSwagger1Annotations}}
+{{#generateSwagger2Annotations}}
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+{{/generateSwagger2Annotations}}
 
 {{>common/generatedAnnotation}}
-@Client("${base-path}")
+@Client("${{openbrace}}{{{applicationName}}}-base-path{{closebrace}}")
 public interface {{classname}} {
 {{#operations}}
     {{#operation}}
-    /**
+{{>common/operationAnnotations}}{{!
-        {{#summary}}
+}}    @{{#lambda.pascalcase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.pascalcase}}(uri="{{{path}}}")
-     * {{summary}}
-        {{/summary}}
-        {{#notes}}
-     * {{notes}}
-        {{/notes}}
-        {{^summary}}
-            {{^notes}}
-     * {{nickname}}
-            {{/notes}}
-        {{/summary}}
-     *
-        {{#allParams}}
-     * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
-        {{/allParams}}
-        {{#returnType}}
-     * @return {{returnType}}
-        {{/returnType}}
-        {{#externalDocs}}
-     * {{description}}
-     * @see <a href="{{url}}">{{summary}} Documentation</a>
-{{/externalDocs}}
-     */
-    @{{#lambda.pascalcase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.pascalcase}}(uri="{{{path}}}")
         {{#vendorExtensions.x-content-type}}
     @Produces(value={"{{vendorExtensions.x-content-type}}"})
         {{/vendorExtensions.x-content-type}}
@@ -71,6 +62,7 @@ public interface {{classname}} {
     {{>common/operationReturnType}} {{nickname}}({{#allParams}}
         {{>client/params/queryParams}}{{>client/params/pathParams}}{{>client/params/headerParams}}{{>client/params/bodyParams}}{{>client/params/formParams}}{{>client/params/cookieParams}}{{^-last}}, {{/-last}}{{#-last}}
     {{/-last}}{{/allParams}});
+
     {{/operation}}
 {{/operations}}
 }

modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/application.yml.mustache

@@ -1,13 +1,13 @@
 {{!CLIENT CONFIGURATION}}
 {{#client}}
-base-path: "{{{basePath}}}/"
+{{{applicationName}}}-base-path: "{{{basePath}}}"
 
 micronaut:
   application:
-        name: {{artifactId}}
+    name: {{{applicationName}}}{{!
-    {{!
   configure authorization from the parameters
-    }}{{#configureAuth}}security:
+  }}{{#configureAuth}}
+  security:
     oauth2:
       clients:{{#oauthMethods}}
         {{{name}}}:
@@ -22,7 +22,8 @@ micronaut:
           # client-id:
           # client-secret:{{/oauthMethods}}{{/configureAuth}}{{!
   do not configure authorization, but leave hints for user
-    }}{{^configureAuth}}# TODO configure security features
+  }}{{^configureAuth}}
+  # TODO configure security features
   security:
     oauth2:
       clients:
@@ -34,7 +35,7 @@ micronaut:
         #     auth-method: client_secret_basic
         #     url: "https://"
         # client-id:
-                # client-secret
+        # client-secret:
     # An example of how to apply other authorization methods
     # authentication: bearer | cookie | session{{/configureAuth}}
 
@@ -58,10 +59,10 @@ micronaut:
 
 micronaut:
   application:
-        name: {{artifactId}}
+    name: {{{applicationName}}}
   server:
-        port: 8080{{#contextPath}}
+    port: 8080
-        context-path: "{{{contextPath}}}"{{/contextPath}}
+    context-path: "{{{contextPath}}}/"
   security:
     # authentication: bearer | cookie | session | idtoken
 {{/server}}

modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/gradle/build.gradle.mustache

@@ -43,7 +43,12 @@ dependencies {
     {{#reactive}}
     implementation("io.micronaut.reactor:micronaut-reactor")
     {{/reactive}}
-    implementation("io.swagger:swagger-annotations:1.5.9")
+    {{#generateSwagger1Annotations}}
+    implementation("io.swagger:swagger-annotations:1.6.5")
+    {{/generateSwagger1Annotations}}
+    {{#generateSwagger2Annotations}}
+    implementation("io.swagger.core.v3:swagger-annotations:2.2.0")
+    {{/generateSwagger2Annotations}}
     runtimeOnly("ch.qos.logback:logback-classic")
 }
 

modules/openapi-generator/src/main/resources/java-micronaut/common/configuration/pom.xml.mustache

@@ -22,7 +22,12 @@
         <micronaut.version>{{{micronautVersion}}}</micronaut.version>
         <exec.mainClass>{{groupId}}.Application</exec.mainClass>
         <micronaut.runtime>netty</micronaut.runtime>
-        <swagger-annotations-version>1.5.21</swagger-annotations-version>
+        {{#generateSwagger1Annotations}}
+        <swagger-annotations-version>1.6.5</swagger-annotations-version>
+        {{/generateSwagger1Annotations}}
+        {{#generateSwagger2Annotations}}
+        <swagger-annotations-version>2.2.0</swagger-annotations-version>
+        {{/generateSwagger2Annotations}}
     </properties>
 
     <repositories>
@@ -122,11 +127,20 @@
             <artifactId>logback-classic</artifactId>
             <scope>runtime</scope>
         </dependency>
+        {{#generateSwagger1Annotations}}
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        {{/generateSwagger1Annotations}}
+        {{#generateSwagger2Annotations}}
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+        {{/generateSwagger2Annotations}}
     </dependencies>
 
     <build>

modules/openapi-generator/src/main/resources/java-micronaut/common/model/model.mustache

@@ -33,6 +33,13 @@ import javax.validation.Valid;
 {{/useBeanValidation}}
 import io.micronaut.core.annotation.*;
 import javax.annotation.Generated;
+{{#generateSwagger1Annotations}}
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+{{/generateSwagger1Annotations}}
+{{#generateSwagger2Annotations}}
+import io.swagger.v3.oas.annotations.media.Schema;
+{{/generateSwagger2Annotations}}
 
 {{#models}}
     {{#model}}

modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache

@@ -2,7 +2,12 @@
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */
 {{#description}}
+    {{#generateSwagger1Annotations}}
 @ApiModel(description = "{{{description}}}")
+    {{/generateSwagger1Annotations}}
+    {{#generateSwagger2Annotations}}
+@Schema({{#name}}name = "{{name}}", {{/name}}description = "{{{description}}}")
+    {{/generateSwagger2Annotations}}
 {{/description}}
 {{#jackson}}
 @JsonPropertyOrder({
@@ -177,7 +182,13 @@ Declare the class with extends and implements
         {{/maximum}}
      * @return {{name}}
      **/
-{{>common/model/beanValidation}}    @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+{{>common/model/beanValidation}}{{!
+        }}{{#generateSwagger1Annotations}}
+    @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
+        {{/generateSwagger1Annotations}}
+        {{#generateSwagger2Annotations}}
+    @Schema(name = "{{{baseName}}}", {{#isReadOnly}}accessMode = Schema.AccessMode.READ_ONLY, {{/isReadOnly}}{{#example}}example = "{{{.}}}", {{/example}}{{#description}}description = "{{{.}}}", {{/description}}required = {{{required}}})
+        {{/generateSwagger2Annotations}}
         {{#vendorExtensions.x-extra-annotation}}
     {{{vendorExtensions.x-extra-annotation}}}
         {{/vendorExtensions.x-extra-annotation}}
@@ -364,7 +375,9 @@ Declare the class with extends and implements
      * @param <T> the return type of the visitor
      * @return the result from the visitor
      */
-    public abstract <T> T accept(Visitor<T> visitor);
+    public <T> T accept(Visitor<T> visitor) {
+        return visitor.visit{{classname}}(this);
+    }
 
     /**
      * A {{classname}} visitor implementation allows visiting the various {{classname}} types.
@@ -375,6 +388,7 @@ Declare the class with extends and implements
         {{#discriminator.mappedModels}}
         R visit{{modelName}}({{modelName}} value);
         {{/discriminator.mappedModels}}
+        R visit{{classname}}({{classname}} value);
     }
 
     {{/discriminator}}

modules/openapi-generator/src/main/resources/java-micronaut/common/operationAnnotations.mustache

@@ -0,0 +1,102 @@
+    /**
+    {{#summary}}
+     * {{summary}}
+    {{/summary}}
+    {{#notes}}
+     * {{notes}}
+    {{/notes}}
+    {{^summary}}
+        {{^notes}}
+     * {{nickname}}
+        {{/notes}}
+    {{/summary}}
+     *
+    {{#allParams}}
+     * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+    {{/allParams}}
+    {{#returnType}}
+     * @return {{returnType}}
+    {{/returnType}}
+    {{#externalDocs}}
+     * {{description}}
+     * @see <a href="{{url}}">{{summary}} Documentation</a>
+    {{/externalDocs}}
+     */
+    {{!openapi annotations for info}}
+    {{#generateSwagger1Annotations}}
+    @ApiOperation(
+        value = "{{{summary}}}",
+        nickname = "{{{operationId}}}"{{#notes}},
+        notes = "{{{notes}}}"{{/notes}}{{#returnBaseType}},
+        response = {{{returnBaseType}}}.class{{/returnBaseType}}{{#returnContainer}},
+        responseContainer = "{{{returnContainer}}}"{{/returnContainer}},
+        authorizations = {{openbrace}}{{#hasAuthMethods}}
+        {{#authMethods}}
+            {{#isOAuth}}
+            @Authorization(value = "{{name}}"{{#scopes.0}}, scopes = {
+                {{#scopes}}
+                @AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}},{{/-last}}
+                {{/scopes}}
+            }{{/scopes.0}}){{^-last}},{{/-last}}
+            {{/isOAuth}}
+            {{^isOAuth}}
+            @Authorization(value = "{{name}}"){{^-last}},{{/-last}}
+            {{/isOAuth}}
+        {{/authMethods}}
+        {{/hasAuthMethods}}{{closebrace}},
+        tags = { {{#vendorExtensions.x-tags}}"{{tag}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-tags}} }
+    )
+    @ApiResponses(value = {{openbrace}}{{#responses}}
+        @ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}.class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}
+    {{closebrace}})
+    {{/generateSwagger1Annotations}}
+    {{#generateSwagger2Annotations}}
+    @Operation(
+        operationId = "{{{operationId}}}",
+        {{#summary}}
+        summary = "{{{.}}}",
+        {{/summary}}
+        {{#description}}
+        description= "{{{.}}}",
+        {{/description}}
+        {{#tags.1}}
+        {{!generate only when at least 2 tags}}
+        tags = { {{#tags}}"{{name}}"{{^-last}}, {{/-last}}{{/tags}} },
+        {{/tags.1}}
+        responses = {
+            {{#responses}}
+            @ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"{{#baseType}}, content = {
+                {{#produces}}
+                @Content(mediaType = "{{{mediaType}}}", schema = @Schema(implementation = {{{baseType}}}.class)){{^-last}},{{/-last}}
+                {{/produces}}
+            }{{/baseType}}){{^-last}},{{/-last}}
+            {{/responses}}
+        }{{#hasParams}},
+        parameters = {
+            {{#allParams}}
+            @Parameter(name = "{{paramName}}"{{#description}}, description = "{{{description}}}"{{/description}}{{#required}}, required = true{{/required}}){{^-last}},{{/-last}}
+            {{/allParams}}
+        }{{/hasParams}}{{#hasAuthMethods}},
+        security = {
+            {{#authMethods}}
+            @SecurityRequirement(name = "{{name}}"{{#isOAuth}}, scopes = { {{#scopes}}"{{scope}}"{{^-last}}, {{/-last}}{{/scopes}} }{{/isOAuth}}){{^-last}},{{/-last}}
+            {{/authMethods}}
+        }{{/hasAuthMethods}}
+    )
+    {{/generateSwagger2Annotations}}
+    {{#implicitHeadersParams.0}}
+        {{#generateSwagger2Annotations}}
+    @Parameters({
+            {{#implicitHeadersParams}}
+        @Parameter(name = "{{paramName}}"{{#description}}, description = "{{{description}}}"{{/description}}{{#required}}, required = true{{/required}}){{^-last}},{{/-last}}
+            {{/implicitHeadersParams}}
+    })
+        {{/generateSwagger2Annotations}}
+        {{#generateSwagger1Annotations}}
+    @ApiImplicitParams({
+        {{#implicitHeadersParams}}
+        @ApiImplicitParam(name = "{{{baseName}}}", value = "{{{description}}}", {{#required}}required = true,{{/required}} dataType = "{{{dataType}}}", paramType = "header"){{^-last}},{{/-last}}
+        {{/implicitHeadersParams}}
+    })
+        {{/generateSwagger1Annotations}}
+    {{/implicitHeadersParams.0}}

modules/openapi-generator/src/main/resources/java-micronaut/server/controller.mustache

@@ -35,66 +35,33 @@ import java.util.Arrays;
 import javax.validation.Valid;
 import javax.validation.constraints.*;
 {{/useBeanValidation}}
+{{#generateSwagger1Annotations}}
 import io.swagger.annotations.*;
+{{/generateSwagger1Annotations}}
+{{#generateSwagger2Annotations}}
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+{{/generateSwagger2Annotations}}
 
 {{>common/generatedAnnotation}}
 {{^generateControllerAsAbstract}}
 @Controller
 {{/generateControllerAsAbstract}}
+{{#generateSwagger2Annotations}}
+@Tag(name = "{{{baseName}}}", description = {{#tagDescription}}"{{{.}}}"{{/tagDescription}}{{^tagDescription}}"The {{{baseName}}} API"{{/tagDescription}})
+{{/generateSwagger2Annotations}}
 public {{#generateControllerAsAbstract}}abstract {{/generateControllerAsAbstract}}class {{classname}} {
 {{#operations}}
     {{#operation}}
-    /**
+{{>common/operationAnnotations}}{{!
-        {{#summary}}
+    micronaut annotations
-     * {{summary}}
+    }}    @{{#lambda.pascalcase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.pascalcase}}(uri="{{{path}}}")
-        {{/summary}}
-        {{#notes}}
-     * {{notes}}
-        {{/notes}}
-        {{^summary}}
-            {{^notes}}
-     * {{nickname}}
-            {{/notes}}
-        {{/summary}}
-     *
-        {{#allParams}}
-     * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
-        {{/allParams}}
-        {{#returnType}}
-     * @return {{returnType}}
-        {{/returnType}}
-        {{#externalDocs}}
-     * {{description}}
-     * @see <a href="{{url}}">{{summary}} Documentation</a>
-        {{/externalDocs}}
-     */
-    {{!openapi annotations for info}}
-    @ApiOperation(
-        value = "{{{summary}}}",
-        nickname = "{{{operationId}}}"{{#notes}},
-        notes = "{{{notes}}}"{{/notes}}{{#returnBaseType}},
-        response = {{{returnBaseType}}}.class{{/returnBaseType}}{{#returnContainer}},
-        responseContainer = "{{{returnContainer}}}"{{/returnContainer}},
-        authorizations = {{openbrace}}{{#hasAuthMethods}}
-        {{#authMethods}}
-            {{#isOAuth}}
-            @Authorization(value = "{{name}}"{{#scopes}}{{#-first}}, scopes = {
-                {{#scopes}}
-                @AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}},{{/-last}}
-                {{/scopes}}
-            }{{/-first}}{{/scopes}}){{^-last}},{{/-last}}
-            {{/isOAuth}}
-            {{^isOAuth}}
-            @Authorization(value = "{{name}}"){{^-last}},{{/-last}}
-            {{/isOAuth}}
-        {{/authMethods}}
-        {{/hasAuthMethods}}{{closebrace}},
-        tags={{openbrace}}{{#vendorExtensions.x-tags}}"{{tag}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-tags}}{{closebrace}})
-    {{!openapi annotations for info about responses}}
-    @ApiResponses(value = {{openbrace}}{{#responses}}
-        @ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}.class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}{{closebrace}})
-    {{!micronaut annotations}}
-    @{{#lambda.pascalcase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.pascalcase}}(uri="{{{path}}}")
     @Produces(value = {{openbrace}}{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}{{closebrace}})
     {{#consumes.0}}
     @Consumes(value = {{openbrace}}{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}{{closebrace}})

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautServerCodegenTest.java

@@ -6,7 +6,6 @@ import io.swagger.v3.oas.models.servers.Server;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.TestUtils;
-import org.openapitools.codegen.languages.JavaMicronautAbstractCodegen;
 import org.openapitools.codegen.languages.JavaMicronautServerCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -16,6 +15,7 @@ import static org.testng.Assert.assertEquals;
 
 public class MicronautServerCodegenTest extends AbstractMicronautCodegenTest {
     protected static String ROLES_EXTENSION_TEST_PATH = "src/test/resources/3_0/micronaut/roles-extension-test.yaml";
+    protected static String MULTI_TAGS_TEST_PATH = "src/test/resources/3_0/micronaut/multi-tags-test.yaml";
 
     @Test
     public void clientOptsUnicity() {
@@ -245,7 +245,6 @@ public class MicronautServerCodegenTest extends AbstractMicronautCodegenTest {
         codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "true");
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
-        // Constructor should have properties
         String controllerPath = outputPath + "src/main/java/org/openapitools/controller/";
         assertFileContains(controllerPath + "PetController.java", "Mono<HttpResponse<Pet>>");
     }
@@ -257,7 +256,6 @@ public class MicronautServerCodegenTest extends AbstractMicronautCodegenTest {
         codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "false");
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
-        // Constructor should have properties
         String controllerPath = outputPath + "src/main/java/org/openapitools/controller/";
         assertFileContains(controllerPath + "PetController.java", "Mono<Pet>");
         assertFileNotContains(controllerPath + "PetController.java", "HttpResponse");
@@ -270,7 +268,6 @@ public class MicronautServerCodegenTest extends AbstractMicronautCodegenTest {
         codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "true");
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
-        // Constructor should have properties
         String controllerPath = outputPath + "src/main/java/org/openapitools/controller/";
         assertFileContains(controllerPath + "PetController.java", "HttpResponse<Pet>");
         assertFileNotContains(controllerPath + "PetController.java", "Mono");
@@ -283,10 +280,65 @@ public class MicronautServerCodegenTest extends AbstractMicronautCodegenTest {
         codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "false");
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
-        // Constructor should have properties
         String controllerPath = outputPath + "src/main/java/org/openapitools/controller/";
         assertFileContains(controllerPath + "PetController.java", "Pet");
         assertFileNotContains(controllerPath + "PetController.java", "Mono");
         assertFileNotContains(controllerPath + "PetController.java", "HttpResponse");
     }
+
+    @Test
+    public void doGenerateOperationOnlyForFirstTag() {
+        JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen();
+        String outputPath = generateFiles(codegen, MULTI_TAGS_TEST_PATH, CodegenConstants.MODELS,
+                CodegenConstants.APIS, CodegenConstants.API_TESTS);
+
+        String controllerPath = outputPath + "src/main/java/org/openapitools/controller/";
+        String controllerTestPath = outputPath + "/src/test/java/org/openapitools/controller/";
+
+        // Verify files are generated only for the required tags
+        assertFileExists(controllerPath + "AuthorsController.java");
+        assertFileExists(controllerPath + "BooksController.java");
+        assertFileNotExists(controllerPath + "SearchController.java");
+
+        // Verify the same for test files
+        assertFileExists(controllerTestPath + "AuthorsControllerTest.java");
+        assertFileExists(controllerTestPath + "BooksControllerTest.java");
+        assertFileNotExists(controllerTestPath + "SearchControllerTest.java");
+
+        // Verify all the methods are generated only ones
+        assertFileContains(controllerPath + "AuthorsController.java",
+                "authorSearchGet", "getAuthor", "getAuthorBooks");
+        assertFileContains(controllerPath + "BooksController.java",
+                "bookCreateEntryPost", "bookSearchGet", "bookSendReviewPost", "getBook", "isBookAvailable");
+        assertFileNotContains(controllerPath + "BooksController.java", "getAuthorBooks");
+    }
+
+    @Test
+    public void doRepeatOperationForAllTags() {
+        JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen();
+        codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG, "false");
+        String outputPath = generateFiles(codegen, MULTI_TAGS_TEST_PATH, CodegenConstants.MODELS,
+                CodegenConstants.APIS, CodegenConstants.API_TESTS);
+
+        String controllerPath = outputPath + "src/main/java/org/openapitools/controller/";
+        String controllerTestPath = outputPath + "/src/test/java/org/openapitools/controller/";
+
+        // Verify all the tags created
+        assertFileExists(controllerPath + "AuthorsController.java");
+        assertFileExists(controllerPath + "BooksController.java");
+        assertFileExists(controllerPath + "SearchController.java");
+
+        // Verify the same for test files
+        assertFileExists(controllerTestPath + "AuthorsControllerTest.java");
+        assertFileExists(controllerTestPath + "BooksControllerTest.java");
+        assertFileExists(controllerTestPath + "SearchControllerTest.java");
+
+        // Verify all the methods are repeated for each of the tags
+        assertFileContains(controllerPath + "AuthorsController.java",
+                "authorSearchGet", "getAuthor", "getAuthorBooks");
+        assertFileContains(controllerPath + "BooksController.java",
+                "bookCreateEntryPost", "bookSearchGet", "bookSendReviewPost", "getBook", "isBookAvailable", "getAuthorBooks");
+        assertFileContains(controllerPath + "SearchController.java",
+                "authorSearchGet", "bookSearchGet");
+    }
 }

modules/openapi-generator/src/test/resources/3_0/micronaut/multi-tags-test.yaml

@@ -0,0 +1,155 @@
+openapi: 3.0.0
+info:
+  description: This is a test api description where operations have multiple tags
+  version: 1.0.0
+  title: Library
+  license:
+    name: Apache-2.0
+    url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
+tags:
+  - {name: books, description: Everything about books}
+  - {name: authors, description: Everything about book authors}
+  - {name: search, description: Tags for useful searching}
+paths:
+  /book/{bookName}:
+    get:
+      tags: [books]
+      summary: Get a book by name
+      operationId: getBook
+      parameters:
+        - {name: bookName, in: path, required: true, schema: {type: string}}
+      responses:
+        '200':
+          description: success
+          content:
+            application/json:
+              schema: { $ref: "#/components/schemas/Book" }
+  /book/availability/{bookName}:
+    get:
+      tags: [books]
+      summary: Check book availability
+      operationId: isBookAvailable
+      parameters:
+        - { name: bookName, in: path, required: true, schema: { type: string, example: "Book 1" } }
+      responses:
+        '200':
+          description: success
+          content:
+            text/plain:
+              schema: { $ref: "#/components/schemas/BookAvailability" }
+  /book/search:
+    get:
+      tags: [books, search]
+      summary: Search for a book
+      parameters:
+        - {name: bookName, in: query, required: false, schema: {type: string, example: "Book 2"}}
+        - {name: ISBN, in: query, required: false, schema: {type: string, pattern: "[0-9]{13}", example: "0123456789123"}}
+        - {name: published, in: query, required: false, schema: {type: string, format: date}}
+        - {name: minNumPages, in: query, required: false, schema: {type: integer, format: int32, minimum: 1, maximum: 1000}}
+        - {name: minReadTime, in: query, required: false, schema: {type: number, format: float, minimum: 1, example: 5.7}}
+        - {name: description, in: query, required: false, schema: {type: string, minLength: 4, nullable: true}}
+        - {name: preferences, in: cookie, required: false, schema: {type: string}}
+        - {name: geoLocation, in: header, required: false, schema: {type: string}}
+      responses:
+        '200':
+          description: success
+          content:
+            application/json:
+              schema: { type: array, items: { $ref: "#/components/schemas/Book" } }
+  /book/sendReview:
+    post:
+      tags: [books]
+      summary: Send a review to a book
+      parameters:
+        - {name: bookName, in: query, required: true, schema: {type: string, nullable: false}}
+      requestBody:
+        content:
+          application/x-www-form-urlencoded:
+            schema: {$ref: "#/components/schemas/Review"}
+      responses:
+        '200':
+          description: success
+  /book/createEntry:
+    post:
+      tags: [books]
+      summary: Create a new entry for a book
+      requestBody:
+        content:
+          application/json: { schema: { $ref: "#/components/schemas/Book" } }
+          application/xml: { schema: { $ref: "#/components/schemas/Book" } }
+      responses:
+        '200':
+          description: success
+          content:
+            application/json: { schema: { $ref: "#/components/schemas/Book" } }
+            application/xml: { schema: { $ref: "#/components/schemas/Book" } }
+  /author/{authorName}:
+    get:
+      tags: [authors]
+      summary: Get an author by name
+      operationId: getAuthor
+      parameters:
+        - {name: authorName, in: path, required: true, schema: {type: string}}
+      responses:
+        '200':
+          description: success
+          content:
+            application/json:
+              schema: { $ref: "#/components/schemas/Author" }
+  /author/search:
+    get:
+      tags: [authors, search]
+      summary: Search for an author
+      parameters:
+        - {name: authorName, in: query, required: false, schema: {type: string, example: "Eric Berne"}}
+        - {name: approximateYearBorn, in: query, required: false, schema: {type: int, example: 1990}}
+      responses:
+        '200':
+          description: success
+          content:
+            application/json:
+              schema: { type: array, items: { $ref: "#/components/schemas/Author" } }
+  /author/{authorName}/getBooks:
+    get:
+      tags: [authors, books]
+      summary: Get books by author name
+      operationId: getAuthorBooks
+      parameters:
+        - {name: authorName, in: path, required: true, schema: {type: string}}
+      responses:
+        '200':
+          description: success
+          content:
+            application/json:
+              schema: { type: array, items: { $ref: "#/components/schemas/Book" } }
+components:
+  schemas:
+    Book:
+      title: Book
+      description: book instance
+      type: object
+      properties:
+        name: {type: string}
+        availability: {$ref: "#/components/schemas/BookAvailability"}
+        pages: {type: integer, format: int32, minimum: 1}
+        readTime: {type: number, format: float, minimum: 0, exclusiveMinimum: true}
+        author: {$ref: "#/components/schemas/Author"}
+      required: ["name", "availability"]
+      default:
+        name: "Bob's Adventures"
+        availability: "available"
+    BookAvailability: 
+      type: string
+      enum: ["available", "not available", "reserved"]
+      default: "not available"
+    Review:
+      type: object
+      properties:
+        rating: {type: integer, minimum: 1, maximum: 5, default: 2}
+        description: {type: string, maxLength: 200}
+      required: [rating]
+    Author:
+      type: object
+      properties:
+        name: {type: string, pattern: "[a-zA-z ]+"}
+        yearBorn: {type: int, minimum: 0, maximum: 2030}

samples/client/petstore/java-micronaut-client/build.gradle

@@ -30,7 +30,6 @@ dependencies {
     implementation("io.micronaut.security:micronaut-security")
     implementation("io.micronaut.security:micronaut-security-oauth2")
     implementation("io.micronaut.reactor:micronaut-reactor")
-    implementation("io.swagger:swagger-annotations:1.5.9")
     runtimeOnly("ch.qos.logback:logback-classic")
 }
 

samples/client/petstore/java-micronaut-client/gradle.properties

@@ -1 +1 @@
-micronautVersion=3.3.1
+micronautVersion=3.4.3

samples/client/petstore/java-micronaut-client/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.micronaut</groupId>
         <artifactId>micronaut-parent</artifactId>
-        <version>3.3.1</version>
+        <version>3.4.3</version>
     </parent>
 
     <properties>
@@ -19,10 +19,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- If you are building with JDK 9 or higher, you can uncomment the lines below to set the release version -->
         <!-- <release.version>8</release.version> -->
-        <micronaut.version>3.3.1</micronaut.version>
+        <micronaut.version>3.4.3</micronaut.version>
         <exec.mainClass>org.openapitools.Application</exec.mainClass>
         <micronaut.runtime>netty</micronaut.runtime>
-        <swagger-annotations-version>1.5.21</swagger-annotations-version>
     </properties>
 
     <repositories>
@@ -99,11 +98,6 @@
             <artifactId>logback-classic</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
     </dependencies>
 
     <build>

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/AnotherFakeApi.java

@@ -28,7 +28,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 @Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen")
-@Client("${base-path}")
+@Client("${petstore-micronaut-base-path}")
 public interface AnotherFakeApi {
     /**
      * To test special tags
@@ -43,4 +43,5 @@ public interface AnotherFakeApi {
     Mono<ModelClient> call123testSpecialTags(
         @Body @NotNull @Valid ModelClient _body
     );
+
 }

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java

@@ -36,7 +36,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 @Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen")
-@Client("${base-path}")
+@Client("${petstore-micronaut-base-path}")
 public interface FakeApi {
     /**
      * creates an XmlItem
@@ -50,6 +50,7 @@ public interface FakeApi {
     Mono<Void> createXmlItem(
         @Body @NotNull @Valid XmlItem xmlItem
     );
+
     /**
      * Test serialization of outer boolean types
      *
@@ -62,6 +63,7 @@ public interface FakeApi {
     Mono<Boolean> fakeOuterBooleanSerialize(
         @Body @Nullable Boolean _body
     );
+
     /**
      * Test serialization of object with outer number type
      *
@@ -74,6 +76,7 @@ public interface FakeApi {
     Mono<OuterComposite> fakeOuterCompositeSerialize(
         @Body @Nullable @Valid OuterComposite _body
     );
+
     /**
      * Test serialization of outer number types
      *
@@ -86,6 +89,7 @@ public interface FakeApi {
     Mono<BigDecimal> fakeOuterNumberSerialize(
         @Body @Nullable BigDecimal _body
     );
+
     /**
      * Test serialization of outer string types
      *
@@ -98,6 +102,7 @@ public interface FakeApi {
     Mono<String> fakeOuterStringSerialize(
         @Body @Nullable String _body
     );
+
     /**
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
      *
@@ -109,6 +114,7 @@ public interface FakeApi {
     Mono<Void> testBodyWithFileSchema(
         @Body @NotNull @Valid FileSchemaTestClass _body
     );
+
     /**
      * testBodyWithQueryParams
      *
@@ -122,6 +128,7 @@ public interface FakeApi {
         @QueryValue(value="query") @NotNull String query, 
         @Body @NotNull @Valid User _body
     );
+
     /**
      * To test \&quot;client\&quot; model
      * To test \&quot;client\&quot; model
@@ -135,6 +142,7 @@ public interface FakeApi {
     Mono<ModelClient> testClientModel(
         @Body @NotNull @Valid ModelClient _body
     );
+
     /**
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -173,6 +181,7 @@ public interface FakeApi {
         @Nullable @Size(min=10, max=64) String password, 
         @Nullable String paramCallback
     );
+
     /**
      * To test enum parameters
      * To test enum parameters
@@ -199,6 +208,7 @@ public interface FakeApi {
         @Nullable List<String> enumFormStringArray, 
         @Nullable String enumFormString
     );
+
     /**
      * Fake endpoint to test group parameters (optional)
      * Fake endpoint to test group parameters (optional)
@@ -220,6 +230,7 @@ public interface FakeApi {
         @Header(name="boolean_group") @Nullable Boolean booleanGroup, 
         @QueryValue(value="int64_group") @Nullable Long int64Group
     );
+
     /**
      * test inline additionalProperties
      *
@@ -231,6 +242,7 @@ public interface FakeApi {
     Mono<Void> testInlineAdditionalProperties(
         @Body @NotNull Map<String, String> param
     );
+
     /**
      * test json serialization of form data
      *
@@ -244,6 +256,7 @@ public interface FakeApi {
         @NotNull String param, 
         @NotNull String param2
     );
+
     /**
      * To test the collection format in query parameters
      *
@@ -262,4 +275,5 @@ public interface FakeApi {
         @QueryValue(value="url") @NotNull List<String> url, 
         @QueryValue(value="context") @NotNull List<String> context
     );
+
 }

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeClassnameTags123Api.java

@@ -28,7 +28,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 @Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen")
-@Client("${base-path}")
+@Client("${petstore-micronaut-base-path}")
 public interface FakeClassnameTags123Api {
     /**
      * To test class name in snake case
@@ -43,4 +43,5 @@ public interface FakeClassnameTags123Api {
     Mono<ModelClient> testClassname(
         @Body @NotNull @Valid ModelClient _body
     );
+
 }

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/PetApi.java

@@ -31,7 +31,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 @Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen")
-@Client("${base-path}")
+@Client("${petstore-micronaut-base-path}")
 public interface PetApi {
     /**
      * Add a new pet to the store
@@ -44,6 +44,7 @@ public interface PetApi {
     Mono<Void> addPet(
         @Body @NotNull @Valid Pet _body
     );
+
     /**
      * Deletes a pet
      *
@@ -56,6 +57,7 @@ public interface PetApi {
         @PathVariable(name="petId") @NotNull Long petId, 
         @Header(name="api_key") @Nullable String apiKey
     );
+
     /**
      * Finds Pets by status
      * Multiple status values can be provided with comma separated strings
@@ -68,6 +70,7 @@ public interface PetApi {
     Mono<List<Pet>> findPetsByStatus(
         @QueryValue(value="status") @NotNull List<String> status
     );
+
     /**
      * Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -80,6 +83,7 @@ public interface PetApi {
     Mono<Set<Pet>> findPetsByTags(
         @QueryValue(value="tags") @NotNull Set<String> tags
     );
+
     /**
      * Find pet by ID
      * Returns a single pet
@@ -92,6 +96,7 @@ public interface PetApi {
     Mono<Pet> getPetById(
         @PathVariable(name="petId") @NotNull Long petId
     );
+
     /**
      * Update an existing pet
      *
@@ -103,6 +108,7 @@ public interface PetApi {
     Mono<Void> updatePet(
         @Body @NotNull @Valid Pet _body
     );
+
     /**
      * Updates a pet in the store with form data
      *
@@ -118,6 +124,7 @@ public interface PetApi {
         @Nullable String name, 
         @Nullable String status
     );
+
     /**
      * uploads an image
      *
@@ -134,6 +141,7 @@ public interface PetApi {
         @Nullable String additionalMetadata, 
         @Nullable File _file
     );
+
     /**
      * uploads an image (required)
      *
@@ -150,4 +158,5 @@ public interface PetApi {
         @NotNull File requiredFile, 
         @Nullable String additionalMetadata
     );
+
 }

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/StoreApi.java

@@ -28,7 +28,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 @Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen")
-@Client("${base-path}")
+@Client("${petstore-micronaut-base-path}")
 public interface StoreApi {
     /**
      * Delete purchase order by ID
@@ -41,6 +41,7 @@ public interface StoreApi {
     Mono<Void> deleteOrder(
         @PathVariable(name="order_id") @NotNull String orderId
     );
+
     /**
      * Returns pet inventories by status
      * Returns a map of status codes to quantities
@@ -50,6 +51,7 @@ public interface StoreApi {
     @Get(uri="/store/inventory")
     @Consumes(value={"application/json"})
     Mono<Map<String, Integer>> getInventory();
+
     /**
      * Find purchase order by ID
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
@@ -62,6 +64,7 @@ public interface StoreApi {
     Mono<Order> getOrderById(
         @PathVariable(name="order_id") @NotNull @Min(1L) @Max(5L) Long orderId
     );
+
     /**
      * Place an order for a pet
      *
@@ -74,4 +77,5 @@ public interface StoreApi {
     Mono<Order> placeOrder(
         @Body @NotNull @Valid Order _body
     );
+
 }

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/UserApi.java

@@ -29,7 +29,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 @Generated(value="org.openapitools.codegen.languages.JavaMicronautClientCodegen")
-@Client("${base-path}")
+@Client("${petstore-micronaut-base-path}")
 public interface UserApi {
     /**
      * Create user
@@ -43,6 +43,7 @@ public interface UserApi {
     Mono<Void> createUser(
         @Body @NotNull @Valid User _body
     );
+
     /**
      * Creates list of users with given input array
      *
@@ -54,6 +55,7 @@ public interface UserApi {
     Mono<Void> createUsersWithArrayInput(
         @Body @NotNull List<User> _body
     );
+
     /**
      * Creates list of users with given input array
      *
@@ -65,6 +67,7 @@ public interface UserApi {
     Mono<Void> createUsersWithListInput(
         @Body @NotNull List<User> _body
     );
+
     /**
      * Delete user
      * This can only be done by the logged in user.
@@ -76,6 +79,7 @@ public interface UserApi {
     Mono<Void> deleteUser(
         @PathVariable(name="username") @NotNull String username
     );
+
     /**
      * Get user by user name
      *
@@ -87,6 +91,7 @@ public interface UserApi {
     Mono<User> getUserByName(
         @PathVariable(name="username") @NotNull String username
     );
+
     /**
      * Logs user into the system
      *
@@ -100,6 +105,7 @@ public interface UserApi {
         @QueryValue(value="username") @NotNull String username, 
         @QueryValue(value="password") @NotNull String password
     );
+
     /**
      * Logs out current logged in user session
      *
@@ -107,6 +113,7 @@ public interface UserApi {
     @Get(uri="/user/logout")
     @Consumes(value={"application/json"})
     Mono<Void> logoutUser();
+
     /**
      * Updated user
      * This can only be done by the logged in user.
@@ -121,4 +128,5 @@ public interface UserApi {
         @PathVariable(name="username") @NotNull String username, 
         @Body @NotNull @Valid User _body
     );
+
 }

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.*;
@@ -51,7 +49,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,7 +50,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.*;
@@ -51,7 +49,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
@@ -100,7 +98,6 @@ public class AdditionalPropertiesClass {
      * @return mapString
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, String> getMapString() {
@@ -131,7 +128,6 @@ public class AdditionalPropertiesClass {
      * @return mapNumber
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, BigDecimal> getMapNumber() {
@@ -162,7 +158,6 @@ public class AdditionalPropertiesClass {
      * @return mapInteger
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Integer> getMapInteger() {
@@ -193,7 +188,6 @@ public class AdditionalPropertiesClass {
      * @return mapBoolean
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Boolean> getMapBoolean() {
@@ -224,7 +218,6 @@ public class AdditionalPropertiesClass {
      * @return mapArrayInteger
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, List<Integer>> getMapArrayInteger() {
@@ -255,7 +248,6 @@ public class AdditionalPropertiesClass {
      * @return mapArrayAnytype
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, List<Object>> getMapArrayAnytype() {
@@ -286,7 +278,6 @@ public class AdditionalPropertiesClass {
      * @return mapMapString
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Map<String, String>> getMapMapString() {
@@ -317,7 +308,6 @@ public class AdditionalPropertiesClass {
      * @return mapMapAnytype
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -340,7 +330,6 @@ public class AdditionalPropertiesClass {
      * @return anytype1
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ANYTYPE1)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Object getAnytype1() {
@@ -363,7 +352,6 @@ public class AdditionalPropertiesClass {
      * @return anytype2
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ANYTYPE2)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Object getAnytype2() {
@@ -386,7 +374,6 @@ public class AdditionalPropertiesClass {
      * @return anytype3
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ANYTYPE3)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Object getAnytype3() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.*;
@@ -51,7 +49,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
@@ -52,7 +50,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.*;
@@ -51,7 +49,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.*;
@@ -51,7 +49,6 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java

@@ -17,8 +17,6 @@ import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -66,7 +64,6 @@ public class Animal {
      * @return className
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_CLASS_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public String getClassName() {
@@ -89,7 +86,6 @@ public class Animal {
      * @return color
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_COLOR)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getColor() {
@@ -148,7 +144,9 @@ public class Animal {
      * @param <T> the return type of the visitor
      * @return the result from the visitor
      */
-    public abstract <T> T accept(Visitor<T> visitor);
+    public <T> T accept(Visitor<T> visitor) {
+        return visitor.visitAnimal(this);
+    }
 
     /**
      * A Animal visitor implementation allows visiting the various Animal types.
@@ -159,6 +157,7 @@ public class Animal {
         R visitBigCat(BigCat value);
         R visitCat(Cat value);
         R visitDog(Dog value);
+        R visitAnimal(Animal value);
     }
 
 }

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -59,7 +57,6 @@ public class ArrayOfArrayOfNumberOnly {
      * @return arrayArrayNumber
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<List<BigDecimal>> getArrayArrayNumber() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -59,7 +57,6 @@ public class ArrayOfNumberOnly {
      * @return arrayNumber
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<BigDecimal> getArrayNumber() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.ReadOnlyFirst;
@@ -67,7 +65,6 @@ public class ArrayTest {
      * @return arrayOfString
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<String> getArrayOfString() {
@@ -98,7 +95,6 @@ public class ArrayTest {
      * @return arrayArrayOfInteger
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<List<Long>> getArrayArrayOfInteger() {
@@ -129,7 +125,6 @@ public class ArrayTest {
      * @return arrayArrayOfModel
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
 import com.fasterxml.jackson.annotation.*;
@@ -86,7 +84,6 @@ public class BigCat extends Cat {
      * @return kind
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_KIND)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public KindEnum getKind() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCatAllOf.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -84,7 +82,6 @@ public class BigCatAllOf {
      * @return kind
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_KIND)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public KindEnum getKind() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -68,7 +66,6 @@ public class Capitalization {
      * @return smallCamel
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getSmallCamel() {
@@ -91,7 +88,6 @@ public class Capitalization {
      * @return capitalCamel
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getCapitalCamel() {
@@ -114,7 +110,6 @@ public class Capitalization {
      * @return smallSnake
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getSmallSnake() {
@@ -137,7 +132,6 @@ public class Capitalization {
      * @return capitalSnake
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getCapitalSnake() {
@@ -160,7 +154,6 @@ public class Capitalization {
      * @return scAETHFlowPoints
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getScAETHFlowPoints() {
@@ -183,7 +176,6 @@ public class Capitalization {
      * @return ATT_NAME
      **/
     @Nullable
-    @ApiModelProperty(value = "Name of the pet ")
     @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getATTNAME() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import org.openapitools.model.CatAllOf;
 import com.fasterxml.jackson.annotation.*;
@@ -51,7 +49,6 @@ public class Cat extends Animal {
      * @return declawed
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_DECLAWED)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getDeclawed() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/CatAllOf.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -49,7 +47,6 @@ public class CatAllOf {
      * @return declawed
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_DECLAWED)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getDeclawed() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -52,7 +50,6 @@ public class Category {
      * @return id
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long getId() {
@@ -75,7 +72,6 @@ public class Category {
      * @return name
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -26,7 +24,6 @@ import javax.annotation.Generated;
 /**
  * Model for testing model with \"_class\" property
  */
-@ApiModel(description = "Model for testing model with \"_class\" property")
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
@@ -49,7 +46,6 @@ public class ClassModel {
      * @return propertyClass
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getPropertyClass() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.Animal;
 import org.openapitools.model.DogAllOf;
 import com.fasterxml.jackson.annotation.*;
@@ -51,7 +49,6 @@ public class Dog extends Animal {
      * @return breed
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_BREED)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getBreed() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/DogAllOf.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -49,7 +47,6 @@ public class DogAllOf {
      * @return breed
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_BREED)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getBreed() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.*;
@@ -120,7 +118,6 @@ public class EnumArrays {
      * @return justSymbol
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public JustSymbolEnum getJustSymbol() {
@@ -151,7 +148,6 @@ public class EnumArrays {
      * @return arrayEnum
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<ArrayEnumEnum> getArrayEnum() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.model.OuterEnum;
 import com.fasterxml.jackson.annotation.*;
 
@@ -200,7 +198,6 @@ public class EnumTest {
      * @return enumString
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ENUM_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public EnumStringEnum getEnumString() {
@@ -223,7 +220,6 @@ public class EnumTest {
      * @return enumStringRequired
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public EnumStringRequiredEnum getEnumStringRequired() {
@@ -246,7 +242,6 @@ public class EnumTest {
      * @return enumInteger
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public EnumIntegerEnum getEnumInteger() {
@@ -269,7 +264,6 @@ public class EnumTest {
      * @return enumNumber
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public EnumNumberEnum getEnumNumber() {
@@ -292,7 +286,6 @@ public class EnumTest {
      * @return outerEnum
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public OuterEnum getOuterEnum() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import org.openapitools.model.ModelFile;
@@ -56,7 +54,6 @@ public class FileSchemaTestClass {
      **/
     @Valid
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_FILE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public ModelFile getFile() {
@@ -87,7 +84,6 @@ public class FileSchemaTestClass {
      * @return files
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_FILES)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<ModelFile> getFiles() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.io.File;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -110,7 +108,6 @@ public class FormatTest {
     @Nullable
     @Min(10)
     @Max(100)
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getInteger() {
@@ -137,7 +134,6 @@ public class FormatTest {
     @Nullable
     @Min(20)
     @Max(200)
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_INT32)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getInt32() {
@@ -160,7 +156,6 @@ public class FormatTest {
      * @return int64
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_INT64)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long getInt64() {
@@ -187,7 +182,6 @@ public class FormatTest {
     @NotNull
     @DecimalMin("32.1")
     @DecimalMax("543.2")
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_NUMBER)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public BigDecimal getNumber() {
@@ -214,7 +208,6 @@ public class FormatTest {
     @Nullable
     @DecimalMin("54.3")
     @DecimalMax("987.6")
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_FLOAT)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Float getFloat() {
@@ -241,7 +234,6 @@ public class FormatTest {
     @Nullable
     @DecimalMin("67.8")
     @DecimalMax("123.4")
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_DOUBLE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Double getDouble() {
@@ -265,7 +257,6 @@ public class FormatTest {
      **/
     @Nullable
     @Pattern(regexp="/[a-z]/i")
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getString() {
@@ -288,7 +279,6 @@ public class FormatTest {
      * @return _byte
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_BYTE)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public byte[] getByte() {
@@ -311,7 +301,6 @@ public class FormatTest {
      * @return binary
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_BINARY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public File getBinary() {
@@ -334,7 +323,6 @@ public class FormatTest {
      * @return date
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_DATE)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
@@ -359,7 +347,6 @@ public class FormatTest {
      * @return dateTime
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX")
@@ -384,7 +371,6 @@ public class FormatTest {
      * @return uuid
      **/
     @Nullable
-    @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public UUID getUuid() {
@@ -408,7 +394,6 @@ public class FormatTest {
      **/
     @NotNull
     @Size(min=10, max=64)
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_PASSWORD)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public String getPassword() {
@@ -431,7 +416,6 @@ public class FormatTest {
      * @return bigDecimal
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getBigDecimal() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -48,7 +46,6 @@ public class HasOnlyReadOnly {
      * @return bar
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_BAR)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getBar() {
@@ -60,7 +57,6 @@ public class HasOnlyReadOnly {
      * @return foo
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_FOO)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getFoo() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -104,7 +102,6 @@ public class MapTest {
      * @return mapMapOfString
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Map<String, String>> getMapMapOfString() {
@@ -135,7 +132,6 @@ public class MapTest {
      * @return mapOfEnumString
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, InnerEnum> getMapOfEnumString() {
@@ -166,7 +162,6 @@ public class MapTest {
      * @return directMap
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Boolean> getDirectMap() {
@@ -197,7 +192,6 @@ public class MapTest {
      * @return indirectMap
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Boolean> getIndirectMap() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -62,7 +60,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
      * @return uuid
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public UUID getUuid() {
@@ -85,7 +82,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
      * @return dateTime
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX")
@@ -118,7 +114,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
      * @return map
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Animal> getMap() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -27,7 +25,6 @@ import javax.annotation.Generated;
 /**
  * Model for testing model name starting with number
  */
-@ApiModel(description = "Model for testing model name starting with number")
 @JsonPropertyOrder({
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
@@ -54,7 +51,6 @@ public class Model200Response {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getName() {
@@ -77,7 +73,6 @@ public class Model200Response {
      * @return propertyClass
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getPropertyClass() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -57,7 +55,6 @@ public class ModelApiResponse {
      * @return code
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_CODE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getCode() {
@@ -80,7 +77,6 @@ public class ModelApiResponse {
      * @return type
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_TYPE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getType() {
@@ -103,7 +99,6 @@ public class ModelApiResponse {
      * @return message
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MESSAGE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getMessage() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -49,7 +47,6 @@ public class ModelClient {
      * @return _client
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_CLIENT)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getClient() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -27,7 +25,6 @@ import javax.annotation.Generated;
 /**
  * Must be named `File` for test.
  */
-@ApiModel(description = "Must be named `File` for test.")
 @JsonPropertyOrder({
   ModelFile.JSON_PROPERTY_SOURCE_U_R_I
 })
@@ -50,7 +47,6 @@ public class ModelFile {
      * @return sourceURI
      **/
     @Nullable
-    @ApiModelProperty(value = "Test capitalization")
     @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getSourceURI() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -49,7 +47,6 @@ public class ModelList {
      * @return _123list
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_123LIST)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String get123list() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -27,7 +25,6 @@ import javax.annotation.Generated;
 /**
  * Model for testing reserved words
  */
-@ApiModel(description = "Model for testing reserved words")
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
@@ -50,7 +47,6 @@ public class ModelReturn {
      * @return _return
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_RETURN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getReturn() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -26,7 +24,6 @@ import javax.annotation.Generated;
 /**
  * Model for testing model name same as property name
  */
-@ApiModel(description = "Model for testing model name same as property name")
 @JsonPropertyOrder({
   Name.JSON_PROPERTY_NAME,
   Name.JSON_PROPERTY_SNAKE_CASE,
@@ -61,7 +58,6 @@ public class Name {
      * @return name
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public Integer getName() {
@@ -79,7 +75,6 @@ public class Name {
      * @return snakeCase
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getSnakeCase() {
@@ -96,7 +91,6 @@ public class Name {
      * @return property
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PROPERTY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getProperty() {
@@ -114,7 +108,6 @@ public class Name {
      * @return _123number
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_123NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer get123number() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.*;
 
@@ -49,7 +47,6 @@ public class NumberOnly {
      * @return justNumber
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getJustNumber() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.*;
 
@@ -103,7 +101,6 @@ public class Order {
      * @return id
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long getId() {
@@ -126,7 +123,6 @@ public class Order {
      * @return petId
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PET_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long getPetId() {
@@ -149,7 +145,6 @@ public class Order {
      * @return quantity
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_QUANTITY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getQuantity() {
@@ -172,7 +167,6 @@ public class Order {
      * @return shipDate
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_SHIP_DATE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX")
@@ -197,7 +191,6 @@ public class Order {
      * @return status
      **/
     @Nullable
-    @ApiModelProperty(value = "Order Status")
     @JsonProperty(JSON_PROPERTY_STATUS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public StatusEnum getStatus() {
@@ -220,7 +213,6 @@ public class Order {
      * @return complete
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_COMPLETE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getComplete() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.*;
 
@@ -57,7 +55,6 @@ public class OuterComposite {
      * @return myNumber
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MY_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getMyNumber() {
@@ -80,7 +77,6 @@ public class OuterComposite {
      * @return myString
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MY_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getMyString() {
@@ -103,7 +99,6 @@ public class OuterComposite {
      * @return myBoolean
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getMyBoolean() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -109,7 +107,6 @@ public class Pet {
      * @return id
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long getId() {
@@ -133,7 +130,6 @@ public class Pet {
      **/
     @Valid
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_CATEGORY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Category getCategory() {
@@ -156,7 +152,6 @@ public class Pet {
      * @return name
      **/
     @NotNull
-    @ApiModelProperty(example = "doggie", required = true, value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public String getName() {
@@ -184,7 +179,6 @@ public class Pet {
      * @return photoUrls
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public Set<String> getPhotoUrls() {
@@ -216,7 +210,6 @@ public class Pet {
      * @return tags
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_TAGS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Tag> getTags() {
@@ -239,7 +232,6 @@ public class Pet {
      * @return status
      **/
     @Nullable
-    @ApiModelProperty(value = "pet status in the store")
     @JsonProperty(JSON_PROPERTY_STATUS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public StatusEnum getStatus() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -47,7 +45,6 @@ public class ReadOnlyFirst {
      * @return bar
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_BAR)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getBar() {
@@ -64,7 +61,6 @@ public class ReadOnlyFirst {
      * @return baz
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_BAZ)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getBaz() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java

@@ -15,8 +15,6 @@ package org.openapitools.model;
 import java.util.Objects;
 import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -49,7 +47,6 @@ public class SpecialModelName {
      * @return $specialPropertyName
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long get$SpecialPropertyName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -52,7 +50,6 @@ public class Tag {
      * @return id
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long getId() {
@@ -75,7 +72,6 @@ public class Tag {
      * @return name
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getName() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +65,6 @@ public class TypeHolderDefault {
      * @return stringItem
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_STRING_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public String getStringItem() {
@@ -90,7 +87,6 @@ public class TypeHolderDefault {
      * @return numberItem
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public BigDecimal getNumberItem() {
@@ -113,7 +109,6 @@ public class TypeHolderDefault {
      * @return integerItem
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public Integer getIntegerItem() {
@@ -136,7 +131,6 @@ public class TypeHolderDefault {
      * @return boolItem
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public Boolean getBoolItem() {
@@ -164,7 +158,6 @@ public class TypeHolderDefault {
      * @return arrayItem
      **/
     @NotNull
-    @ApiModelProperty(required = true, value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public List<Integer> getArrayItem() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -71,7 +69,6 @@ public class TypeHolderExample {
      * @return stringItem
      **/
     @NotNull
-    @ApiModelProperty(example = "what", required = true, value = "")
     @JsonProperty(JSON_PROPERTY_STRING_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public String getStringItem() {
@@ -94,7 +91,6 @@ public class TypeHolderExample {
      * @return numberItem
      **/
     @NotNull
-    @ApiModelProperty(example = "1.234", required = true, value = "")
     @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public BigDecimal getNumberItem() {
@@ -117,7 +113,6 @@ public class TypeHolderExample {
      * @return floatItem
      **/
     @NotNull
-    @ApiModelProperty(example = "1.234", required = true, value = "")
     @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public Float getFloatItem() {
@@ -140,7 +135,6 @@ public class TypeHolderExample {
      * @return integerItem
      **/
     @NotNull
-    @ApiModelProperty(example = "-2", required = true, value = "")
     @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public Integer getIntegerItem() {
@@ -163,7 +157,6 @@ public class TypeHolderExample {
      * @return boolItem
      **/
     @NotNull
-    @ApiModelProperty(example = "true", required = true, value = "")
     @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public Boolean getBoolItem() {
@@ -191,7 +184,6 @@ public class TypeHolderExample {
      * @return arrayItem
      **/
     @NotNull
-    @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
     @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     public List<Integer> getArrayItem() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.*;
 
 import javax.validation.constraints.*;
@@ -76,7 +74,6 @@ public class User {
      * @return id
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Long getId() {
@@ -99,7 +96,6 @@ public class User {
      * @return username
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_USERNAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getUsername() {
@@ -122,7 +118,6 @@ public class User {
      * @return firstName
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_FIRST_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getFirstName() {
@@ -145,7 +140,6 @@ public class User {
      * @return lastName
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_LAST_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getLastName() {
@@ -168,7 +162,6 @@ public class User {
      * @return email
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_EMAIL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getEmail() {
@@ -191,7 +184,6 @@ public class User {
      * @return password
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PASSWORD)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getPassword() {
@@ -214,7 +206,6 @@ public class User {
      * @return phone
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PHONE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getPhone() {
@@ -237,7 +228,6 @@ public class User {
      * @return userStatus
      **/
     @Nullable
-    @ApiModelProperty(value = "User Status")
     @JsonProperty(JSON_PROPERTY_USER_STATUS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getUserStatus() {

samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java

@@ -14,8 +14,6 @@ package org.openapitools.model;
 
 import java.util.Objects;
 import java.util.Arrays;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -163,7 +161,6 @@ public class XmlItem {
      * @return attributeString
      **/
     @Nullable
-    @ApiModelProperty(example = "string", value = "")
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getAttributeString() {
@@ -186,7 +183,6 @@ public class XmlItem {
      * @return attributeNumber
      **/
     @Nullable
-    @ApiModelProperty(example = "1.234", value = "")
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getAttributeNumber() {
@@ -209,7 +205,6 @@ public class XmlItem {
      * @return attributeInteger
      **/
     @Nullable
-    @ApiModelProperty(example = "-2", value = "")
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getAttributeInteger() {
@@ -232,7 +227,6 @@ public class XmlItem {
      * @return attributeBoolean
      **/
     @Nullable
-    @ApiModelProperty(example = "true", value = "")
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getAttributeBoolean() {
@@ -263,7 +257,6 @@ public class XmlItem {
      * @return wrappedArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getWrappedArray() {
@@ -286,7 +279,6 @@ public class XmlItem {
      * @return nameString
      **/
     @Nullable
-    @ApiModelProperty(example = "string", value = "")
     @JsonProperty(JSON_PROPERTY_NAME_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getNameString() {
@@ -309,7 +301,6 @@ public class XmlItem {
      * @return nameNumber
      **/
     @Nullable
-    @ApiModelProperty(example = "1.234", value = "")
     @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getNameNumber() {
@@ -332,7 +323,6 @@ public class XmlItem {
      * @return nameInteger
      **/
     @Nullable
-    @ApiModelProperty(example = "-2", value = "")
     @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getNameInteger() {
@@ -355,7 +345,6 @@ public class XmlItem {
      * @return nameBoolean
      **/
     @Nullable
-    @ApiModelProperty(example = "true", value = "")
     @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getNameBoolean() {
@@ -386,7 +375,6 @@ public class XmlItem {
      * @return nameArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getNameArray() {
@@ -417,7 +405,6 @@ public class XmlItem {
      * @return nameWrappedArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getNameWrappedArray() {
@@ -440,7 +427,6 @@ public class XmlItem {
      * @return prefixString
      **/
     @Nullable
-    @ApiModelProperty(example = "string", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getPrefixString() {
@@ -463,7 +449,6 @@ public class XmlItem {
      * @return prefixNumber
      **/
     @Nullable
-    @ApiModelProperty(example = "1.234", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getPrefixNumber() {
@@ -486,7 +471,6 @@ public class XmlItem {
      * @return prefixInteger
      **/
     @Nullable
-    @ApiModelProperty(example = "-2", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getPrefixInteger() {
@@ -509,7 +493,6 @@ public class XmlItem {
      * @return prefixBoolean
      **/
     @Nullable
-    @ApiModelProperty(example = "true", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getPrefixBoolean() {
@@ -540,7 +523,6 @@ public class XmlItem {
      * @return prefixArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getPrefixArray() {
@@ -571,7 +553,6 @@ public class XmlItem {
      * @return prefixWrappedArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getPrefixWrappedArray() {
@@ -594,7 +575,6 @@ public class XmlItem {
      * @return namespaceString
      **/
     @Nullable
-    @ApiModelProperty(example = "string", value = "")
     @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getNamespaceString() {
@@ -617,7 +597,6 @@ public class XmlItem {
      * @return namespaceNumber
      **/
     @Nullable
-    @ApiModelProperty(example = "1.234", value = "")
     @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getNamespaceNumber() {
@@ -640,7 +619,6 @@ public class XmlItem {
      * @return namespaceInteger
      **/
     @Nullable
-    @ApiModelProperty(example = "-2", value = "")
     @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getNamespaceInteger() {
@@ -663,7 +641,6 @@ public class XmlItem {
      * @return namespaceBoolean
      **/
     @Nullable
-    @ApiModelProperty(example = "true", value = "")
     @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getNamespaceBoolean() {
@@ -694,7 +671,6 @@ public class XmlItem {
      * @return namespaceArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getNamespaceArray() {
@@ -725,7 +701,6 @@ public class XmlItem {
      * @return namespaceWrappedArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getNamespaceWrappedArray() {
@@ -748,7 +723,6 @@ public class XmlItem {
      * @return prefixNsString
      **/
     @Nullable
-    @ApiModelProperty(example = "string", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getPrefixNsString() {
@@ -771,7 +745,6 @@ public class XmlItem {
      * @return prefixNsNumber
      **/
     @Nullable
-    @ApiModelProperty(example = "1.234", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getPrefixNsNumber() {
@@ -794,7 +767,6 @@ public class XmlItem {
      * @return prefixNsInteger
      **/
     @Nullable
-    @ApiModelProperty(example = "-2", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getPrefixNsInteger() {
@@ -817,7 +789,6 @@ public class XmlItem {
      * @return prefixNsBoolean
      **/
     @Nullable
-    @ApiModelProperty(example = "true", value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Boolean getPrefixNsBoolean() {
@@ -848,7 +819,6 @@ public class XmlItem {
      * @return prefixNsArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getPrefixNsArray() {
@@ -879,7 +849,6 @@ public class XmlItem {
      * @return prefixNsWrappedArray
      **/
     @Nullable
-    @ApiModelProperty(value = "")
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public List<Integer> getPrefixNsWrappedArray() {

samples/client/petstore/java-micronaut-client/src/main/resources/application.yml

@@ -1,4 +1,4 @@
-base-path: "http://petstore.swagger.io:80/v2/"
+petstore-micronaut-base-path: "http://petstore.swagger.io:80/v2"
 
 micronaut:
   application:
@@ -15,7 +15,7 @@ micronaut:
         #     auth-method: client_secret_basic
         #     url: "https://"
         # client-id:
-                # client-secret
+        # client-secret:
     # An example of how to apply other authorization methods
     # authentication: bearer | cookie | session
 

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesAnyTypeSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.HashMap
 import java.util.Map
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,20 +11,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesAnyTypeSpec extends Specification {
-    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType()
+    private final AdditionalPropertiesAnyType model = null
 
     /**
      * Model tests for AdditionalPropertiesAnyType
      */
-    void "AdditionalPropertiesAnyType test"() {
+    void 'AdditionalPropertiesAnyType test'() {
         // TODO: test AdditionalPropertiesAnyType
     }
 
     /**
      * Test the property 'name'
      */
-    void "AdditionalPropertiesAnyType property name test"() {
+    void 'AdditionalPropertiesAnyType property name test'() {
-        // TODO: test name
+        // TODO: test name property of AdditionalPropertiesAnyType
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesArraySpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.HashMap
 import java.util.List
 import java.util.Map
@@ -14,20 +12,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesArraySpec extends Specification {
-    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray()
+    private final AdditionalPropertiesArray model = null
 
     /**
      * Model tests for AdditionalPropertiesArray
      */
-    void "AdditionalPropertiesArray test"() {
+    void 'AdditionalPropertiesArray test'() {
         // TODO: test AdditionalPropertiesArray
     }
 
     /**
      * Test the property 'name'
      */
-    void "AdditionalPropertiesArray property name test"() {
+    void 'AdditionalPropertiesArray property name test'() {
-        // TODO: test name
+        // TODO: test name property of AdditionalPropertiesArray
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesBooleanSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.HashMap
 import java.util.Map
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,20 +11,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesBooleanSpec extends Specification {
-    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean()
+    private final AdditionalPropertiesBoolean model = null
 
     /**
      * Model tests for AdditionalPropertiesBoolean
      */
-    void "AdditionalPropertiesBoolean test"() {
+    void 'AdditionalPropertiesBoolean test'() {
         // TODO: test AdditionalPropertiesBoolean
     }
 
     /**
      * Test the property 'name'
      */
-    void "AdditionalPropertiesBoolean property name test"() {
+    void 'AdditionalPropertiesBoolean property name test'() {
-        // TODO: test name
+        // TODO: test name property of AdditionalPropertiesBoolean
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesClassSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.math.BigDecimal
 import java.util.HashMap
 import java.util.List
@@ -15,90 +13,90 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesClassSpec extends Specification {
-    private final AdditionalPropertiesClass model = new AdditionalPropertiesClass()
+    private final AdditionalPropertiesClass model = null
 
     /**
      * Model tests for AdditionalPropertiesClass
      */
-    void "AdditionalPropertiesClass test"() {
+    void 'AdditionalPropertiesClass test'() {
         // TODO: test AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapString'
      */
-    void "AdditionalPropertiesClass property mapString test"() {
+    void 'AdditionalPropertiesClass property mapString test'() {
-        // TODO: test mapString
+        // TODO: test mapString property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapNumber'
      */
-    void "AdditionalPropertiesClass property mapNumber test"() {
+    void 'AdditionalPropertiesClass property mapNumber test'() {
-        // TODO: test mapNumber
+        // TODO: test mapNumber property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapInteger'
      */
-    void "AdditionalPropertiesClass property mapInteger test"() {
+    void 'AdditionalPropertiesClass property mapInteger test'() {
-        // TODO: test mapInteger
+        // TODO: test mapInteger property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapBoolean'
      */
-    void "AdditionalPropertiesClass property mapBoolean test"() {
+    void 'AdditionalPropertiesClass property mapBoolean test'() {
-        // TODO: test mapBoolean
+        // TODO: test mapBoolean property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapArrayInteger'
      */
-    void "AdditionalPropertiesClass property mapArrayInteger test"() {
+    void 'AdditionalPropertiesClass property mapArrayInteger test'() {
-        // TODO: test mapArrayInteger
+        // TODO: test mapArrayInteger property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapArrayAnytype'
      */
-    void "AdditionalPropertiesClass property mapArrayAnytype test"() {
+    void 'AdditionalPropertiesClass property mapArrayAnytype test'() {
-        // TODO: test mapArrayAnytype
+        // TODO: test mapArrayAnytype property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapMapString'
      */
-    void "AdditionalPropertiesClass property mapMapString test"() {
+    void 'AdditionalPropertiesClass property mapMapString test'() {
-        // TODO: test mapMapString
+        // TODO: test mapMapString property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'mapMapAnytype'
      */
-    void "AdditionalPropertiesClass property mapMapAnytype test"() {
+    void 'AdditionalPropertiesClass property mapMapAnytype test'() {
-        // TODO: test mapMapAnytype
+        // TODO: test mapMapAnytype property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'anytype1'
      */
-    void "AdditionalPropertiesClass property anytype1 test"() {
+    void 'AdditionalPropertiesClass property anytype1 test'() {
-        // TODO: test anytype1
+        // TODO: test anytype1 property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'anytype2'
      */
-    void "AdditionalPropertiesClass property anytype2 test"() {
+    void 'AdditionalPropertiesClass property anytype2 test'() {
-        // TODO: test anytype2
+        // TODO: test anytype2 property of AdditionalPropertiesClass
     }
 
     /**
      * Test the property 'anytype3'
      */
-    void "AdditionalPropertiesClass property anytype3 test"() {
+    void 'AdditionalPropertiesClass property anytype3 test'() {
-        // TODO: test anytype3
+        // TODO: test anytype3 property of AdditionalPropertiesClass
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesIntegerSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.HashMap
 import java.util.Map
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,20 +11,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesIntegerSpec extends Specification {
-    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger()
+    private final AdditionalPropertiesInteger model = null
 
     /**
      * Model tests for AdditionalPropertiesInteger
      */
-    void "AdditionalPropertiesInteger test"() {
+    void 'AdditionalPropertiesInteger test'() {
         // TODO: test AdditionalPropertiesInteger
     }
 
     /**
      * Test the property 'name'
      */
-    void "AdditionalPropertiesInteger property name test"() {
+    void 'AdditionalPropertiesInteger property name test'() {
-        // TODO: test name
+        // TODO: test name property of AdditionalPropertiesInteger
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesNumberSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.math.BigDecimal
 import java.util.HashMap
 import java.util.Map
@@ -14,20 +12,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesNumberSpec extends Specification {
-    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber()
+    private final AdditionalPropertiesNumber model = null
 
     /**
      * Model tests for AdditionalPropertiesNumber
      */
-    void "AdditionalPropertiesNumber test"() {
+    void 'AdditionalPropertiesNumber test'() {
         // TODO: test AdditionalPropertiesNumber
     }
 
     /**
      * Test the property 'name'
      */
-    void "AdditionalPropertiesNumber property name test"() {
+    void 'AdditionalPropertiesNumber property name test'() {
-        // TODO: test name
+        // TODO: test name property of AdditionalPropertiesNumber
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesObjectSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.HashMap
 import java.util.Map
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,20 +11,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesObjectSpec extends Specification {
-    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject()
+    private final AdditionalPropertiesObject model = null
 
     /**
      * Model tests for AdditionalPropertiesObject
      */
-    void "AdditionalPropertiesObject test"() {
+    void 'AdditionalPropertiesObject test'() {
         // TODO: test AdditionalPropertiesObject
     }
 
     /**
      * Test the property 'name'
      */
-    void "AdditionalPropertiesObject property name test"() {
+    void 'AdditionalPropertiesObject property name test'() {
-        // TODO: test name
+        // TODO: test name property of AdditionalPropertiesObject
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AdditionalPropertiesStringSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.HashMap
 import java.util.Map
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,20 +11,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AdditionalPropertiesStringSpec extends Specification {
-    private final AdditionalPropertiesString model = new AdditionalPropertiesString()
+    private final AdditionalPropertiesString model = null
 
     /**
      * Model tests for AdditionalPropertiesString
      */
-    void "AdditionalPropertiesString test"() {
+    void 'AdditionalPropertiesString test'() {
         // TODO: test AdditionalPropertiesString
     }
 
     /**
      * Test the property 'name'
      */
-    void "AdditionalPropertiesString property name test"() {
+    void 'AdditionalPropertiesString property name test'() {
-        // TODO: test name
+        // TODO: test name property of AdditionalPropertiesString
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/AnimalSpec.groovy

@@ -1,9 +1,8 @@
 package org.openapitools.model
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -13,27 +12,27 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class AnimalSpec extends Specification {
-    private final Animal model = new Animal()
+    private final Animal model = null
 
     /**
      * Model tests for Animal
      */
-    void "Animal test"() {
+    void 'Animal test'() {
         // TODO: test Animal
     }
 
     /**
      * Test the property 'className'
      */
-    void "Animal property className test"() {
+    void 'Animal property className test'() {
-        // TODO: test className
+        // TODO: test className property of Animal
     }
 
     /**
      * Test the property 'color'
      */
-    void "Animal property color test"() {
+    void 'Animal property color test'() {
-        // TODO: test color
+        // TODO: test color property of Animal
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfArrayOfNumberOnlySpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.math.BigDecimal
 import java.util.ArrayList
 import java.util.List
@@ -14,20 +12,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class ArrayOfArrayOfNumberOnlySpec extends Specification {
-    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly()
+    private final ArrayOfArrayOfNumberOnly model = null
 
     /**
      * Model tests for ArrayOfArrayOfNumberOnly
      */
-    void "ArrayOfArrayOfNumberOnly test"() {
+    void 'ArrayOfArrayOfNumberOnly test'() {
         // TODO: test ArrayOfArrayOfNumberOnly
     }
 
     /**
      * Test the property 'arrayArrayNumber'
      */
-    void "ArrayOfArrayOfNumberOnly property arrayArrayNumber test"() {
+    void 'ArrayOfArrayOfNumberOnly property arrayArrayNumber test'() {
-        // TODO: test arrayArrayNumber
+        // TODO: test arrayArrayNumber property of ArrayOfArrayOfNumberOnly
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayOfNumberOnlySpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.math.BigDecimal
 import java.util.ArrayList
 import java.util.List
@@ -14,20 +12,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class ArrayOfNumberOnlySpec extends Specification {
-    private final ArrayOfNumberOnly model = new ArrayOfNumberOnly()
+    private final ArrayOfNumberOnly model = null
 
     /**
      * Model tests for ArrayOfNumberOnly
      */
-    void "ArrayOfNumberOnly test"() {
+    void 'ArrayOfNumberOnly test'() {
         // TODO: test ArrayOfNumberOnly
     }
 
     /**
      * Test the property 'arrayNumber'
      */
-    void "ArrayOfNumberOnly property arrayNumber test"() {
+    void 'ArrayOfNumberOnly property arrayNumber test'() {
-        // TODO: test arrayNumber
+        // TODO: test arrayNumber property of ArrayOfNumberOnly
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ArrayTestSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.ArrayList
 import java.util.List
 import org.openapitools.model.ReadOnlyFirst
@@ -14,34 +12,34 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class ArrayTestSpec extends Specification {
-    private final ArrayTest model = new ArrayTest()
+    private final ArrayTest model = null
 
     /**
      * Model tests for ArrayTest
      */
-    void "ArrayTest test"() {
+    void 'ArrayTest test'() {
         // TODO: test ArrayTest
     }
 
     /**
      * Test the property 'arrayOfString'
      */
-    void "ArrayTest property arrayOfString test"() {
+    void 'ArrayTest property arrayOfString test'() {
-        // TODO: test arrayOfString
+        // TODO: test arrayOfString property of ArrayTest
     }
 
     /**
      * Test the property 'arrayArrayOfInteger'
      */
-    void "ArrayTest property arrayArrayOfInteger test"() {
+    void 'ArrayTest property arrayArrayOfInteger test'() {
-        // TODO: test arrayArrayOfInteger
+        // TODO: test arrayArrayOfInteger property of ArrayTest
     }
 
     /**
      * Test the property 'arrayArrayOfModel'
      */
-    void "ArrayTest property arrayArrayOfModel test"() {
+    void 'ArrayTest property arrayArrayOfModel test'() {
-        // TODO: test arrayArrayOfModel
+        // TODO: test arrayArrayOfModel property of ArrayTest
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatAllOfSpec.groovy

@@ -1,7 +1,6 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
+import com.fasterxml.jackson.annotation.JsonTypeName
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -11,20 +10,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class BigCatAllOfSpec extends Specification {
-    private final BigCatAllOf model = new BigCatAllOf()
+    private final BigCatAllOf model = null
 
     /**
      * Model tests for BigCatAllOf
      */
-    void "BigCatAllOf test"() {
+    void 'BigCatAllOf test'() {
         // TODO: test BigCatAllOf
     }
 
     /**
      * Test the property 'kind'
      */
-    void "BigCatAllOf property kind test"() {
+    void 'BigCatAllOf property kind test'() {
-        // TODO: test kind
+        // TODO: test kind property of BigCatAllOf
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/BigCatSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import org.openapitools.model.BigCatAllOf
 import org.openapitools.model.Cat
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,41 +11,41 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class BigCatSpec extends Specification {
-    private final BigCat model = new BigCat()
+    private final BigCat model = null
 
     /**
      * Model tests for BigCat
      */
-    void "BigCat test"() {
+    void 'BigCat test'() {
         // TODO: test BigCat
     }
 
     /**
      * Test the property 'className'
      */
-    void "BigCat property className test"() {
+    void 'BigCat property className test'() {
-        // TODO: test className
+        // TODO: test className property of BigCat
     }
 
     /**
      * Test the property 'color'
      */
-    void "BigCat property color test"() {
+    void 'BigCat property color test'() {
-        // TODO: test color
+        // TODO: test color property of BigCat
     }
 
     /**
      * Test the property 'declawed'
      */
-    void "BigCat property declawed test"() {
+    void 'BigCat property declawed test'() {
-        // TODO: test declawed
+        // TODO: test declawed property of BigCat
     }
 
     /**
      * Test the property 'kind'
      */
-    void "BigCat property kind test"() {
+    void 'BigCat property kind test'() {
-        // TODO: test kind
+        // TODO: test kind property of BigCat
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CapitalizationSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -11,55 +9,55 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class CapitalizationSpec extends Specification {
-    private final Capitalization model = new Capitalization()
+    private final Capitalization model = null
 
     /**
      * Model tests for Capitalization
      */
-    void "Capitalization test"() {
+    void 'Capitalization test'() {
         // TODO: test Capitalization
     }
 
     /**
      * Test the property 'smallCamel'
      */
-    void "Capitalization property smallCamel test"() {
+    void 'Capitalization property smallCamel test'() {
-        // TODO: test smallCamel
+        // TODO: test smallCamel property of Capitalization
     }
 
     /**
      * Test the property 'capitalCamel'
      */
-    void "Capitalization property capitalCamel test"() {
+    void 'Capitalization property capitalCamel test'() {
-        // TODO: test capitalCamel
+        // TODO: test capitalCamel property of Capitalization
     }
 
     /**
      * Test the property 'smallSnake'
      */
-    void "Capitalization property smallSnake test"() {
+    void 'Capitalization property smallSnake test'() {
-        // TODO: test smallSnake
+        // TODO: test smallSnake property of Capitalization
     }
 
     /**
      * Test the property 'capitalSnake'
      */
-    void "Capitalization property capitalSnake test"() {
+    void 'Capitalization property capitalSnake test'() {
-        // TODO: test capitalSnake
+        // TODO: test capitalSnake property of Capitalization
     }
 
     /**
      * Test the property 'scAETHFlowPoints'
      */
-    void "Capitalization property scAETHFlowPoints test"() {
+    void 'Capitalization property scAETHFlowPoints test'() {
-        // TODO: test scAETHFlowPoints
+        // TODO: test scAETHFlowPoints property of Capitalization
     }
 
     /**
      * Test the property 'ATT_NAME'
      */
-    void "Capitalization property ATT_NAME test"() {
+    void 'Capitalization property ATT_NAME test'() {
-        // TODO: test ATT_NAME
+        // TODO: test ATT_NAME property of Capitalization
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatAllOfSpec.groovy

@@ -1,7 +1,6 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
+import com.fasterxml.jackson.annotation.JsonTypeName
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -11,20 +10,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class CatAllOfSpec extends Specification {
-    private final CatAllOf model = new CatAllOf()
+    private final CatAllOf model = null
 
     /**
      * Model tests for CatAllOf
      */
-    void "CatAllOf test"() {
+    void 'CatAllOf test'() {
         // TODO: test CatAllOf
     }
 
     /**
      * Test the property 'declawed'
      */
-    void "CatAllOf property declawed test"() {
+    void 'CatAllOf property declawed test'() {
-        // TODO: test declawed
+        // TODO: test declawed property of CatAllOf
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CatSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import org.openapitools.model.Animal
 import org.openapitools.model.CatAllOf
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,34 +11,34 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class CatSpec extends Specification {
-    private final Cat model = new Cat()
+    private final Cat model = null
 
     /**
      * Model tests for Cat
      */
-    void "Cat test"() {
+    void 'Cat test'() {
         // TODO: test Cat
     }
 
     /**
      * Test the property 'className'
      */
-    void "Cat property className test"() {
+    void 'Cat property className test'() {
-        // TODO: test className
+        // TODO: test className property of Cat
     }
 
     /**
      * Test the property 'color'
      */
-    void "Cat property color test"() {
+    void 'Cat property color test'() {
-        // TODO: test color
+        // TODO: test color property of Cat
     }
 
     /**
      * Test the property 'declawed'
      */
-    void "Cat property declawed test"() {
+    void 'Cat property declawed test'() {
-        // TODO: test declawed
+        // TODO: test declawed property of Cat
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/CategorySpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -11,27 +9,27 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class CategorySpec extends Specification {
-    private final Category model = new Category()
+    private final Category model = null
 
     /**
      * Model tests for Category
      */
-    void "Category test"() {
+    void 'Category test'() {
         // TODO: test Category
     }
 
     /**
      * Test the property 'id'
      */
-    void "Category property id test"() {
+    void 'Category property id test'() {
-        // TODO: test id
+        // TODO: test id property of Category
     }
 
     /**
      * Test the property 'name'
      */
-    void "Category property name test"() {
+    void 'Category property name test'() {
-        // TODO: test name
+        // TODO: test name property of Category
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/ClassModelSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -11,20 +9,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class ClassModelSpec extends Specification {
-    private final ClassModel model = new ClassModel()
+    private final ClassModel model = null
 
     /**
      * Model tests for ClassModel
      */
-    void "ClassModel test"() {
+    void 'ClassModel test'() {
         // TODO: test ClassModel
     }
 
     /**
      * Test the property 'propertyClass'
      */
-    void "ClassModel property propertyClass test"() {
+    void 'ClassModel property propertyClass test'() {
-        // TODO: test propertyClass
+        // TODO: test propertyClass property of ClassModel
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogAllOfSpec.groovy

@@ -1,7 +1,6 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
+import com.fasterxml.jackson.annotation.JsonTypeName
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -11,20 +10,20 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class DogAllOfSpec extends Specification {
-    private final DogAllOf model = new DogAllOf()
+    private final DogAllOf model = null
 
     /**
      * Model tests for DogAllOf
      */
-    void "DogAllOf test"() {
+    void 'DogAllOf test'() {
         // TODO: test DogAllOf
     }
 
     /**
      * Test the property 'breed'
      */
-    void "DogAllOf property breed test"() {
+    void 'DogAllOf property breed test'() {
-        // TODO: test breed
+        // TODO: test breed property of DogAllOf
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/DogSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import org.openapitools.model.Animal
 import org.openapitools.model.DogAllOf
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,34 +11,34 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class DogSpec extends Specification {
-    private final Dog model = new Dog()
+    private final Dog model = null
 
     /**
      * Model tests for Dog
      */
-    void "Dog test"() {
+    void 'Dog test'() {
         // TODO: test Dog
     }
 
     /**
      * Test the property 'className'
      */
-    void "Dog property className test"() {
+    void 'Dog property className test'() {
-        // TODO: test className
+        // TODO: test className property of Dog
     }
 
     /**
      * Test the property 'color'
      */
-    void "Dog property color test"() {
+    void 'Dog property color test'() {
-        // TODO: test color
+        // TODO: test color property of Dog
     }
 
     /**
      * Test the property 'breed'
      */
-    void "Dog property breed test"() {
+    void 'Dog property breed test'() {
-        // TODO: test breed
+        // TODO: test breed property of Dog
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumArraysSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.ArrayList
 import java.util.List
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
@@ -13,27 +11,27 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class EnumArraysSpec extends Specification {
-    private final EnumArrays model = new EnumArrays()
+    private final EnumArrays model = null
 
     /**
      * Model tests for EnumArrays
      */
-    void "EnumArrays test"() {
+    void 'EnumArrays test'() {
         // TODO: test EnumArrays
     }
 
     /**
      * Test the property 'justSymbol'
      */
-    void "EnumArrays property justSymbol test"() {
+    void 'EnumArrays property justSymbol test'() {
-        // TODO: test justSymbol
+        // TODO: test justSymbol property of EnumArrays
     }
 
     /**
      * Test the property 'arrayEnum'
      */
-    void "EnumArrays property arrayEnum test"() {
+    void 'EnumArrays property arrayEnum test'() {
-        // TODO: test arrayEnum
+        // TODO: test arrayEnum property of EnumArrays
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumClassSpec.groovy

@@ -12,7 +12,7 @@ public class EnumClassSpec extends Specification {
     /**
      * Model tests for EnumClass
      */
-    void "EnumClass test"() {
+    void 'EnumClass test'() {
         // TODO: test EnumClass
     }
 

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/EnumTestSpec.groovy

@@ -1,7 +1,6 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
+import com.fasterxml.jackson.annotation.JsonTypeName
-import io.swagger.annotations.ApiModelProperty
 import org.openapitools.model.OuterEnum
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
@@ -12,48 +11,48 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class EnumTestSpec extends Specification {
-    private final EnumTest model = new EnumTest()
+    private final EnumTest model = null
 
     /**
      * Model tests for EnumTest
      */
-    void "EnumTest test"() {
+    void 'EnumTest test'() {
         // TODO: test EnumTest
     }
 
     /**
      * Test the property 'enumString'
      */
-    void "EnumTest property enumString test"() {
+    void 'EnumTest property enumString test'() {
-        // TODO: test enumString
+        // TODO: test enumString property of EnumTest
     }
 
     /**
      * Test the property 'enumStringRequired'
      */
-    void "EnumTest property enumStringRequired test"() {
+    void 'EnumTest property enumStringRequired test'() {
-        // TODO: test enumStringRequired
+        // TODO: test enumStringRequired property of EnumTest
     }
 
     /**
      * Test the property 'enumInteger'
      */
-    void "EnumTest property enumInteger test"() {
+    void 'EnumTest property enumInteger test'() {
-        // TODO: test enumInteger
+        // TODO: test enumInteger property of EnumTest
     }
 
     /**
      * Test the property 'enumNumber'
      */
-    void "EnumTest property enumNumber test"() {
+    void 'EnumTest property enumNumber test'() {
-        // TODO: test enumNumber
+        // TODO: test enumNumber property of EnumTest
     }
 
     /**
      * Test the property 'outerEnum'
      */
-    void "EnumTest property outerEnum test"() {
+    void 'EnumTest property outerEnum test'() {
-        // TODO: test outerEnum
+        // TODO: test outerEnum property of EnumTest
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FileSchemaTestClassSpec.groovy

@@ -1,9 +1,8 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.ArrayList
 import java.util.List
+import org.openapitools.model.ModelFile
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -13,27 +12,27 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class FileSchemaTestClassSpec extends Specification {
-    private final FileSchemaTestClass model = new FileSchemaTestClass()
+    private final FileSchemaTestClass model = null
 
     /**
      * Model tests for FileSchemaTestClass
      */
-    void "FileSchemaTestClass test"() {
+    void 'FileSchemaTestClass test'() {
         // TODO: test FileSchemaTestClass
     }
 
     /**
-     * Test the property 'file'
+     * Test the property '_file'
      */
-    void "FileSchemaTestClass property file test"() {
+    void 'FileSchemaTestClass property _file test'() {
-        // TODO: test file
+        // TODO: test _file property of FileSchemaTestClass
     }
 
     /**
      * Test the property 'files'
      */
-    void "FileSchemaTestClass property files test"() {
+    void 'FileSchemaTestClass property files test'() {
-        // TODO: test files
+        // TODO: test files property of FileSchemaTestClass
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/FormatTestSpec.groovy

@@ -1,11 +1,10 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
+import com.fasterxml.jackson.annotation.JsonTypeName
-import io.swagger.annotations.ApiModelProperty
 import java.io.File
 import java.math.BigDecimal
 import java.time.LocalDate
-import java.time.LocalDateTime
+import java.time.OffsetDateTime
 import java.util.UUID
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
@@ -16,111 +15,111 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class FormatTestSpec extends Specification {
-    private final FormatTest model = new FormatTest()
+    private final FormatTest model = null
 
     /**
      * Model tests for FormatTest
      */
-    void "FormatTest test"() {
+    void 'FormatTest test'() {
         // TODO: test FormatTest
     }
 
     /**
      * Test the property 'integer'
      */
-    void "FormatTest property integer test"() {
+    void 'FormatTest property integer test'() {
-        // TODO: test integer
+        // TODO: test integer property of FormatTest
     }
 
     /**
      * Test the property 'int32'
      */
-    void "FormatTest property int32 test"() {
+    void 'FormatTest property int32 test'() {
-        // TODO: test int32
+        // TODO: test int32 property of FormatTest
     }
 
     /**
      * Test the property 'int64'
      */
-    void "FormatTest property int64 test"() {
+    void 'FormatTest property int64 test'() {
-        // TODO: test int64
+        // TODO: test int64 property of FormatTest
     }
 
     /**
      * Test the property 'number'
      */
-    void "FormatTest property number test"() {
+    void 'FormatTest property number test'() {
-        // TODO: test number
+        // TODO: test number property of FormatTest
     }
 
     /**
      * Test the property '_float'
      */
-    void "FormatTest property _float test"() {
+    void 'FormatTest property _float test'() {
-        // TODO: test _float
+        // TODO: test _float property of FormatTest
     }
 
     /**
      * Test the property '_double'
      */
-    void "FormatTest property _double test"() {
+    void 'FormatTest property _double test'() {
-        // TODO: test _double
+        // TODO: test _double property of FormatTest
     }
 
     /**
      * Test the property 'string'
      */
-    void "FormatTest property string test"() {
+    void 'FormatTest property string test'() {
-        // TODO: test string
+        // TODO: test string property of FormatTest
     }
 
     /**
      * Test the property '_byte'
      */
-    void "FormatTest property _byte test"() {
+    void 'FormatTest property _byte test'() {
-        // TODO: test _byte
+        // TODO: test _byte property of FormatTest
     }
 
     /**
      * Test the property 'binary'
      */
-    void "FormatTest property binary test"() {
+    void 'FormatTest property binary test'() {
-        // TODO: test binary
+        // TODO: test binary property of FormatTest
     }
 
     /**
      * Test the property 'date'
      */
-    void "FormatTest property date test"() {
+    void 'FormatTest property date test'() {
-        // TODO: test date
+        // TODO: test date property of FormatTest
     }
 
     /**
      * Test the property 'dateTime'
      */
-    void "FormatTest property dateTime test"() {
+    void 'FormatTest property dateTime test'() {
-        // TODO: test dateTime
+        // TODO: test dateTime property of FormatTest
     }
 
     /**
      * Test the property 'uuid'
      */
-    void "FormatTest property uuid test"() {
+    void 'FormatTest property uuid test'() {
-        // TODO: test uuid
+        // TODO: test uuid property of FormatTest
     }
 
     /**
      * Test the property 'password'
      */
-    void "FormatTest property password test"() {
+    void 'FormatTest property password test'() {
-        // TODO: test password
+        // TODO: test password property of FormatTest
     }
 
     /**
      * Test the property 'bigDecimal'
      */
-    void "FormatTest property bigDecimal test"() {
+    void 'FormatTest property bigDecimal test'() {
-        // TODO: test bigDecimal
+        // TODO: test bigDecimal property of FormatTest
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/HasOnlyReadOnlySpec.groovy

@@ -1,7 +1,6 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
+import com.fasterxml.jackson.annotation.JsonTypeName
-import io.swagger.annotations.ApiModelProperty
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 import jakarta.inject.Inject
@@ -11,27 +10,27 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class HasOnlyReadOnlySpec extends Specification {
-    private final HasOnlyReadOnly model = new HasOnlyReadOnly()
+    private final HasOnlyReadOnly model = null
 
     /**
      * Model tests for HasOnlyReadOnly
      */
-    void "HasOnlyReadOnly test"() {
+    void 'HasOnlyReadOnly test'() {
         // TODO: test HasOnlyReadOnly
     }
 
     /**
      * Test the property 'bar'
      */
-    void "HasOnlyReadOnly property bar test"() {
+    void 'HasOnlyReadOnly property bar test'() {
-        // TODO: test bar
+        // TODO: test bar property of HasOnlyReadOnly
     }
 
     /**
      * Test the property 'foo'
      */
-    void "HasOnlyReadOnly property foo test"() {
+    void 'HasOnlyReadOnly property foo test'() {
-        // TODO: test foo
+        // TODO: test foo property of HasOnlyReadOnly
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MapTestSpec.groovy

@@ -1,7 +1,5 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
-import io.swagger.annotations.ApiModelProperty
 import java.util.HashMap
 import java.util.List
 import java.util.Map
@@ -14,41 +12,41 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class MapTestSpec extends Specification {
-    private final MapTest model = new MapTest()
+    private final MapTest model = null
 
     /**
      * Model tests for MapTest
      */
-    void "MapTest test"() {
+    void 'MapTest test'() {
         // TODO: test MapTest
     }
 
     /**
      * Test the property 'mapMapOfString'
      */
-    void "MapTest property mapMapOfString test"() {
+    void 'MapTest property mapMapOfString test'() {
-        // TODO: test mapMapOfString
+        // TODO: test mapMapOfString property of MapTest
     }
 
     /**
      * Test the property 'mapOfEnumString'
      */
-    void "MapTest property mapOfEnumString test"() {
+    void 'MapTest property mapOfEnumString test'() {
-        // TODO: test mapOfEnumString
+        // TODO: test mapOfEnumString property of MapTest
     }
 
     /**
      * Test the property 'directMap'
      */
-    void "MapTest property directMap test"() {
+    void 'MapTest property directMap test'() {
-        // TODO: test directMap
+        // TODO: test directMap property of MapTest
     }
 
     /**
      * Test the property 'indirectMap'
      */
-    void "MapTest property indirectMap test"() {
+    void 'MapTest property indirectMap test'() {
-        // TODO: test indirectMap
+        // TODO: test indirectMap property of MapTest
     }
 
 }

samples/client/petstore/java-micronaut-client/src/test/groovy/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassSpec.groovy

@@ -1,8 +1,6 @@
 package org.openapitools.model
 
-import io.swagger.annotations.ApiModel
+import java.time.OffsetDateTime
-import io.swagger.annotations.ApiModelProperty
-import java.time.LocalDateTime
 import java.util.HashMap
 import java.util.List
 import java.util.Map
@@ -17,34 +15,34 @@ import jakarta.inject.Inject
  */
 @MicronautTest
 public class MixedPropertiesAndAdditionalPropertiesClassSpec extends Specification {
-    private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass()
+    private final MixedPropertiesAndAdditionalPropertiesClass model = null
 
     /**
      * Model tests for MixedPropertiesAndAdditionalPropertiesClass
      */
-    void "MixedPropertiesAndAdditionalPropertiesClass test"() {
+    void 'MixedPropertiesAndAdditionalPropertiesClass test'() {
         // TODO: test MixedPropertiesAndAdditionalPropertiesClass
     }
 
     /**
      * Test the property 'uuid'
      */
-    void "MixedPropertiesAndAdditionalPropertiesClass property uuid test"() {
+    void 'MixedPropertiesAndAdditionalPropertiesClass property uuid test'() {
-        // TODO: test uuid
+        // TODO: test uuid property of MixedPropertiesAndAdditionalPropertiesClass
     }
 
     /**
      * Test the property 'dateTime'
      */
-    void "MixedPropertiesAndAdditionalPropertiesClass property dateTime test"() {
+    void 'MixedPropertiesAndAdditionalPropertiesClass property dateTime test'() {
-        // TODO: test dateTime
+        // TODO: test dateTime property of MixedPropertiesAndAdditionalPropertiesClass
     }
 
     /**
      * Test the property 'map'
      */
-    void "MixedPropertiesAndAdditionalPropertiesClass property map test"() {
+    void 'MixedPropertiesAndAdditionalPropertiesClass property map test'() {
-        // TODO: test map
+        // TODO: test map property of MixedPropertiesAndAdditionalPropertiesClass
     }
 
 }