From 86097dde84ac876b339d34b0333a2c47638dbf49 Mon Sep 17 00:00:00 2001 From: altro3 Date: Thu, 22 Jun 2023 16:49:15 +0700 Subject: [PATCH 1/4] Code cleanup. Remove extraspaces in generated files. --- .../openapi/annotation/OpenAPIDecorator.java | 2 +- .../openapi/annotation/OpenAPIInclude.java | 2 +- .../openapi/annotation/OpenAPIIncludes.java | 2 +- .../openapi/annotation/OpenAPIManagement.java | 2 +- .../openapi/annotation/OpenAPISecurity.java | 2 +- .../AbstractMicronautJavaCodegen.java | 37 ++++---- .../generator/GeneratorOptionsBuilder.java | 2 +- .../generator/JavaMicronautClientCodegen.java | 20 ++--- .../JavaMicronautClientOptionsBuilder.java | 3 +- .../generator/JavaMicronautServerCodegen.java | 24 ++---- .../JavaMicronautServerOptionsBuilder.java | 3 +- .../generator/MicronautCodeGenerator.java | 3 +- .../MicronautCodeGeneratorBuilder.java | 3 +- .../MicronautCodeGeneratorEntryPoint.java | 22 +++-- .../MicronautCodeGeneratorOptionsBuilder.java | 3 +- .../generator/SerializationLibraryKind.java | 2 +- .../java-micronaut/client/api.mustache | 9 +- .../client/auth/Authorization.mustache | 6 +- .../client/auth/AuthorizationBinder.mustache | 1 - .../client/auth/AuthorizationFilter.mustache | 9 +- .../client/auth/Authorizations.mustache | 4 +- .../client/params/bodyParams.mustache | 2 +- .../client/params/cookieParams.mustache | 2 +- .../client/params/formParams.mustache | 2 +- .../client/params/headerParams.mustache | 2 +- .../client/params/pathParams.mustache | 2 +- .../client/params/queryParams.mustache | 2 +- .../common/configuration/Application.mustache | 3 +- .../common/generatedAnnotation.mustache | 2 +- .../common/licenseInfo.mustache | 2 +- .../common/model/model.mustache | 2 - .../common/operationAnnotations.mustache | 4 +- .../common/test/model_test.mustache | 6 +- .../java-micronaut/server/doc/README.mustache | 1 - .../server/params/annotations.mustache | 8 +- .../server/test/controller_test.mustache | 3 +- .../AbstractMicronautCodegenTest.java | 21 +++-- ...ClientCodegenSerializationLibraryTest.java | 13 ++- .../generator/MicronautClientCodegenTest.java | 83 +++++++++--------- .../MicronautCodeGeneratorEntryPointTest.java | 9 +- .../generator/MicronautServerCodegenTest.java | 86 ++++++++++--------- .../src/test/resources/petstore.json | 2 +- .../openapi/annotation/OpenAPIDecorator.java | 2 +- .../openapi/annotation/OpenAPIInclude.java | 2 +- .../openapi/annotation/OpenAPIIncludes.java | 2 +- .../openapi/annotation/OpenAPIManagement.java | 2 +- .../openapi/annotation/OpenAPISecurity.java | 2 +- .../OpenAPIManagementAnnotationMapper.java | 2 +- .../OpenAPISecurityAnnotationMapper.java | 2 +- ...tRetentionPolicyAnnotationTransformer.java | 2 +- ...eRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...aRetentionPolicyAnnotationTransformer.java | 2 +- ...kRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...tRetentionPolicyAnnotationTransformer.java | 2 +- ...tRetentionPolicyAnnotationTransformer.java | 2 +- ...gRetentionPolicyAnnotationTransformer.java | 2 +- ...gRetentionPolicyAnnotationTransformer.java | 2 +- ...gRetentionPolicyAnnotationTransformer.java | 2 +- ...yRetentionPolicyAnnotationTransformer.java | 2 +- ...nRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...nRetentionPolicyAnnotationTransformer.java | 2 +- ...rRetentionPolicyAnnotationTransformer.java | 2 +- ...nRetentionPolicyAnnotationTransformer.java | 2 +- ...oRetentionPolicyAnnotationTransformer.java | 2 +- ...eRetentionPolicyAnnotationTransformer.java | 2 +- ...rRetentionPolicyAnnotationTransformer.java | 2 +- ...kRetentionPolicyAnnotationTransformer.java | 2 +- ...wRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...eRetentionPolicyAnnotationTransformer.java | 2 +- ...nRetentionPolicyAnnotationTransformer.java | 2 +- ...nRetentionPolicyAnnotationTransformer.java | 2 +- ...rRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...yRetentionPolicyAnnotationTransformer.java | 2 +- ...aRetentionPolicyAnnotationTransformer.java | 2 +- ...tRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...eRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...rRetentionPolicyAnnotationTransformer.java | 2 +- ...eRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- ...gRetentionPolicyAnnotationTransformer.java | 2 +- ...sRetentionPolicyAnnotationTransformer.java | 2 +- .../introspections/CallbackConfiguration.java | 2 +- .../introspections/ExampleConfiguration.java | 2 +- .../introspections/HeaderConfiguration.java | 2 +- .../introspections/InfoConfiguration.java | 2 +- .../introspections/LinksConfiguration.java | 2 +- .../introspections/MediaConfiguration.java | 2 +- .../introspections/ModelConfiguration.java | 2 +- .../ParametersConfiguration.java | 2 +- .../ResponsesConfiguration.java | 2 +- .../introspections/SecurityConfiguration.java | 2 +- .../introspections/ServerConfiguration.java | 2 +- .../introspections/TagsConfiguration.java | 2 +- .../openapi/javadoc/JavadocDescription.java | 2 +- .../openapi/javadoc/JavadocParser.java | 2 +- .../JacksonDiscriminatorPostProcessor.java | 2 +- .../OpenApiOperationsPostProcessor.java | 2 +- .../core/jackson/ApiResponsesSerializer.java | 2 +- .../core/jackson/CallbackSerializer.java | 2 +- .../core/jackson/ExampleSerializer.java | 2 +- .../core/jackson/MediaTypeSerializer.java | 2 +- .../swagger/core/jackson/PathsSerializer.java | 2 +- .../core/jackson/Schema31Serializer.java | 2 +- .../core/jackson/SchemaSerializer.java | 2 +- .../core/jackson/mixin/Components31Mixin.java | 2 +- .../core/jackson/mixin/ComponentsMixin.java | 2 +- .../core/jackson/mixin/DateSchemaMixin.java | 2 +- .../jackson/mixin/Discriminator31Mixin.java | 2 +- .../jackson/mixin/DiscriminatorMixin.java | 2 +- .../core/jackson/mixin/ExampleMixin.java | 2 +- .../core/jackson/mixin/ExtensionsMixin.java | 2 +- .../core/jackson/mixin/Info31Mixin.java | 2 +- .../swagger/core/jackson/mixin/InfoMixin.java | 2 +- .../core/jackson/mixin/LicenseMixin.java | 2 +- .../core/jackson/mixin/MediaTypeMixin.java | 2 +- .../core/jackson/mixin/OpenAPI31Mixin.java | 2 +- .../core/jackson/mixin/OpenAPIMixin.java | 2 +- .../core/jackson/mixin/OperationMixin.java | 2 +- .../core/jackson/mixin/Schema31Mixin.java | 2 +- .../jackson/mixin/SchemaConverterMixin.java | 2 +- .../core/jackson/mixin/SchemaMixin.java | 2 +- .../core/util/ApiResponses31Deserializer.java | 2 +- .../core/util/ApiResponsesDeserializer.java | 2 +- .../core/util/Callback31Deserializer.java | 2 +- .../core/util/CallbackDeserializer.java | 2 +- .../core/util/DeserializationModule.java | 2 +- .../core/util/DeserializationModule31.java | 2 +- ...EncodingPropertyStyleEnumDeserializer.java | 2 +- .../util/EncodingStyleEnumDeserializer.java | 2 +- .../util/HeaderStyleEnumDeserializer.java | 2 +- .../core/util/Model31Deserializer.java | 2 +- .../swagger/core/util/ModelDeserializer.java | 2 +- .../core/util/ObjectMapperFactory.java | 2 +- .../core/util/OpenAPI31Deserializer.java | 2 +- .../core/util/Parameter31Deserializer.java | 2 +- .../core/util/ParameterDeserializer.java | 2 +- .../core/util/Paths31Deserializer.java | 2 +- .../swagger/core/util/PathsDeserializer.java | 2 +- .../swagger/core/util/PrimitiveType.java | 2 +- .../util/SecurityScheme31Deserializer.java | 2 +- .../core/util/SecuritySchemeDeserializer.java | 2 +- .../openapi/view/AbstractViewConfig.java | 2 +- .../openapi/view/OpenApiViewConfig.java | 2 +- .../micronaut/openapi/view/RapiPDFConfig.java | 2 +- .../micronaut/openapi/view/RapidocConfig.java | 2 +- .../micronaut/openapi/view/RedocConfig.java | 2 +- .../openapi/view/SwaggerUIConfig.java | 2 +- .../AbstractOpenApiEndpointVisitor.java | 2 +- .../visitor/AbstractOpenApiVisitor.java | 2 +- .../visitor/AnnProcessorEnvironment.java | 2 +- .../openapi/visitor/ContextUtils.java | 2 +- .../openapi/visitor/ConvertUtils.java | 2 +- .../micronaut/openapi/visitor/Endpoint.java | 2 +- .../visitor/EndpointsConfiguration.java | 2 +- .../openapi/visitor/NumberUtils.java | 2 +- .../visitor/OpenApiApplicationVisitor.java | 2 +- .../visitor/OpenApiControllerVisitor.java | 2 +- .../visitor/OpenApiEndpointVisitor.java | 2 +- .../visitor/OpenApiIncludeVisitor.java | 2 +- .../visitor/OpenApiJacksonVisitor.java | 2 +- .../io/micronaut/openapi/visitor/Pair.java | 2 +- .../openapi/visitor/SchemaUtils.java | 2 +- .../io/micronaut/openapi/visitor/Utils.java | 2 +- .../openapi/visitor/VisibilityLevel.java | 2 +- .../openapi/visitor/package-info.java | 2 +- .../src/test/resources/swagger/petstore.yml | 2 +- test-suite-client-generator/petstore.json | 2 +- .../test/api/ParametersControllerSpec.groovy | 1 - 175 files changed, 344 insertions(+), 339 deletions(-) diff --git a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java index 9274225270..fd0ffa82ac 100644 --- a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java +++ b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java index cf3662e687..f74bbb988b 100644 --- a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java +++ b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java index ea58e61af9..2aa0b45688 100644 --- a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java +++ b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java index 6e96a9b726..829b774b0c 100644 --- a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java +++ b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java index d268eda450..8fdb604f44 100644 --- a/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java +++ b/openapi-annotations/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java index 50fe4f7698..6e505e981e 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java @@ -52,6 +52,7 @@ import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE; abstract class AbstractMicronautJavaCodegen extends AbstractJavaCodegen implements BeanValidationFeatures, OptionalFeatures, MicronautCodeGenerator { + public static final String OPT_TITLE = "title"; public static final String OPT_TEST = "test"; public static final String OPT_TEST_JUNIT = "junit"; @@ -142,8 +143,8 @@ protected AbstractMicronautJavaCodegen() { additionalProperties.put("closebrace", "}"); // Set client options that will be presented to user - updateOption(INVOKER_PACKAGE, this.getInvokerPackage()); - updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId()); + updateOption(INVOKER_PACKAGE, getInvokerPackage()); + updateOption(CodegenConstants.ARTIFACT_ID, getArtifactId()); updateOption(CodegenConstants.API_PACKAGE, apiPackage); updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); @@ -233,7 +234,7 @@ public void setApiPackage(String apiPackage) { @Override public void setInvokerPackage(String invokerPackage) { super.setInvokerPackage(invokerPackage); - updateOption(INVOKER_PACKAGE, this.getInvokerPackage()); + updateOption(INVOKER_PACKAGE, getInvokerPackage()); } @Override @@ -242,7 +243,7 @@ public void processOpts() { // Get properties if (additionalProperties.containsKey(OPT_TITLE)) { - this.title = (String) additionalProperties.get(OPT_TITLE); + title = (String) additionalProperties.get(OPT_TITLE); } if (additionalProperties.containsKey(INVOKER_PACKAGE)) { @@ -259,37 +260,37 @@ public void processOpts() { // Get boolean properties if (additionalProperties.containsKey(USE_BEANVALIDATION)) { - this.setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION)); + setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION)); } writePropertyBack(USE_BEANVALIDATION, useBeanValidation); if (additionalProperties.containsKey(USE_OPTIONAL)) { - this.setUseOptional(convertPropertyToBoolean(USE_OPTIONAL)); + setUseOptional(convertPropertyToBoolean(USE_OPTIONAL)); } writePropertyBack(USE_OPTIONAL, useOptional); if (additionalProperties.containsKey(OPT_VISITABLE)) { - this.setVisitable(convertPropertyToBoolean(OPT_VISITABLE)); + setVisitable(convertPropertyToBoolean(OPT_VISITABLE)); } writePropertyBack(OPT_VISITABLE, visitable); if (additionalProperties.containsKey(OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR)) { - this.requiredPropertiesInConstructor = convertPropertyToBoolean(OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR); + requiredPropertiesInConstructor = convertPropertyToBoolean(OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR); } writePropertyBack(OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR, requiredPropertiesInConstructor); if (additionalProperties.containsKey(OPT_REACTIVE)) { - this.reactive = convertPropertyToBoolean(OPT_REACTIVE); + reactive = convertPropertyToBoolean(OPT_REACTIVE); } writePropertyBack(OPT_REACTIVE, reactive); if (additionalProperties.containsKey(OPT_WRAP_IN_HTTP_RESPONSE)) { - this.wrapInHttpResponse = convertPropertyToBoolean(OPT_WRAP_IN_HTTP_RESPONSE); + wrapInHttpResponse = convertPropertyToBoolean(OPT_WRAP_IN_HTTP_RESPONSE); } 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); + generateOperationOnlyForFirstTag = convertPropertyToBoolean(OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG); } writePropertyBack(OPT_GENERATE_OPERATION_ONLY_FOR_FIRST_TAG, generateOperationOnlyForFirstTag); @@ -302,16 +303,16 @@ public void processOpts() { } maybeSetSwagger(); - if (OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1.equals(this.generateSwaggerAnnotations)) { + if (OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1.equals(generateSwaggerAnnotations)) { additionalProperties.put("generateSwagger1Annotations", true); - } else if (OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2.equals(this.generateSwaggerAnnotations)) { + } else if (OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2.equals(generateSwaggerAnnotations)) { additionalProperties.put("generateSwagger2Annotations", true); } if (additionalProperties.containsKey(CodegenConstants.SERIALIZATION_LIBRARY)) { setSerializationLibrary((String) additionalProperties.get(CodegenConstants.SERIALIZATION_LIBRARY)); } - additionalProperties.put(this.serializationLibrary.toLowerCase(Locale.US), true); + additionalProperties.put(serializationLibrary.toLowerCase(Locale.US), true); if (SerializationLibraryKind.MICRONAUT_SERDE_JACKSON.name().equals(serializationLibrary)) { additionalProperties.put(SerializationLibraryKind.JACKSON.name().toLowerCase(Locale.US), true); } @@ -376,11 +377,11 @@ private void maybeSetSwagger() { 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; + generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_1; case OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2, OPT_GENERATE_SWAGGER_ANNOTATIONS_TRUE -> - this.generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2; + generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_SWAGGER_2; case OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE -> - this.generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE; + generateSwaggerAnnotations = OPT_GENERATE_SWAGGER_ANNOTATIONS_FALSE; default -> throw new RuntimeException("Value \"" + value + "\" for the " + OPT_GENERATE_SWAGGER_ANNOTATIONS + " parameter is unsupported or misspelled"); } @@ -391,7 +392,7 @@ private void maybeSetTestTool() { if (additionalProperties.containsKey(OPT_TEST)) { switch ((String) additionalProperties.get(OPT_TEST)) { case OPT_TEST_JUNIT, OPT_TEST_SPOCK -> - this.testTool = (String) additionalProperties.get(OPT_TEST); + testTool = (String) additionalProperties.get(OPT_TEST); default -> throw new RuntimeException("Test tool \"" + additionalProperties.get(OPT_TEST) + "\" is not supported or misspelled."); } diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/GeneratorOptionsBuilder.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/GeneratorOptionsBuilder.java index 553f9ecd86..f23fd75ddf 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/GeneratorOptionsBuilder.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/GeneratorOptionsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java index 5a1e7bf34c..9e4737bfc0 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java @@ -24,7 +24,6 @@ import java.util.Arrays; import java.util.List; - class JavaMicronautClientCodegen extends AbstractMicronautJavaCodegen { public static final String OPT_CONFIGURE_AUTH = "configureAuth"; @@ -43,8 +42,7 @@ class JavaMicronautClientCodegen extends AbstractMicronautJavaCodegen additionalClie public void setAuthorizationFilterPattern(final String pattern) { writePropertyBack(OPT_CONFIGURE_AUTH_FILTER_PATTERN, true); - this.authorizationFilterPattern = pattern; + authorizationFilterPattern = pattern; } public void setClientId(final String id) { writePropertyBack(OPT_CONFIGURE_CLIENT_ID, true); - this.clientId = id; + clientId = id; } public void setBasePathSeparator(final String separator) { - this.basePathSeparator = separator; + basePathSeparator = separator; } public void setConfigureAuthorization(boolean configureAuthorization) { diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientOptionsBuilder.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientOptionsBuilder.java index 823aef84a4..df50f63364 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientOptionsBuilder.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientOptionsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ */ @SuppressWarnings("UnusedReturnValue") public interface JavaMicronautClientOptionsBuilder extends GeneratorOptionsBuilder { + /** * If set to true the client will be configured for authorization. * diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java index 8bc69c106a..698e54c3ba 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerCodegen.java @@ -26,10 +26,9 @@ import java.io.File; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; - class JavaMicronautServerCodegen extends AbstractMicronautJavaCodegen { + public static final String OPT_CONTROLLER_PACKAGE = "controllerPackage"; public static final String OPT_GENERATE_CONTROLLER_FROM_EXAMPLES = "generateControllerFromExamples"; public static final String OPT_GENERATE_IMPLEMENTATION_FILES = "generateImplementationFiles"; @@ -59,8 +58,7 @@ class JavaMicronautServerCodegen extends AbstractMicronautJavaCodegen roles = (List) operation.vendorExtensions.get(EXTENSION_ROLES); - roles = roles.stream().map(role -> { - switch (role) { - case ANONYMOUS_ROLE_KEY: - return ANONYMOUS_ROLE; - case AUTHORIZED_ROLE_KEY: - return AUTHORIZED_ROLE; - case DENY_ALL_ROLE_KEY: - return DENY_ALL_ROLE; - default: - return "\"" + escapeText(role) + "\""; - } - }).collect(Collectors.toList()); + roles = roles.stream().map(role -> switch (role) { + case ANONYMOUS_ROLE_KEY -> ANONYMOUS_ROLE; + case AUTHORIZED_ROLE_KEY -> AUTHORIZED_ROLE; + case DENY_ALL_ROLE_KEY -> DENY_ALL_ROLE; + default -> "\"" + escapeText(role) + "\""; + }).toList(); operation.vendorExtensions.put(EXTENSION_ROLES, roles); } } diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerOptionsBuilder.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerOptionsBuilder.java index b780255644..d05c1a2f7d 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerOptionsBuilder.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautServerOptionsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ */ @SuppressWarnings("UnusedReturnValue") public interface JavaMicronautServerOptionsBuilder extends GeneratorOptionsBuilder { + /** * Sets the package name of generated controller classes. * diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGenerator.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGenerator.java index 4af653a0de..ad1b2399a2 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGenerator.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,5 +22,6 @@ * @param The type of generator options builder. */ public interface MicronautCodeGenerator { + T optionsBuilder(); } diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorBuilder.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorBuilder.java index 397b121246..e8e99e6c38 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorBuilder.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ */ @SuppressWarnings("UnusedReturnValue") public interface MicronautCodeGeneratorBuilder { + /** * Sets the code generator which should be used (e.g server or client). * diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java index dcb9510340..d0fabfec48 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ * Main entry point for Micronaut OpenAPI code generation. */ public final class MicronautCodeGeneratorEntryPoint { + private final URI definitionFile; private final File outputDirectory; private final AbstractMicronautJavaCodegen codeGenerator; @@ -197,7 +198,9 @@ public static OutputKind of(String name) { } private static class DefaultBuilder implements MicronautCodeGeneratorBuilder { + private static final Consumer HAS_OUTPUT = b -> Objects.requireNonNull(b.outputDirectory, "Sources directory must not be null"); + private Options options; private AbstractMicronautJavaCodegen codeGenerator; private URI definitionFile; @@ -208,7 +211,7 @@ private static class DefaultBuilder implements MicronautCodeGeneratorBuilder { @Override public > MicronautCodeGeneratorBuilder forCodeGenerator(G generator, Consumer configuration) { - this.codeGenerator = (AbstractMicronautJavaCodegen) generator; + codeGenerator = (AbstractMicronautJavaCodegen) generator; var builder = generator.optionsBuilder(); configuration.accept(builder); return this; @@ -216,19 +219,19 @@ public > @Override public MicronautCodeGeneratorBuilder forClient(Consumer clientOptionsSpec) { - this.codeGenerator = new JavaMicronautClientCodegen(); + codeGenerator = new JavaMicronautClientCodegen(); var clientOptionsBuilder = new JavaMicronautClientCodegen.DefaultClientOptionsBuilder(); clientOptionsSpec.accept(clientOptionsBuilder); - this.clientOptions = clientOptionsBuilder.build(); + clientOptions = clientOptionsBuilder.build(); return this; } @Override public MicronautCodeGeneratorBuilder forServer(Consumer serverOptionsSpec) { - this.codeGenerator = new JavaMicronautServerCodegen(); + codeGenerator = new JavaMicronautServerCodegen(); var serverOptionsBuilder = new JavaMicronautServerCodegen.DefaultServerOptionsBuilder(); serverOptionsSpec.accept(serverOptionsBuilder); - this.serverOptions = serverOptionsBuilder.build(); + serverOptions = serverOptionsBuilder.build(); return this; } @@ -246,7 +249,7 @@ public MicronautCodeGeneratorBuilder withOutputDirectory(File outputDirectory) { @Override public MicronautCodeGeneratorBuilder withOutputs(OutputKind... elements) { - this.outputs.addAll(Arrays.asList(elements)); + outputs.addAll(Arrays.asList(elements)); return this; } @@ -254,7 +257,7 @@ public MicronautCodeGeneratorBuilder withOutputs(OutputKind... elements) { public MicronautCodeGeneratorBuilder withOptions(Consumer optionsConfigurer) { DefaultOptionsBuilder builder = new DefaultOptionsBuilder(); optionsConfigurer.accept(builder); - this.options = builder.build(); + options = builder.build(); return this; } @@ -279,6 +282,7 @@ public MicronautCodeGeneratorEntryPoint build() { } private static class DefaultOptionsBuilder implements MicronautCodeGeneratorOptionsBuilder { + private String apiPackage; private String artifactId; private boolean beanValidation = true; @@ -346,7 +350,7 @@ public MicronautCodeGeneratorOptionsBuilder withTestFramework(TestFramework test @Override public MicronautCodeGeneratorOptionsBuilder withSerializationLibrary(SerializationLibraryKind library) { - this.serializationLibraryKind = library; + serializationLibraryKind = library; return this; } diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java index 3c41909dbd..40566c8d85 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/MicronautCodeGeneratorOptionsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ */ @SuppressWarnings("UnusedReturnValue") public interface MicronautCodeGeneratorOptionsBuilder { + /** * Sets the package of the generated API classes. * diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/SerializationLibraryKind.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/SerializationLibraryKind.java index 86c60b9eaf..22f1d5184f 100644 --- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/SerializationLibraryKind.java +++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/SerializationLibraryKind.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/api.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/api.mustache index 9f0b70835f..048a4579e3 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/api.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/api.mustache @@ -44,14 +44,14 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; {{{.}}} {{/additionalClientTypeAnnotations}} {{>common/generatedAnnotation}} -@Client({{#configureClientId}} - id = "{{clientId}}", +@Client({{#configureClientId}}id = "{{clientId}}", path = {{/configureClientId}}"${{openbrace}}{{{applicationName}}}{{basePathSeparator}}base-path{{closebrace}}") public interface {{classname}} { {{#operations}} + {{#operation}} {{>common/operationAnnotations}}{{! -}} @{{#lambda.pascalcase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.pascalcase}}(uri="{{{path}}}") +}} @{{#lambda.pascalcase}}{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}{{/lambda.pascalcase}}("{{{path}}}") {{#hasProduces}} {{#produces}}{{#-first}}@Consumes({{openbrace}}{{/-first}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{#-last}}{{closebrace}}){{/-last}}{{/produces}} {{/hasProduces}} @@ -61,14 +61,13 @@ public interface {{classname}} { {{!auth methods}} {{#configureAuth}} {{#authMethods}} - @Authorization(name="{{{name}}}"{{!scopes}}{{#isOAuth}}, scopes={{openbrace}}{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}{{closebrace}}{{/isOAuth}}) + @Authorization(name = "{{{name}}}"{{!scopes}}{{#isOAuth}}, scopes = {{openbrace}}{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}{{closebrace}}{{/isOAuth}}) {{/authMethods}} {{/configureAuth}} {{!the method definition}} {{>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}} } diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorization.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorization.mustache index 6d3f706ffb..7895016134 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorization.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorization.mustache @@ -13,7 +13,6 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import {{javaxPackage}}.annotation.Generated; - {{>common/generatedAnnotation}} @Documented @Retention(RUNTIME) @@ -21,16 +20,17 @@ import {{javaxPackage}}.annotation.Generated; @Bindable @Repeatable(Authorizations.class) public @interface Authorization { + /** * The name of the authorization */ - @AliasFor(annotation=Bindable.class, member="value") + @AliasFor(annotation = Bindable.class, member = "value") String value() default ""; /** * The name of the authorization */ - @AliasFor(annotation=Bindable.class, member="value") + @AliasFor(annotation = Bindable.class, member = "value") String name() default ""; /** diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationBinder.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationBinder.mustache index 4b26586d84..e61f9e1e99 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationBinder.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationBinder.mustache @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.List; import {{javaxPackage}}.annotation.Generated; - {{>common/generatedAnnotation}} @Singleton public class AuthorizationBinder implements AnnotatedClientRequestBinder { diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationFilter.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationFilter.mustache index a52b4294c6..d2150def26 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationFilter.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/AuthorizationFilter.mustache @@ -39,7 +39,8 @@ import {{javaxPackage}}.annotation.Generated; {{>common/generatedAnnotation}} @Filter({{#configureAuthFilterPattern}}"{{authorizationFilterPattern}}"{{/configureAuthFilterPattern}}{{^configureAuthFilterPattern}}Filter.MATCH_ALL_PATTERN{{/configureAuthFilterPattern}}) public class AuthorizationFilter implements HttpClientFilter { - private static final Logger LOG = LoggerFactory.getLogger(ClientCredentialsHttpClientFilter.class); + + private static final Logger log = LoggerFactory.getLogger(ClientCredentialsHttpClientFilter.class); private final BeanContext beanContext; private final Map clientConfigurationByName; @@ -76,7 +77,7 @@ public class AuthorizationFilter implements HttpClientFilter { if (CollectionUtils.isNotEmpty(names)) { List> authorizers = new ArrayList<>(names.size()); - for (Object nameObject: names) { + for (Object nameObject : names) { if (!(nameObject instanceof String)) { continue; } @@ -100,9 +101,7 @@ public class AuthorizationFilter implements HttpClientFilter { ClientCredentialsClient clientCredentialsClient = getClientCredentialsClient(name); if (clientCredentialsClient == null) { - if (LOG.isTraceEnabled()) { - LOG.trace("Could not retrieve client credentials client for OAuth 2.0 client {}", name); - } + log.trace("Could not retrieve client credentials client for OAuth 2.0 client {}", name); continue; } diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorizations.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorizations.mustache index 5cdd5363d7..638594c58a 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorizations.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/auth/Authorizations.mustache @@ -10,12 +10,12 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import {{javaxPackage}}.annotation.Generated; - {{>common/generatedAnnotation}} @Documented @Retention(RUNTIME) @Target(METHOD) @Bindable public @interface Authorizations { + Authorization[] value(); -} \ No newline at end of file +} diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/bodyParams.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/bodyParams.mustache index 2b294afc7a..8169f17953 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/bodyParams.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@Body {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isBodyParam}} +{{#isBodyParam}}@Body {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/cookieParams.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/cookieParams.mustache index 8b62cfe5aa..147fc9ee22 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/cookieParams.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/cookieParams.mustache @@ -1 +1 @@ -{{#isCookieParam}}@CookieValue(value="{{baseName}}"{{#defaultValue}}, defaultValue="{{defaultValue}}"{{/defaultValue}}) {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isCookieParam}} +{{#isCookieParam}}@CookieValue(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{defaultValue}}"{{/defaultValue}}) {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isCookieParam}} \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/formParams.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/formParams.mustache index e83a69f8dc..754d319fdb 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/formParams.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isFormParam}} +{{#isFormParam}}{{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isFormParam}} \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/headerParams.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/headerParams.mustache index 1f51ae97e0..2c8fa348c8 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/headerParams.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}@Header(name="{{baseName}}"{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isHeaderParam}} +{{#isHeaderParam}}@Header(name = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/pathParams.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/pathParams.mustache index 87f126b8a4..0ac89b980f 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/pathParams.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}@PathVariable(name="{{baseName}}"{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isPathParam}} +{{#isPathParam}}@PathVariable(name = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isPathParam}} \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/queryParams.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/queryParams.mustache index 33ca4fca8e..879dbc9e90 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/client/params/queryParams.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/client/params/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}@QueryValue(value="{{{baseName}}}"{{!default value}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{!validation and type}}{{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isQueryParam}} +{{#isQueryParam}}@QueryValue(value = "{{{baseName}}}"{{!default value}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{!validation and type}}{{>common/params/validation}}{{>client/params/type}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/configuration/Application.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/configuration/Application.mustache index ad59c5fa12..4a31d7f071 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/configuration/Application.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/configuration/Application.mustache @@ -3,7 +3,8 @@ package {{invokerPackage}}; import io.micronaut.runtime.Micronaut; public class Application { + public static void main(String[] args) { Micronaut.run(Application.class, args); } -} \ No newline at end of file +} diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/generatedAnnotation.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/generatedAnnotation.mustache index 98fbb9f7da..2f8ef3059f 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/generatedAnnotation.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/generatedAnnotation.mustache @@ -1 +1 @@ -@Generated(value="{{generatorClass}}"{{^hideGenerationTimestamp}}, date="{{generatedDate}}"{{/hideGenerationTimestamp}}) \ No newline at end of file +@Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}) \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/licenseInfo.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/licenseInfo.mustache index abc2f4578e..9a274d9ebd 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/licenseInfo.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/licenseInfo.mustache @@ -8,4 +8,4 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * Do not edit the class manually. - */ + */ \ No newline at end of file diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/model.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/model.mustache index 0c8fc80375..a5a48a2b9d 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/model.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/model.mustache @@ -1,6 +1,5 @@ {{>common/licenseInfo}} package {{package}}; - {{#formatNoEmptyLines}} {{#useReflectionEqualsHashCode}} import org.apache.commons.lang3.builder.EqualsBuilder; @@ -55,7 +54,6 @@ import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema; {{/generateSwagger2Annotations}} {{/formatNoEmptyLines}} - {{#formatOneEmptyLine}} {{#models}} {{#model}} diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/operationAnnotations.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/operationAnnotations.mustache index b0bd1a43f4..36a3b9b393 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/operationAnnotations.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/operationAnnotations.mustache @@ -10,15 +10,17 @@ * {{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 {{summary}} Documentation {{/externalDocs}} */ diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/test/model_test.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/test/model_test.mustache index 0879e420aa..67d1d0be1f 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/common/test/model_test.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/common/test/model_test.mustache @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Assertions; * Model tests for {{classname}} */ @MicronautTest -public class {{classname}}Test { +class {{classname}}Test { {{#models}} {{#model}} {{^vendorExtensions.x-is-one-of-interface}} @@ -22,7 +22,7 @@ public class {{classname}}Test { * Model tests for {{classname}} */ @Test - public void test{{classname}}() { + void test{{classname}}() { // TODO: test {{classname}} } @@ -31,7 +31,7 @@ public class {{classname}}Test { * Test the property '{{name}}' */ @Test - public void {{name}}Test() { + void {{name}}Test() { // TODO: test {{name}} } diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/server/doc/README.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/server/doc/README.mustache index 6488748003..d1e0408089 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/server/doc/README.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/server/doc/README.mustache @@ -24,4 +24,3 @@ Description on how to create Apis is given inside individual api guides: {{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}} {{/hasMore}}{{/apis}}{{/apiInfo}} - diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/server/params/annotations.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/server/params/annotations.mustache index 3e215963d2..da0459b43c 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/server/params/annotations.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/server/params/annotations.mustache @@ -1,12 +1,12 @@ {{#isQueryParam}} - @QueryValue({{#defaultValue}}value={{/defaultValue}}"{{{baseName}}}"{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) + @QueryValue({{#defaultValue}}value = {{/defaultValue}}"{{{baseName}}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{/isQueryParam}} {{#isPathParam}} - @PathVariable({{#defaultValue}}value={{/defaultValue}}"{{baseName}}"{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) + @PathVariable({{#defaultValue}}value = {{/defaultValue}}"{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{/isPathParam}} {{#isHeaderParam}} - @Header({{#defaultValue}}value={{/defaultValue}}"{{baseName}}"{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) + @Header({{#defaultValue}}value = {{/defaultValue}}"{{baseName}}"{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{/isHeaderParam}} {{#isBodyParam}} {{#isMultipart}} @@ -19,5 +19,5 @@ {{#isFormParam}} {{/isFormParam}} {{#isCookieParam}} - @CookieValue({{#defaultValue}}value={{/defaultValue}}"{{baseName}}"{{#defaultValue}}, defaultValue="{{defaultValue}}"{{/defaultValue}}) + @CookieValue({{#defaultValue}}value = {{/defaultValue}}"{{baseName}}"{{#defaultValue}}, defaultValue = "{{defaultValue}}"{{/defaultValue}}) {{/isCookieParam}} diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/server/test/controller_test.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/server/test/controller_test.mustache index 75cb7bd30b..2201915844 100644 --- a/openapi-generator/src/main/resources/templates/java-micronaut/server/test/controller_test.mustache +++ b/openapi-generator/src/main/resources/templates/java-micronaut/server/test/controller_test.mustache @@ -33,12 +33,11 @@ import java.util.List; import java.util.Map; import java.util.HashSet; - /** * API tests for {{classname}} */ @MicronautTest -public class {{classname}}Test { +class {{classname}}Test { @Inject EmbeddedServer server; diff --git a/openapi-generator/src/test/java/io/micronaut/openapi/generator/AbstractMicronautCodegenTest.java b/openapi-generator/src/test/java/io/micronaut/openapi/generator/AbstractMicronautCodegenTest.java index 4e3c77c724..69ec893783 100644 --- a/openapi-generator/src/test/java/io/micronaut/openapi/generator/AbstractMicronautCodegenTest.java +++ b/openapi-generator/src/test/java/io/micronaut/openapi/generator/AbstractMicronautCodegenTest.java @@ -15,21 +15,21 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; - /** * An abstract class with methods useful for testing */ public abstract class AbstractMicronautCodegenTest { + /** * Path to a common test configuration file */ protected final String PETSTORE_PATH = "src/test/resources/petstore.json"; /** - * * @param codegen - the code generator * @param configPath - the path to the config starting from src/test/resources * @param filesToGenerate - which files to generate - can be CodegenConstants.MODELS, APIS, SUPPORTING_FILES, ... + * * @return - the path to the generated folder */ protected String generateFiles(AbstractMicronautJavaCodegen codegen, String configPath, String... filesToGenerate) { @@ -42,7 +42,8 @@ protected String generateFiles(AbstractMicronautJavaCodegen codegen, String c output.deleteOnExit(); MicronautCodeGeneratorEntryPoint.builder() - .forCodeGenerator(codegen, unused -> {}) + .forCodeGenerator(codegen, unused -> { + }) .withDefinitionFile(new File(configPath).toURI()) .withOutputDirectory(output) .withOutputs(Arrays.stream(filesToGenerate) @@ -63,29 +64,33 @@ protected String generateFiles(AbstractMicronautJavaCodegen codegen, String c public static void assertFileContainsRegex(String path, String... regex) { assertFileExists(path); String file = readFile(path); - for (String line: regex) + for (String line : regex) { assertTrue(Pattern.compile(line.replace(" ", "\\s+")).matcher(file).find()); + } } public static void assertFileNotContainsRegex(String path, String... regex) { assertFileExists(path); String file = readFile(path); - for (String line: regex) + for (String line : regex) { assertFalse(Pattern.compile(line.replace(" ", "\\s+")).matcher(file).find()); + } } public static void assertFileContains(String path, String... lines) { assertFileExists(path); String file = linearize(readFile(path)); - for (String line : lines) + for (String line : lines) { assertTrue(file.contains(linearize(line)), "File does not contain line [" + line + "]"); + } } public static void assertFileNotContains(String path, String... lines) { assertFileExists(path); String file = linearize(readFile(path)); - for (String line : lines) + for (String line : lines) { assertFalse(file.contains(linearize(line)), "File contains line [" + line + "]"); + } } public static void assertFileExists(String file) { @@ -94,7 +99,7 @@ public static void assertFileExists(String file) { while (path.getParent() != null && !path.getParent().toFile().exists()) { path = path.getParent(); } - String message = "File \"" + file + "\" should exist, however \"" + path + "\" could not be found."; + String message = "File \"" + file + "\" should exist, however \"" + path + "\" could not be found."; if (path.getParent() != null) { Path parent = path.getParent(); File[] contents = parent.toFile().listFiles(); diff --git a/openapi-generator/src/test/java/io/micronaut/openapi/generator/JavaMicronautClientCodegenSerializationLibraryTest.java b/openapi-generator/src/test/java/io/micronaut/openapi/generator/JavaMicronautClientCodegenSerializationLibraryTest.java index 4a5564ac9a..14447a7672 100644 --- a/openapi-generator/src/test/java/io/micronaut/openapi/generator/JavaMicronautClientCodegenSerializationLibraryTest.java +++ b/openapi-generator/src/test/java/io/micronaut/openapi/generator/JavaMicronautClientCodegenSerializationLibraryTest.java @@ -3,14 +3,13 @@ import org.junit.jupiter.api.Test; import org.openapitools.codegen.CodegenConstants; -public class JavaMicronautClientCodegenSerializationLibraryTest extends AbstractMicronautCodegenTest { +class JavaMicronautClientCodegenSerializationLibraryTest extends AbstractMicronautCodegenTest { @Test - public void testSerializationLibraryJackson() { + void testSerializationLibraryJackson() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(CodegenConstants.SERIALIZATION_LIBRARY, SerializationLibraryKind.JACKSON.name()); - String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.MODELS); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS); // Model does not contain micronaut serde annotation String micronautSerDeAnnotation = "@Serdeable"; @@ -27,14 +26,14 @@ public void testSerializationLibraryJackson() { /** * Checks micronaut-serde-jackson limitation. + * * @see */ @Test - public void testSerializationLibraryMicronautSerdeJackson() { + void testSerializationLibraryMicronautSerdeJackson() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(CodegenConstants.SERIALIZATION_LIBRARY, SerializationLibraryKind.MICRONAUT_SERDE_JACKSON.name()); - String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.MODELS); + String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS); // Model contains micronaut serde annotation String micronautSerdeAnnotation = "@Serdeable"; diff --git a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java index 6d1977d899..279a6823e8 100644 --- a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java +++ b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java @@ -3,6 +3,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.servers.Server; + import org.junit.jupiter.api.Test; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; @@ -11,19 +12,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +class MicronautClientCodegenTest extends AbstractMicronautCodegenTest { -public class MicronautClientCodegenTest extends AbstractMicronautCodegenTest { @Test - public void clientOptsUnicity() { + void clientOptsUnicity() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.cliOptions() - .stream() - .collect(groupingBy(CliOption::getOpt)) - .forEach((k, v) -> assertEquals(v.size(), 1, k + " is described multiple times")); + .stream() + .collect(groupingBy(CliOption::getOpt)) + .forEach((k, v) -> assertEquals(v.size(), 1, k + " is described multiple times")); } @Test - public void testInitialConfigValues() throws Exception { + void testInitialConfigValues() throws Exception { final JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.processOpts(); @@ -43,15 +44,15 @@ public void testInitialConfigValues() throws Exception { } @Test - public void testApiAndModelFilesPresent() { + void testApiAndModelFilesPresent() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(CodegenConstants.INVOKER_PACKAGE, "org.test.test"); codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "org.test.test.model"); codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "org.test.test.api"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.APIS, - CodegenConstants.MODELS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.APIS, + CodegenConstants.MODELS); String apiFolder = outputPath + "src/main/java/org/test/test/api/"; assertFileExists(apiFolder + "PetApi.java"); @@ -68,12 +69,12 @@ public void testApiAndModelFilesPresent() { } @Test - public void doConfigureAuthParam() { + void doConfigureAuthParam() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "true"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.APIS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.APIS); // Files generated assertFileExists(outputPath + "/src/main/java/org/openapitools/auth/Authorization.java"); @@ -82,12 +83,12 @@ public void doConfigureAuthParam() { } @Test - public void doNotConfigureAuthParam() { + void doNotConfigureAuthParam() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "false"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.APIS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.APIS); // Files are not generated assertFileNotExists(outputPath + "/src/main/java/org/openapitools/auth/"); @@ -95,11 +96,11 @@ public void doNotConfigureAuthParam() { } @Test - public void doUseValidationParam() { + void doUseValidationParam() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.USE_BEANVALIDATION, "true"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.APIS); + CodegenConstants.APIS); // Files are not generated assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Valid"); @@ -107,11 +108,11 @@ public void doUseValidationParam() { } @Test - public void doNotUseValidationParam() { + void doNotUseValidationParam() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.USE_BEANVALIDATION, "false"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.APIS); + CodegenConstants.APIS); // Files are not generated assertFileNotContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Valid"); @@ -119,13 +120,13 @@ public void doNotUseValidationParam() { } @Test - public void doGenerateForTestJUnit() { + void doGenerateForTestJUnit() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_TEST, - JavaMicronautClientCodegen.OPT_TEST_JUNIT); + JavaMicronautClientCodegen.OPT_TEST_JUNIT); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); // Files are not generated assertFileExists(outputPath + "src/test/java/"); @@ -134,13 +135,13 @@ public void doGenerateForTestJUnit() { } @Test - public void doGenerateForTestSpock() { + void doGenerateForTestSpock() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_TEST, - JavaMicronautClientCodegen.OPT_TEST_SPOCK); + JavaMicronautClientCodegen.OPT_TEST_SPOCK); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); // Files are not generated assertFileExists(outputPath + "src/test/groovy"); @@ -149,7 +150,7 @@ public void doGenerateForTestSpock() { } @Test - public void doGenerateRequiredPropertiesInConstructor() { + void doGenerateRequiredPropertiesInConstructor() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR, "true"); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS); @@ -163,7 +164,7 @@ public void doGenerateRequiredPropertiesInConstructor() { } @Test - public void doNotGenerateRequiredPropertiesInConstructor() { + void doNotGenerateRequiredPropertiesInConstructor() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR, "false"); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS); @@ -179,7 +180,7 @@ public void doNotGenerateRequiredPropertiesInConstructor() { } @Test - public void doGenerateMultipleContentTypes() { + void doGenerateMultipleContentTypes() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); String outputPath = generateFiles(codegen, "src/test/resources/3_0/micronaut/content-type.yaml", CodegenConstants.APIS); @@ -191,7 +192,7 @@ public void doGenerateMultipleContentTypes() { } @Test - public void doGenerateOauth2InApplicationConfig() { + void doGenerateOauth2InApplicationConfig() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "true"); @@ -203,11 +204,11 @@ public void doGenerateOauth2InApplicationConfig() { } @Test - public void testAdditionalClientTypeAnnotations() { + void testAdditionalClientTypeAnnotations() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.ADDITIONAL_CLIENT_TYPE_ANNOTATIONS, "MyAdditionalAnnotation1(1,${param1});MyAdditionalAnnotation2(2,${param2});"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.APIS); + CodegenConstants.APIS); // Micronaut declarative http client should contain custom added annotations assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "MyAdditionalAnnotation1(1,${param1})"); @@ -215,7 +216,7 @@ public void testAdditionalClientTypeAnnotations() { } @Test - public void testDefaultAuthorizationFilterPattern() { + void testDefaultAuthorizationFilterPattern() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "true"); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.SUPPORTING_FILES, CodegenConstants.APIS); @@ -225,7 +226,7 @@ public void testDefaultAuthorizationFilterPattern() { } @Test - public void testAuthorizationFilterPattern() { + void testAuthorizationFilterPattern() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.OPT_CONFIGURE_AUTH, "true"); codegen.additionalProperties().put(JavaMicronautClientCodegen.AUTHORIZATION_FILTER_PATTERN, "pet/**"); @@ -236,7 +237,7 @@ public void testAuthorizationFilterPattern() { } @Test - public void testNoConfigureClientId() { + void testNoConfigureClientId() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); @@ -245,17 +246,17 @@ public void testNoConfigureClientId() { } @Test - public void testConfigureClientId() { + void testConfigureClientId() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.CLIENT_ID, "unit-test"); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); // Micronaut declarative http client should use the provided Client id - assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client( id = \"unit-test\", path = \"${openapi-micronaut-client-base-path}\")"); + assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client(id = \"unit-test\", path = \"${openapi-micronaut-client-base-path}\")"); } @Test - public void testDefaultPathSeparator() { + void testDefaultPathSeparator() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); @@ -264,7 +265,7 @@ public void testDefaultPathSeparator() { } @Test - public void testConfigurePathSeparator() { + void testConfigurePathSeparator() { JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen(); codegen.additionalProperties().put(JavaMicronautClientCodegen.BASE_PATH_SEPARATOR, "."); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.APIS); diff --git a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPointTest.java b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPointTest.java index e46c107412..4d0f9806eb 100644 --- a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPointTest.java +++ b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautCodeGeneratorEntryPointTest.java @@ -1,14 +1,15 @@ package io.micronaut.openapi.generator; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - import java.net.URI; import java.net.URISyntaxException; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; class MicronautCodeGeneratorEntryPointTest { + @Test @DisplayName("Can build with a custom code generator") void testCustomGenerator() throws URISyntaxException { @@ -21,6 +22,7 @@ void testCustomGenerator() throws URISyntaxException { } private static class TestGenerator extends AbstractMicronautJavaCodegen { + private String value; @Override @@ -37,6 +39,7 @@ public TestBuilder withValue(String v) { } public interface TestBuilder extends GeneratorOptionsBuilder { + TestBuilder withValue(String value); } } diff --git a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautServerCodegenTest.java b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautServerCodegenTest.java index cc197e8e33..cf010e362a 100644 --- a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautServerCodegenTest.java +++ b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautServerCodegenTest.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.servers.Server; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.openapitools.codegen.CliOption; @@ -13,21 +14,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -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"; +class MicronautServerCodegenTest extends AbstractMicronautCodegenTest { + + static String ROLES_EXTENSION_TEST_PATH = "src/test/resources/3_0/micronaut/roles-extension-test.yaml"; + static String MULTI_TAGS_TEST_PATH = "src/test/resources/3_0/micronaut/multi-tags-test.yaml"; @Test - public void clientOptsUnicity() { + void clientOptsUnicity() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.cliOptions() - .stream() - .collect(groupingBy(CliOption::getOpt)) - .forEach((k, v) -> assertEquals(v.size(), 1, k + " is described multiple times")); + .stream() + .collect(groupingBy(CliOption::getOpt)) + .forEach((k, v) -> assertEquals(v.size(), 1, k + " is described multiple times")); } @Test - public void testInitialConfigValues() { + void testInitialConfigValues() { final JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.processOpts(); @@ -48,15 +50,15 @@ public void testInitialConfigValues() { } @Test - public void testApiAndModelFilesPresent() { + void testApiAndModelFilesPresent() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(CodegenConstants.INVOKER_PACKAGE, "org.test.test"); codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "org.test.test.model"); codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "org.test.test.api"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.APIS, - CodegenConstants.MODELS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.APIS, + CodegenConstants.MODELS); String invokerFolder = outputPath + "src/main/java/org/test/test/"; assertFileExists(invokerFolder + "Application.java"); @@ -76,11 +78,11 @@ public void testApiAndModelFilesPresent() { } @Test - public void doUseValidationParam() { + void doUseValidationParam() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.USE_BEANVALIDATION, "true"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.APIS); + CodegenConstants.APIS); // Files are not generated String apiFolder = outputPath + "/src/main/java/org/openapitools/api/"; @@ -89,11 +91,11 @@ public void doUseValidationParam() { } @Test - public void doNotUseValidationParam() { + void doNotUseValidationParam() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.USE_BEANVALIDATION, "false"); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.APIS); + CodegenConstants.APIS); // Files are not generated String apiFolder = outputPath + "/src/main/java/org/openapitools/api/"; @@ -102,13 +104,13 @@ public void doNotUseValidationParam() { } @Test - public void doGenerateForTestJUnit() { + void doGenerateForTestJUnit() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_TEST, - JavaMicronautServerCodegen.OPT_TEST_JUNIT); + JavaMicronautServerCodegen.OPT_TEST_JUNIT); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); // Files are not generated assertFileExists(outputPath + "src/test/java/"); @@ -118,13 +120,13 @@ public void doGenerateForTestJUnit() { } @Test - public void doGenerateForTestSpock() { + void doGenerateForTestSpock() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_TEST, - JavaMicronautServerCodegen.OPT_TEST_SPOCK); + JavaMicronautServerCodegen.OPT_TEST_SPOCK); String outputPath = generateFiles(codegen, PETSTORE_PATH, - CodegenConstants.SUPPORTING_FILES, - CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); + CodegenConstants.SUPPORTING_FILES, + CodegenConstants.API_TESTS, CodegenConstants.APIS, CodegenConstants.MODELS); // Files are not generated assertFileExists(outputPath + "src/test/groovy"); @@ -134,7 +136,7 @@ public void doGenerateForTestSpock() { } @Test - public void doGenerateRequiredPropertiesInConstructor() { + void doGenerateRequiredPropertiesInConstructor() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR, "true"); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS); @@ -148,7 +150,7 @@ public void doGenerateRequiredPropertiesInConstructor() { } @Test - public void doNotGenerateRequiredPropertiesInConstructor() { + void doNotGenerateRequiredPropertiesInConstructor() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_REQUIRED_PROPERTIES_IN_CONSTRUCTOR, "false"); String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS); @@ -165,7 +167,7 @@ public void doNotGenerateRequiredPropertiesInConstructor() { @Test @Disabled("Feature may not be fully implemented in OpenAPI generator") - public void testExtraAnnotations() { + void testExtraAnnotations() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); String outputPath = generateFiles(codegen, "src/test/resources/3_0/issue_11772.yml", CodegenConstants.MODELS); @@ -175,7 +177,7 @@ public void testExtraAnnotations() { } @Test - public void doNotGenerateAuthRolesWithExtensionWhenNotUseAuth() { + void doNotGenerateAuthRolesWithExtensionWhenNotUseAuth() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_USE_AUTH, false); String outputPath = generateFiles(codegen, ROLES_EXTENSION_TEST_PATH, CodegenConstants.MODELS, CodegenConstants.APIS); @@ -187,7 +189,7 @@ public void doNotGenerateAuthRolesWithExtensionWhenNotUseAuth() { } @Test - public void generateAuthRolesWithExtension() { + void generateAuthRolesWithExtension() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_USE_AUTH, true); String outputPath = generateFiles(codegen, ROLES_EXTENSION_TEST_PATH, CodegenConstants.MODELS, CodegenConstants.APIS); @@ -206,7 +208,7 @@ public void generateAuthRolesWithExtension() { } @Test - public void doGenerateMonoWrapHttpResponse() { + void doGenerateMonoWrapHttpResponse() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_REACTIVE, "true"); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "true"); @@ -217,7 +219,7 @@ public void doGenerateMonoWrapHttpResponse() { } @Test - public void doGenerateMono() { + void doGenerateMono() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_REACTIVE, "true"); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "false"); @@ -229,7 +231,7 @@ public void doGenerateMono() { } @Test - public void doGenerateWrapHttpResponse() { + void doGenerateWrapHttpResponse() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_REACTIVE, "false"); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "true"); @@ -241,7 +243,7 @@ public void doGenerateWrapHttpResponse() { } @Test - public void doGenerateNoMonoNoWrapHttpResponse() { + void doGenerateNoMonoNoWrapHttpResponse() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_REACTIVE, "false"); codegen.additionalProperties().put(JavaMicronautServerCodegen.OPT_WRAP_IN_HTTP_RESPONSE, "false"); @@ -254,10 +256,10 @@ public void doGenerateNoMonoNoWrapHttpResponse() { } @Test - public void doGenerateOperationOnlyForFirstTag() { + void doGenerateOperationOnlyForFirstTag() { JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen(); String outputPath = generateFiles(codegen, MULTI_TAGS_TEST_PATH, CodegenConstants.MODELS, - CodegenConstants.APIS, CodegenConstants.API_TESTS); + CodegenConstants.APIS, CodegenConstants.API_TESTS); String apiPath = outputPath + "src/main/java/org/openapitools/api/"; String apiTestPath = outputPath + "/src/test/java/org/openapitools/api/"; @@ -274,18 +276,18 @@ public void doGenerateOperationOnlyForFirstTag() { // Verify all the methods are generated only ones assertFileContains(apiPath + "AuthorsApi.java", - "authorSearchGet", "getAuthor", "getAuthorBooks"); + "authorSearchGet", "getAuthor", "getAuthorBooks"); assertFileContains(apiPath + "BooksApi.java", - "bookCreateEntryPost", "bookSearchGet", "bookSendReviewPost", "getBook", "isBookAvailable"); + "bookCreateEntryPost", "bookSearchGet", "bookSendReviewPost", "getBook", "isBookAvailable"); assertFileNotContains(apiPath + "BooksApi.java", "getAuthorBooks"); } @Test - public void doRepeatOperationForAllTags() { + 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); + CodegenConstants.APIS, CodegenConstants.API_TESTS); String apiPath = outputPath + "src/main/java/org/openapitools/api/"; String apiTestPath = outputPath + "/src/test/java/org/openapitools/api/"; @@ -302,10 +304,10 @@ public void doRepeatOperationForAllTags() { // Verify all the methods are repeated for each of the tags assertFileContains(apiPath + "AuthorsApi.java", - "authorSearchGet", "getAuthor", "getAuthorBooks"); + "authorSearchGet", "getAuthor", "getAuthorBooks"); assertFileContains(apiPath + "BooksApi.java", - "bookCreateEntryPost", "bookSearchGet", "bookSendReviewPost", "getBook", "isBookAvailable", "getAuthorBooks"); + "bookCreateEntryPost", "bookSearchGet", "bookSendReviewPost", "getBook", "isBookAvailable", "getAuthorBooks"); assertFileContains(apiPath + "SearchApi.java", - "authorSearchGet", "bookSearchGet"); + "authorSearchGet", "bookSearchGet"); } } diff --git a/openapi-generator/src/test/resources/petstore.json b/openapi-generator/src/test/resources/petstore.json index ad5523181b..29a3bd355f 100644 --- a/openapi-generator/src/test/resources/petstore.json +++ b/openapi-generator/src/test/resources/petstore.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "description": "This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters", + "description": "This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters", "version": "1.0.0", "title": "OpenAPI Petstore", "license": { diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java index 9274225270..fd0ffa82ac 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java index cf3662e687..f74bbb988b 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIInclude.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java index ea58e61af9..2aa0b45688 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIIncludes.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java index 6e96a9b726..829b774b0c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPIManagement.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java index d268eda450..8fdb604f44 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/OpenAPISecurity.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPIManagementAnnotationMapper.java b/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPIManagementAnnotationMapper.java index 598cfb4c55..8bf2701c8d 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPIManagementAnnotationMapper.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPIManagementAnnotationMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPISecurityAnnotationMapper.java b/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPISecurityAnnotationMapper.java index 4c0db10cf2..deb6f9b85b 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPISecurityAnnotationMapper.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/mappers/OpenAPISecurityAnnotationMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/AbstractRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/AbstractRetentionPolicyAnnotationTransformer.java index 90cae22323..7ff95c78ab 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/AbstractRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/AbstractRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponseRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponseRetentionPolicyAnnotationTransformer.java index 99901728dd..948e18bb56 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponseRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponseRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponsesRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponsesRetentionPolicyAnnotationTransformer.java index e5d2b4462d..42f27f27fb 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponsesRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ApiResponsesRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ArraySchemaRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ArraySchemaRetentionPolicyAnnotationTransformer.java index 74a16342b7..2bdba29e67 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ArraySchemaRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ArraySchemaRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbackRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbackRetentionPolicyAnnotationTransformer.java index 92802df48e..6d31561a30 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbackRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbackRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbacksRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbacksRetentionPolicyAnnotationTransformer.java index 87ef3500c5..04898e7b3d 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbacksRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/CallbacksRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContactRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContactRetentionPolicyAnnotationTransformer.java index 9348f276b0..9466f720c0 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContactRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContactRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContentRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContentRetentionPolicyAnnotationTransformer.java index 4ad4b1888d..c6f086c431 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContentRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ContentRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/DiscriminatorMappingRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/DiscriminatorMappingRetentionPolicyAnnotationTransformer.java index f5bc9a9d35..be8df914a2 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/DiscriminatorMappingRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/DiscriminatorMappingRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/EncodingRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/EncodingRetentionPolicyAnnotationTransformer.java index fd49f3c287..0ba03b5396 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/EncodingRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/EncodingRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExampleObjectMappingRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExampleObjectMappingRetentionPolicyAnnotationTransformer.java index 5ea9a7d456..009b36d2a9 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExampleObjectMappingRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExampleObjectMappingRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionPropertyRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionPropertyRetentionPolicyAnnotationTransformer.java index 316e726856..e8acd1f8b0 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionPropertyRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionPropertyRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionRetentionPolicyAnnotationTransformer.java index bdf8a068f7..8aff21654b 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionsRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionsRetentionPolicyAnnotationTransformer.java index 752a797156..d502ab2b99 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionsRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExtensionsRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExternalDocumentationRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExternalDocumentationRetentionPolicyAnnotationTransformer.java index e758e68ec1..8feb5bedb2 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExternalDocumentationRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ExternalDocumentationRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HeaderRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HeaderRetentionPolicyAnnotationTransformer.java index df2eed5462..a7eb044abc 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HeaderRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HeaderRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HiddenRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HiddenRetentionPolicyAnnotationTransformer.java index 42e3139475..52f152a5de 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HiddenRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/HiddenRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/InfoRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/InfoRetentionPolicyAnnotationTransformer.java index b03d15b83b..c87e714103 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/InfoRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/InfoRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LicenseRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LicenseRetentionPolicyAnnotationTransformer.java index 713c4596c3..f691d3cfc7 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LicenseRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LicenseRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkParameterRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkParameterRetentionPolicyAnnotationTransformer.java index fba97b4549..0bc5c19742 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkParameterRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkParameterRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkRetentionPolicyAnnotationTransformer.java index 1022d45379..97ddc647f8 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/LinkRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowRetentionPolicyAnnotationTransformer.java index 25893a3934..e2951389fc 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowsRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowsRetentionPolicyAnnotationTransformer.java index 0bd22214e7..8c342db0b4 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowsRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthFlowsRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthScopeRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthScopeRetentionPolicyAnnotationTransformer.java index bb4e6a63f7..161721fac7 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthScopeRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OAuthScopeRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OpenAPIDefinitionRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OpenAPIDefinitionRetentionPolicyAnnotationTransformer.java index b96d426b37..c94b6c1481 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OpenAPIDefinitionRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OpenAPIDefinitionRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OperationRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OperationRetentionPolicyAnnotationTransformer.java index 3bdcc95b40..5741ea8323 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OperationRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/OperationRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParameterRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParameterRetentionPolicyAnnotationTransformer.java index c65e6b3774..d0372960f6 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParameterRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParameterRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParametersRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParametersRetentionPolicyAnnotationTransformer.java index 1c1301194f..f2123a3dc0 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParametersRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ParametersRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/RequestBodyRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/RequestBodyRetentionPolicyAnnotationTransformer.java index d41e6cceeb..abeb336dcd 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/RequestBodyRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/RequestBodyRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SchemaRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SchemaRetentionPolicyAnnotationTransformer.java index 4904274360..70bf3924d0 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SchemaRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SchemaRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementRetentionPolicyAnnotationTransformer.java index 6ca32337ba..2a8b30126e 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementsRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementsRetentionPolicyAnnotationTransformer.java index a33743464a..adde7c0388 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementsRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecurityRequirementsRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemeRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemeRetentionPolicyAnnotationTransformer.java index 13a950852b..3409486753 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemeRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemeRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemesRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemesRetentionPolicyAnnotationTransformer.java index 6fbc6d729b..bced969f8c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemesRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/SecuritySchemesRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerRetentionPolicyAnnotationTransformer.java index f5405a8ccc..8f24b11b9a 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerVariableRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerVariableRetentionPolicyAnnotationTransformer.java index c7d8c7ed66..8e9267ae65 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerVariableRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServerVariableRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServersRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServersRetentionPolicyAnnotationTransformer.java index 09986b89d7..33b0f9feda 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServersRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/ServersRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagRetentionPolicyAnnotationTransformer.java index 6d04c6fb06..ba4354617d 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagsRetentionPolicyAnnotationTransformer.java b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagsRetentionPolicyAnnotationTransformer.java index 8a283661ea..0972b9c06e 100644 --- a/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagsRetentionPolicyAnnotationTransformer.java +++ b/openapi/src/main/java/io/micronaut/openapi/annotation/transformers/TagsRetentionPolicyAnnotationTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java index 25cb1c6753..779ce967ae 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java index 46c162516c..a0f366c35a 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java index 17b5b75cc8..a83dcc05e7 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/InfoConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/InfoConfiguration.java index bcbcb3d44e..5aca49ed3f 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/InfoConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/InfoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/LinksConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/LinksConfiguration.java index 7d0f271a05..a8c2a81468 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/LinksConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/LinksConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/MediaConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/MediaConfiguration.java index a8c2da2e82..0140e6888d 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/MediaConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/MediaConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/ModelConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/ModelConfiguration.java index 532a044bb3..1d11509349 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/ModelConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/ModelConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/ParametersConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/ParametersConfiguration.java index e3212fdecb..53afb116c2 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/ParametersConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/ParametersConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/ResponsesConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/ResponsesConfiguration.java index 9bf6008a93..81d91861fb 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/ResponsesConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/ResponsesConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/SecurityConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/SecurityConfiguration.java index 55031486e8..508a37bbb1 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/SecurityConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/SecurityConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/ServerConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/ServerConfiguration.java index c960df2b22..9802b6652c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/ServerConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/ServerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java index 370d2b6230..6d754784bb 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocDescription.java b/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocDescription.java index 7f05cea3f4..a875621851 100644 --- a/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocDescription.java +++ b/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocParser.java b/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocParser.java index a3cc223ad6..98842731f8 100644 --- a/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocParser.java +++ b/openapi/src/main/java/io/micronaut/openapi/javadoc/JavadocParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/postprocessors/JacksonDiscriminatorPostProcessor.java b/openapi/src/main/java/io/micronaut/openapi/postprocessors/JacksonDiscriminatorPostProcessor.java index 893029accf..574af17969 100644 --- a/openapi/src/main/java/io/micronaut/openapi/postprocessors/JacksonDiscriminatorPostProcessor.java +++ b/openapi/src/main/java/io/micronaut/openapi/postprocessors/JacksonDiscriminatorPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/postprocessors/OpenApiOperationsPostProcessor.java b/openapi/src/main/java/io/micronaut/openapi/postprocessors/OpenApiOperationsPostProcessor.java index e26430bdf4..cab167a791 100644 --- a/openapi/src/main/java/io/micronaut/openapi/postprocessors/OpenApiOperationsPostProcessor.java +++ b/openapi/src/main/java/io/micronaut/openapi/postprocessors/OpenApiOperationsPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ApiResponsesSerializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ApiResponsesSerializer.java index 32b799af60..20f92de1c6 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ApiResponsesSerializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ApiResponsesSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/CallbackSerializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/CallbackSerializer.java index 4774898600..942c0cd4d7 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/CallbackSerializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/CallbackSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ExampleSerializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ExampleSerializer.java index a900d27041..06e8be96c0 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ExampleSerializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/ExampleSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/MediaTypeSerializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/MediaTypeSerializer.java index 47953148dc..ffd576c528 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/MediaTypeSerializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/MediaTypeSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/PathsSerializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/PathsSerializer.java index 0e7b355c1c..e4f158c806 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/PathsSerializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/PathsSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/Schema31Serializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/Schema31Serializer.java index 48c73ce4d3..5bf9b767c1 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/Schema31Serializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/Schema31Serializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/SchemaSerializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/SchemaSerializer.java index 1fb847c526..063dc062d1 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/SchemaSerializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/SchemaSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Components31Mixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Components31Mixin.java index 9fb2ad46f9..0565a16a55 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Components31Mixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Components31Mixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ComponentsMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ComponentsMixin.java index 1adac563a2..d8bba35be3 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ComponentsMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ComponentsMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DateSchemaMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DateSchemaMixin.java index 5a44c0dee9..7cd145e027 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DateSchemaMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DateSchemaMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Discriminator31Mixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Discriminator31Mixin.java index 3269c18b95..2243081120 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Discriminator31Mixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Discriminator31Mixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DiscriminatorMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DiscriminatorMixin.java index 139c657c9a..5c38839c0f 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DiscriminatorMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/DiscriminatorMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExampleMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExampleMixin.java index a0bcd3107d..cbec78010f 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExampleMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExampleMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExtensionsMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExtensionsMixin.java index a0a6044a92..5f4f489a62 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExtensionsMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/ExtensionsMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Info31Mixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Info31Mixin.java index 3d0ed19cd2..5b32e3e52c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Info31Mixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Info31Mixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/InfoMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/InfoMixin.java index bc319a88eb..7584b60ef2 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/InfoMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/InfoMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/LicenseMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/LicenseMixin.java index f5c5e08e9c..5ed405ae04 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/LicenseMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/LicenseMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/MediaTypeMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/MediaTypeMixin.java index 0327fc992e..8f4f3056e7 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/MediaTypeMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/MediaTypeMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPI31Mixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPI31Mixin.java index 0a0fb27170..34c1e72549 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPI31Mixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPI31Mixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPIMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPIMixin.java index 830714c03b..9927d2e68a 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPIMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OpenAPIMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OperationMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OperationMixin.java index 371f6bfe6d..a9247a7bbf 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OperationMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/OperationMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Schema31Mixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Schema31Mixin.java index 1a06b5b9bf..d497823d09 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Schema31Mixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/Schema31Mixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaConverterMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaConverterMixin.java index 8a48f6805f..470c9a1d88 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaConverterMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaConverterMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaMixin.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaMixin.java index 14589e54e3..41ed4cff7a 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaMixin.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/jackson/mixin/SchemaMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponses31Deserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponses31Deserializer.java index caab4909ca..4aa2e35fdc 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponses31Deserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponses31Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponsesDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponsesDeserializer.java index 79868cf775..7388e73a42 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponsesDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ApiResponsesDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Callback31Deserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Callback31Deserializer.java index 8a625ad0dd..4673363b03 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Callback31Deserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Callback31Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/CallbackDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/CallbackDeserializer.java index ceaf927cb4..17e45c3959 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/CallbackDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/CallbackDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule.java index 5b9780b734..1753c04d32 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule31.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule31.java index 9c23a84ba4..a51cc3f5ef 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule31.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/DeserializationModule31.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingPropertyStyleEnumDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingPropertyStyleEnumDeserializer.java index 2491a046a1..6fce154656 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingPropertyStyleEnumDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingPropertyStyleEnumDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingStyleEnumDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingStyleEnumDeserializer.java index beea17dbc3..3c5db3de47 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingStyleEnumDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/EncodingStyleEnumDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/HeaderStyleEnumDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/HeaderStyleEnumDeserializer.java index c3ab0642ef..143d2a24ad 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/HeaderStyleEnumDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/HeaderStyleEnumDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Model31Deserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Model31Deserializer.java index 7a48578a14..147c392efc 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Model31Deserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Model31Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ModelDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ModelDeserializer.java index d430ade99d..fa0b911a01 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ModelDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ModelDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ObjectMapperFactory.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ObjectMapperFactory.java index 9313826f39..3eb3e68786 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ObjectMapperFactory.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ObjectMapperFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/OpenAPI31Deserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/OpenAPI31Deserializer.java index 9f3530fd33..5b1b952fff 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/OpenAPI31Deserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/OpenAPI31Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Parameter31Deserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Parameter31Deserializer.java index 67e9c03a6e..7e98dacd19 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Parameter31Deserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Parameter31Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ParameterDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ParameterDeserializer.java index 07b7304009..7fd714fb0c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ParameterDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/ParameterDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Paths31Deserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Paths31Deserializer.java index 79c2afb2b9..abc334bea5 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Paths31Deserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/Paths31Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PathsDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PathsDeserializer.java index c0fdb6852c..c8e53baade 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PathsDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PathsDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java index 4f03ef176e..6786b523f6 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecurityScheme31Deserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecurityScheme31Deserializer.java index 977bdfaab7..0019898f30 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecurityScheme31Deserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecurityScheme31Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecuritySchemeDeserializer.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecuritySchemeDeserializer.java index 5a8855ebdd..7527321876 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecuritySchemeDeserializer.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/SecuritySchemeDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/view/AbstractViewConfig.java b/openapi/src/main/java/io/micronaut/openapi/view/AbstractViewConfig.java index c7694e60bb..aff9ac2106 100644 --- a/openapi/src/main/java/io/micronaut/openapi/view/AbstractViewConfig.java +++ b/openapi/src/main/java/io/micronaut/openapi/view/AbstractViewConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java b/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java index a216bba996..4f67427c3c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java +++ b/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/view/RapiPDFConfig.java b/openapi/src/main/java/io/micronaut/openapi/view/RapiPDFConfig.java index 318cac4a88..bd8e6341b1 100644 --- a/openapi/src/main/java/io/micronaut/openapi/view/RapiPDFConfig.java +++ b/openapi/src/main/java/io/micronaut/openapi/view/RapiPDFConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/view/RapidocConfig.java b/openapi/src/main/java/io/micronaut/openapi/view/RapidocConfig.java index 10363efd64..ed6d6c125b 100644 --- a/openapi/src/main/java/io/micronaut/openapi/view/RapidocConfig.java +++ b/openapi/src/main/java/io/micronaut/openapi/view/RapidocConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/view/RedocConfig.java b/openapi/src/main/java/io/micronaut/openapi/view/RedocConfig.java index 1b50f04c13..e002fa5744 100644 --- a/openapi/src/main/java/io/micronaut/openapi/view/RedocConfig.java +++ b/openapi/src/main/java/io/micronaut/openapi/view/RedocConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/view/SwaggerUIConfig.java b/openapi/src/main/java/io/micronaut/openapi/view/SwaggerUIConfig.java index 7e3ed74620..afdd6068e4 100644 --- a/openapi/src/main/java/io/micronaut/openapi/view/SwaggerUIConfig.java +++ b/openapi/src/main/java/io/micronaut/openapi/view/SwaggerUIConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java index 4f1074080c..b11839f9df 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java index eb33a9a02e..4d0a2f18c1 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AnnProcessorEnvironment.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AnnProcessorEnvironment.java index 77d54358b3..652aae1cac 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/AnnProcessorEnvironment.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/AnnProcessorEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/ContextUtils.java b/openapi/src/main/java/io/micronaut/openapi/visitor/ContextUtils.java index e9e010516f..436623d83b 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/ContextUtils.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/ContextUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/ConvertUtils.java b/openapi/src/main/java/io/micronaut/openapi/visitor/ConvertUtils.java index b1f8567451..925f5af0be 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/ConvertUtils.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/ConvertUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/Endpoint.java b/openapi/src/main/java/io/micronaut/openapi/visitor/Endpoint.java index 2dceb1f0ae..dd12794831 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/Endpoint.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/Endpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java index 8c416bf834..22126314ee 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/NumberUtils.java b/openapi/src/main/java/io/micronaut/openapi/visitor/NumberUtils.java index 7ca7865b15..a721e6518f 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/NumberUtils.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/NumberUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java index c8d800a63f..163b8754b7 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiControllerVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiControllerVisitor.java index ebe8ea7338..7fee3e921a 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiControllerVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiControllerVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiEndpointVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiEndpointVisitor.java index bf6b5711dc..4bee02fb8d 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiEndpointVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiEndpointVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiIncludeVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiIncludeVisitor.java index c3dd082192..60055aa345 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiIncludeVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiIncludeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiJacksonVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiJacksonVisitor.java index 9a3d5e9a50..519aa0d0de 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiJacksonVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiJacksonVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/Pair.java b/openapi/src/main/java/io/micronaut/openapi/visitor/Pair.java index 946981eae4..da50ade9fe 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/Pair.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/Pair.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/SchemaUtils.java b/openapi/src/main/java/io/micronaut/openapi/visitor/SchemaUtils.java index b151e5472c..c559d7d784 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/SchemaUtils.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/SchemaUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/Utils.java b/openapi/src/main/java/io/micronaut/openapi/visitor/Utils.java index de1e048baa..c65dc3c97c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/Utils.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/VisibilityLevel.java b/openapi/src/main/java/io/micronaut/openapi/visitor/VisibilityLevel.java index bdd46d8a8e..43271448f6 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/VisibilityLevel.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/VisibilityLevel.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/package-info.java b/openapi/src/main/java/io/micronaut/openapi/visitor/package-info.java index e1b46765a1..6e070ff17c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/package-info.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 original authors + * Copyright 2017-2023 original authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/openapi/src/test/resources/swagger/petstore.yml b/openapi/src/test/resources/swagger/petstore.yml index 46065caaab..256a95c7ee 100644 --- a/openapi/src/test/resources/swagger/petstore.yml +++ b/openapi/src/test/resources/swagger/petstore.yml @@ -1,5 +1,5 @@ # -# Copyright 2017-2020 original authors +# Copyright 2017-2023 original authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test-suite-client-generator/petstore.json b/test-suite-client-generator/petstore.json index ad5523181b..29a3bd355f 100644 --- a/test-suite-client-generator/petstore.json +++ b/test-suite-client-generator/petstore.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "description": "This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters", + "description": "This is a sample server Petstore server. For this sample, you can use the api key \"special-key\" to test the authorization filters", "version": "1.0.0", "title": "OpenAPI Petstore", "license": { diff --git a/test-suite-server-generator/src/test/groovy/io/micronaut/openapi/test/api/ParametersControllerSpec.groovy b/test-suite-server-generator/src/test/groovy/io/micronaut/openapi/test/api/ParametersControllerSpec.groovy index 4c4462d7ee..27f519913a 100644 --- a/test-suite-server-generator/src/test/groovy/io/micronaut/openapi/test/api/ParametersControllerSpec.groovy +++ b/test-suite-server-generator/src/test/groovy/io/micronaut/openapi/test/api/ParametersControllerSpec.groovy @@ -16,7 +16,6 @@ import spock.lang.Specification import io.micronaut.openapi.test.model.SendPrimitivesResponse import spock.lang.Unroll - @MicronautTest class ParametersControllerSpec extends Specification { From a36e09cbda7453b8a4a622b0c670129239e43fe8 Mon Sep 17 00:00:00 2001 From: altro3 Date: Fri, 23 Jun 2023 16:15:26 +0700 Subject: [PATCH 2/4] Fixed documentation about views properties --- .../viewsGenerationWithPropertiesFile.adoc | 20 ++++++++----------- .../viewsGenerationWithSystemProperties.adoc | 6 +++--- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/docs/guide/openApiViews/viewsGenerationWithPropertiesFile.adoc b/src/main/docs/guide/openApiViews/viewsGenerationWithPropertiesFile.adoc index 76ebdcdceb..9377db2b77 100644 --- a/src/main/docs/guide/openApiViews/viewsGenerationWithPropertiesFile.adoc +++ b/src/main/docs/guide/openApiViews/viewsGenerationWithPropertiesFile.adoc @@ -1,16 +1,12 @@ -By default the generation of views is disabled. You can enable views generation with a <>. +By default, the generation of views is disabled. You can enable views generation with a <>. -.openapi.properties Example Views Generation Swagger-UI Redoc, Rapidoc +.openapi.properties Example Views Generation Swagger-UI, Redoc, Rapidoc [source] ---- -swagger-ui.enabled=true -redoc.enabled=true -rapidoc.enabled=true -rapidoc.bg-color=#14191f -rapidoc.text-color=#aec2e0 -rapidoc.sort-endpoints-by=method -... -.. -. +micronaut.openapi.views.spec = swagger-ui.enabled=true,\ + redoc.enabled=true, \ + rapidoc.enabled=true, \ + rapidoc.bg-color=#14191f, \ + rapidoc.text-color=#aec2e0, \ + rapidoc.sort-endpoints-by=method ---- - diff --git a/src/main/docs/guide/openApiViews/viewsGenerationWithSystemProperties.adoc b/src/main/docs/guide/openApiViews/viewsGenerationWithSystemProperties.adoc index 9830149955..b3290dba87 100644 --- a/src/main/docs/guide/openApiViews/viewsGenerationWithSystemProperties.adoc +++ b/src/main/docs/guide/openApiViews/viewsGenerationWithSystemProperties.adoc @@ -1,8 +1,8 @@ -By default the generation of views is disabled. +By default, the generation of views is disabled. To turn it on you have to set the following system property `micronaut.openapi.views.spec`. -The string syntax is a series of comma-separated key-value pairs, to enable and configure the views. +The string syntax is a series of comma-separated key-value pairs, to enable and configure the views. .System Property [source] @@ -110,4 +110,4 @@ or in Maven with Groovy: ----- \ No newline at end of file +---- From 6d6fe3d723a14903fcd3ae894238d783066b4dca Mon Sep 17 00:00:00 2001 From: altro3 Date: Fri, 23 Jun 2023 16:40:23 +0700 Subject: [PATCH 3/4] Code cleanup --- .../introspections/CallbackConfiguration.java | 4 +--- .../introspections/ExampleConfiguration.java | 4 +--- .../introspections/HeaderConfiguration.java | 4 +--- .../introspections/TagsConfiguration.java | 4 +--- .../swagger/core/util/PrimitiveType.java | 4 ++-- .../openapi/view/OpenApiViewConfig.java | 2 +- .../AbstractOpenApiEndpointVisitor.java | 1 - .../visitor/AbstractOpenApiVisitor.java | 18 ++++++++++-------- .../visitor/EndpointsConfiguration.java | 14 ++++++-------- 9 files changed, 23 insertions(+), 32 deletions(-) diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java index 779ce967ae..1220e73bb7 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/CallbackConfiguration.java @@ -24,8 +24,6 @@ * * @author Henrique Mota */ -@Introspected(classes = { - Callback.class, -}) +@Introspected(classes = Callback.class) public class CallbackConfiguration { } diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java index a0f366c35a..edc34c87c3 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/ExampleConfiguration.java @@ -24,8 +24,6 @@ * * @author Henrique Mota */ -@Introspected(classes = { - Example.class, -}) +@Introspected(classes = Example.class) public class ExampleConfiguration { } diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java index a83dcc05e7..6a2bcb3186 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/HeaderConfiguration.java @@ -24,8 +24,6 @@ * * @author Henrique Mota */ -@Introspected(classes = { - Header.class, -}) +@Introspected(classes = Header.class) public class HeaderConfiguration { } diff --git a/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java index 6d754784bb..e7466a0990 100644 --- a/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/introspections/TagsConfiguration.java @@ -24,8 +24,6 @@ * * @author Henrique Mota */ -@Introspected(classes = { - Tag.class, -}) +@Introspected(classes = Tag.class) public class TagsConfiguration { } diff --git a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java index 6786b523f6..fb69d51074 100644 --- a/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java +++ b/openapi/src/main/java/io/micronaut/openapi/swagger/core/util/PrimitiveType.java @@ -314,7 +314,7 @@ public Schema createProperty() { /** * Adds support for custom mapping of classes to primitive types * - * @return Map of custom classes to primitive type + * @return Set of custom classes to primitive type * * @since 2.0.6 */ @@ -325,7 +325,7 @@ public static Set customExcludedClasses() { /** * Adds support for custom mapping of classes to primitive types * - * @return Map of custom classes to primitive type + * @return Set of custom classes to primitive type * * @since 2.1.2 */ diff --git a/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java b/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java index 4f67427c3c..55d9ba269d 100644 --- a/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java +++ b/openapi/src/main/java/io/micronaut/openapi/view/OpenApiViewConfig.java @@ -299,7 +299,7 @@ private String readTemplateFromCustomPath(String customPathStr, VisitorContext c } else if (customPathStr.startsWith("classpath:")) { ClassPathResourceLoader resourceLoader = new DefaultClassPathResourceLoader(getClass().getClassLoader()); Optional inOpt = resourceLoader.getResourceAsStream(customPathStr); - if (!inOpt.isPresent()) { + if (inOpt.isEmpty()) { throw new IOException("Fail to load " + customPathStr); } try (InputStream in = inOpt.get(); diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java index 412ec6f54f..b50610742d 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java @@ -1147,7 +1147,6 @@ private ClassElement returnType(MethodElement element, VisitorContext context) { } else if (isResponseType(returnType)) { returnType = returnType.getFirstTypeArgument().orElse(returnType); } else if (isSingleResponseType(returnType)) { - returnType = returnType.getFirstTypeArgument().get(); returnType = returnType.getFirstTypeArgument().orElse(returnType); } diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java index 92fd1a2f1c..51084a687f 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java @@ -607,7 +607,9 @@ protected Map toValueMap(Map values, } } } - newValues.put(key, encodingStyle.toString()); + if (encodingStyle != null) { + newValues.put(key, encodingStyle.toString()); + } } } else if (key.equals("ref")) { newValues.put("$ref", value); @@ -782,7 +784,8 @@ private boolean isTypeNullable(ClassElement type) { * * @return The schema or null if it cannot be resolved */ - protected @Nullable Schema resolveSchema(@Nullable Element definingElement, ClassElement type, VisitorContext context, List mediaTypes) { + @Nullable + protected Schema resolveSchema(@Nullable Element definingElement, ClassElement type, VisitorContext context, List mediaTypes) { return resolveSchema(Utils.resolveOpenApi(context), definingElement, type, context, mediaTypes, null, null); } @@ -828,8 +831,8 @@ protected Schema resolveSchema(OpenAPI openAPI, @Nullable Element definingElemen } } - ClassElement componentType = type.getFirstTypeArgument().orElse(null); - Map typeArgs = type.getTypeArguments(); + ClassElement componentType = type != null ? type.getFirstTypeArgument().orElse(null) : null; + Map typeArgs = type != null ? type.getTypeArguments() : null; Schema schema = null; @@ -2149,7 +2152,7 @@ protected Schema readSchema(AnnotationValue e.getKey().equals("requiredProperties") ? "required" : e.getKey(), Map.Entry::getValue)); Optional schemaOpt = toValue(values, context, Schema.class); - if (!schemaOpt.isPresent()) { + if (schemaOpt.isEmpty()) { return null; } Schema schema = schemaOpt.get(); @@ -2220,7 +2223,7 @@ private List getEnumValues(EnumElement type, String schemaType, String s continue; } AnnotationValue jsonProperty = element.getAnnotation(JsonProperty.class); - String jacksonValue = jsonProperty != null ? jsonProperty.stringValue("value").get() : null; + String jacksonValue = jsonProperty != null ? jsonProperty.stringValue("value").orElse(null) : null; if (StringUtils.hasText(jacksonValue)) { try { enumValues.add(ConvertUtils.normalizeValue(jacksonValue, schemaType, schemaFormat, context)); @@ -2307,8 +2310,7 @@ private String computeNameWithGenerics(ClassElement classElement, Map computed, Map typeArgs, VisitorContext context) { computed.add(classElement.getName()); - final Map typeArguments = typeArgs; - final Iterator i = typeArguments.values().iterator(); + final Iterator i = typeArgs.values().iterator(); if (i.hasNext()) { builder.append('_'); diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java b/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java index 22126314ee..4b83efd00c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/EndpointsConfiguration.java @@ -82,14 +82,12 @@ class EndpointsConfiguration { String entryType = entry.getKey().substring(idx + 1); String name = entry.getKey().substring(ENDPOINTS_PREFIX.length(), idx); Endpoint endpoint = endpoints.computeIfAbsent(name, key -> new Endpoint()); - if ("security-requirements".equals(entryType)) { - endpoint.setSecurityRequirements(parseSecurityRequirements(entry.getValue(), context)); - } else if ("servers".equals(entryType)) { - endpoint.setServers(parseServers(entry.getValue(), context)); - } else if ("tags".equals(entryType)) { - endpoint.setTags(parseTags(entry.getValue())); - } else if ("class".equals(entryType)) { - endpoint.setClassElement(context.getClassElement(entry.getValue())); + switch (entryType) { + case "security-requirements" -> endpoint.setSecurityRequirements(parseSecurityRequirements(entry.getValue(), context)); + case "servers" -> endpoint.setServers(parseServers(entry.getValue(), context)); + case "tags" -> endpoint.setTags(parseTags(entry.getValue())); + case "class" -> endpoint.setClassElement(context.getClassElement(entry.getValue())); + default -> context.warn("Unknown value " + entryType, null); } }); } From 97d299bd318d2739e88788e1a47c1d9a58652d61 Mon Sep 17 00:00:00 2001 From: altro3 Date: Fri, 23 Jun 2023 17:12:25 +0700 Subject: [PATCH 4/4] Code cleanup --- .../openapi/visitor/AbstractOpenApiEndpointVisitor.java | 1 + .../io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java index b50610742d..412ec6f54f 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java @@ -1147,6 +1147,7 @@ private ClassElement returnType(MethodElement element, VisitorContext context) { } else if (isResponseType(returnType)) { returnType = returnType.getFirstTypeArgument().orElse(returnType); } else if (isSingleResponseType(returnType)) { + returnType = returnType.getFirstTypeArgument().get(); returnType = returnType.getFirstTypeArgument().orElse(returnType); } diff --git a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java index 90e041dbf8..c7866a632c 100644 --- a/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java +++ b/openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java @@ -415,7 +415,7 @@ protected Map toValueMap(Map values, Object first = a[0]; // are class values - if ( first instanceof AnnotationClassValue) { + if (first instanceof AnnotationClassValue) { List> classes = new ArrayList<>(a.length); for (Object o : a) { AnnotationClassValue acv = (AnnotationClassValue) o;