diff --git a/.gitignore b/.gitignore index f272f2255..33af7421d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ ###################### /target/www/** /src/test/javascript/coverage/ +.flattened-pom.xml ###################### # Node diff --git a/CHANGELOG.md b/CHANGELOG.md index 81c356a35..6fa93e9e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,82 +5,247 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [2.8.13] - 2025-09-07 + +### Added + +- #3084 - Add Scalar Support + +### Changed + +- Upgrade swagger-ui to v5.28.1 + +### Fixed + +- #3076 - With oneOf the response schema contains an extra type: string + +## [2.8.12] - 2025-09-01 + +### Changed + +- Upgrade swagger-ui to v5.28.0 + +### Fixed + +- #3073 - Duplicate key class Parameter when documenting two GET methods with same path and PathVariable. +- #3071 - @io.swagger.v3.oas.annotations.parameters.RequestBody does not work well with @RequestPart +- #3066 - Parameter is now required after upgrading to springdoc-openapi 2.8.10 + +## [2.8.11] - 2025-08-23 + +### Added + +- #3065 - javadoc and overall performance optimization + +### Changed + +- Upgrade spring-boot to v3.5.5 + +### Fixed + +- #3064 -ClassNotFoundException: kotlin.reflect.full.KClasses + +## [2.8.10] - 2025-08-20 + +### Added + +- #3046 - Feature Request: Support @jakarta.annotation.Nonnull. +- #3042 - Support externalDocs configure on SpecPropertiesCustomizer +- #3057 - Refactor webhook discovery and scanning mechanism + +### Changed + +- Upgrade spring-boot to v3.5.4 +- Upgrade swagger-ui to v5.27.1 +- Upgrade swagger-core to 2.2.36 + +### Fixed + +- #3050 - @RequestPart JSON parameters missing Content-Type in generated curl commands, causing 415 errors. +- #2978 - Parameter is no longer optional after upgrade to 2.8.8 +- #3022 - NullPointerException thrown in SchemaUtils. +- #3026 - Fix unexpected merging of media types +- #3036 - Fixed "desciption" +- #3039 - Fix: Property resolution for extensions within @OpenAPIDefinition Info object +- #3051 - Fixes so that a RequestPart with a Map is added to the RequestBody +- #3060 - Use adaptFromForwardedHeaders instead of deprecated fromHttpRequest + +## [2.8.9] - 2025-06-10 + +### Added + +- #2944 - Support for @Positive +- #3011 - type-use for method parameters + +### Changed + +- Upgrade spring-boot to version 3.5.0 + +### Fixed + +- #2982 - application/problem+json content type is not set for ProblemDetails +- #2990 - Issues with POST Request, application/x-www-form-urlencoded and only one parameter +- #2998 - io.swagger.v3.oas.annotations.Webhook does not work when defined on the method level +- #3012 - Order of examples is (sometimes) not preserved + +## [2.8.8] - 2025-05-04 + +### Fixed + +- #2977 - Handle projects not using kotlin-reflect #2977 + +## [2.8.7] - 2025-05-04 + +### Added + +- #2944 - Introducing springdoc-openapi-bom project +- #2948 - Customize Servers via application.yml +- #2963 - Set default content type for problem details object to application/problem+jso +- #2971 - List of value classes in Kotlin + +### Changed + +- Upgrade swagger-ui to v5.21.0 +- Upgrade swagger-core to 2.2.30 +- Upgrade spring-boot to version 3.4.5 +- Upgrade spring-security-oauth2-authorization-server to version 1.4.3 + +### Fixed + +- #2947 - Unexpected warning "Appended trailing slash to static resource location" +- #2960 - NPE when customizing group's open-api without specifying any schema +- #2969 - fix path to register resource handler to work SwaggerIndexPageTransformer + considering /webjar path prefix +- #2964 - Cannot add custom description and example for java.time.Duration since v2.8.6 +- #2972 - @Header(schema = @Schema(type = "string")) generates empty or broken schema in + OpenAPI output since 2.8.0 +- #2976, #2967 - Build Failure due to Private Inner Class. + +## [2.8.6] - 2025-03-23 + +### Added + +- #2909 - Check both SerDe BeanPropertyDefinition for @JsonUnwrapped/@Schema +- #2927 - Bail sealed class subtype introspection on Schema +- #2917 - Add Future to ignored response wrappers +- #2938 - Add out of the box support for LocalTime, YearMonth, MonthDay + +### Changed + +- Upgrade swagger-ui to v5.20.1 +- Upgrade swagger-core to 2.2.29 +- Upgrade spring-cloud-function to 4.2.2 +- Upgrade spring-boot to version 3.4.4 + +### Fixed + +- #2928 - Add missing builder methods in SchemaBuilder +- #2905 - ModelResolver.enumAsRef = true result in invalid openapi with actuator using + enum param +- #2939 - Duplicate ModelConverter registration with Spring Boot DevTools +- #2941 - SpringBoot native fails /v3/api-docs when using a Map as an http entity field + ## [2.8.5] - 2025-02-16 ### Added + - #2696 - Do not require JsonSubType annotation for sealed classes -- #2898 - add needed runtime reflection hints for native image +- #2898 - add needed runtime reflection hints for native image - #2891 - Refactor trimIndent Method +- #2931 - OpenAPIService serverBaseUrl is not thread safe +- #2933 - Wrong schema generation with PagedModel generated VIA_DTO and wrapped in + ResponseEntity ### Changed + - Upgrade swagger-ui to v5.18.3 ### Fixed -- #2902 - Schema replaced by String when using @ApiResponse with RepresentationModel (Hateoas links) + +- #2902 - Schema replaced by String when using @ApiResponse with RepresentationModel ( + Hateoas links) - #2876 - Restentpoints with same name get mix up - #2895 - Only filter out actuator endpoints with double asterisks. - #2894 - respect @JsonUnwrapped & @Schema on props not fields only -- #2881 - fix defaultValue when using @PageableDefault together with one-indexed-parameters +- #2881 - fix defaultValue when using @PageableDefault together with + one-indexed-parameters - #2888 - Provide a better consistency for parameters and responses order. ## [2.8.4] - 2025-01-25 ### Added + - #2873 - Improve performance of getGenericMapResponse -- #2836 - Provide option to set allowed locales +- #2836 - Provide option to set allowed locales - 2862 - Align Swagger-UI Prefix Path with Swagger-WebMvc Behavior ### Changed + - Upgrade spring-boot to 3.4.2 - Upgrade spring-cloud-function to 4.2.1 - Upgrade swagger-core to 2.2.28 -### Fixed +### Fixed + - #2870 - Springdoc 2.8.x + Spring Boot 3.4.1 breaks native image support -- #2869 - Exception logged when generating schema for delete method of Spring Data repository. +- #2869 - Exception logged when generating schema for delete method of Spring Data + repository. - #2856 - @JsonUnwrapped is ignored in new version of lib. -- #2852 - @Schema(types = "xxx") does not work for multipart param with enabled springdoc.default-support-form-data config option. +- #2852 - @Schema(types = "xxx") does not work for multipart param with enabled + springdoc.default-support-form-data config option. ## [2.8.3] - 2025-01-12 ### Added + - #2851 - Refine condition, for ignoring types when using PolymorphicModelConverter ## [2.8.2] - 2025-01-12 ### Added + - #2849 - Provide better compatibility for projects migrating from OAS 3.0 to OAS 3.1 ### Fixed + - #2846 - ClassCastException with spring-data-rest and openapi version 3.1 bug - #2844 - PageableObject and SortObject are called Pageablenull and Sortnull ## [2.8.1] - 2025-01-06 ### Fixed -- #2834 - java.lang.ClassNotFoundException: kotlin.reflect.full.KClasses when upgrade from 2.7.0 to 2.8.0 + +- #2834 - java.lang.ClassNotFoundException: kotlin.reflect.full.KClasses when upgrade from + 2.7.0 to 2.8.0 ## [2.8.0] - 2025-01-03 ### Added + - #2790 - Moving to OpenAPI 3.1 as the default implementation for springdoc-openapi -- #2817 - Obey annotations when flattening ParameterObject fields -- #2826 - Make it possible to mark parameters with @RequestParam annotation to be sent in form instead of query. +- #2817 - Obey annotations when flattening ParameterObject fields +- #2826 - Make it possible to mark parameters with @RequestParam annotation to be sent in + form instead of query. - #2822 - Support returning null in ParameterCustomizer - #2830 - Add support for deprecated fields. - #2780 - Add Security Schema by AutoConfigure ### Changed + - Upgrade spring-boot to 3.4.1 - Upgrade spring-cloud-function to 4.2.0 - Upgrade swagger-core to 2.2.27 ### Fixed + - #2804 - Stable release 2.7.0 depends on Spring Cloud Milestone 4.2.0-M1 -- #2828 - Required a bean of type 'org.springframework.data.rest.webmvc.mapping.Associations' that could not be found. +- #2828 - Required a bean of type ' + org.springframework.data.rest.webmvc.mapping.Associations' that could not be found. - #2823 - Capturing pattern in identical paths only renders the path element of one method - #2817 - Automatically add required if a field is @notNull or @NotBlank. -- #2814 - An unresolvable circular reference with management.endpoint.gateway.enabled=true. +- #2814 - An unresolvable circular reference with + management.endpoint.gateway.enabled=true. - #2798 - Object schema generated for Unit Kotlin type. - #2797 - Removing operationId via customizer does not work anymore. - #2833 - Resolve infinite recursion and add example test with OpenAPI v3.1 @@ -89,10 +254,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.7.0] - 2024-23-11 ### Added + - #2777 - Add SortAsQueryParam annotation -- #2786 - No static resource swagger-ui/index.html error after migration to 2.7.0-RC1 +- #2786 - No static resource swagger-ui/index.html error after migration to 2.7.0-RC1 ### Changed + - Upgrade spring-boot to 3.4.0 - Upgrade swagger-ui to 5.18.2 - Upgrade spring-security-oauth2-authorization-server to 1.4.0 @@ -100,17 +267,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.7.0-RC1] - 2024-11-06 ### Added + - #2649 - Add Encoding to multiple files and JSON payloads request test case - #2653 - Trim indent apply schema description -- #2664 - Refactor Replace hardcoded schema prefix length -- #2509, #2668 - Replace swagger urls in org.springdoc.core.properties.AbstractSwaggerUiConfigProperties#urls only if url is changed +- #2664 - Refactor Replace hardcoded schema prefix length +- #2509, #2668 - Replace swagger urls in + org.springdoc.core.properties.AbstractSwaggerUiConfigProperties#urls only if url is + changed - #2727 - Display nullable request body with map type - #2746 - Readme.md add gradle import -- #2760 - Added support for RequestBody as a meta-annotation +- #2760 - Added support for RequestBody as a meta-annotation - #2703 - Display nullable request body with map type - #2657 - Add support for OAS v3.1 webhooks ### Changed + - Upgrade spring-boot to 3.4.0-RC1 - Upgrade swagger-core to 2.2.25 - Upgrade swagger-ui to 5.18.1 @@ -118,44 +289,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Upgrade spring-security-oauth2-authorization-server to 1.4.0-M2 ### Fixed + - #2752 - Swagger doesn't work after custom annotation replacing request parameters - #2747 - Move to webjars-locator-lite, in preparation for spring-boot 3.4 GA - #2705 - @Schema oneOf config is ignored when generate the api-docs -- #2744 - SpringDocUI doest add Javadoc into swagger from abstract class -- #2708 - Spring Boot (Webflux) - Swagger UI - redirect URI does not include Gateway Prefix -- #2725 - Serialization to openapi of org.springframework.data.domain.Sort is wrong for Spring Boot >2.x +- #2744 - SpringDocUI doest add Javadoc into swagger from abstract class +- #2708 - Spring Boot (Webflux) - Swagger UI - redirect URI does not include Gateway + Prefix +- #2725 - Serialization to openapi of org.springframework.data.domain.Sort is wrong for + Spring Boot >2.x - #2740 - Swagger-ui ignores property springdoc.swagger-ui.supported-submit-methods - #2733 - Bad schema return type when created a generic wrapper class for response entity - #2687 - Failed to load api definition after spring boot 3.4.0-M2 - #2642 - Calling Swagger UI via different context paths fails -- #2709 - Annotation @Hidden on rest controller class level doesn't work due to spring default proxying mechanism CGLIB +- #2709 - Annotation @Hidden on rest controller class level doesn't work due to spring + default proxying mechanism CGLIB - #2642 - Calling Swagger UI via different context paths fails -- #2663 - Content definition in @ApiResponse remove schema generated based on the returned value -- #2646 - The operationId is unnecessarily deduplicated for a requestBody with multiple content types +- #2663 - Content definition in @ApiResponse remove schema generated based on the returned + value +- #2646 - The operationId is unnecessarily deduplicated for a requestBody with multiple + content types - #2643 - UpperSnakeCaseStrategy is not working with spring boot and ParameterObject - #2640 - @JsonUnwrapped is ignored when PolymorphicConverter is enabled -- #2638 - Boolean Parameter with @Schema Annotation Changes Type to string in OpenAPI Documentation +- #2638 - Boolean Parameter with @Schema Annotation Changes Type to string in OpenAPI + Documentation - #2659 - Fix typo in SpringSecurityLoginEndpointCustomizer method name -- #2660 - Update Response Code -- #2442, #2669 - Fix SpringDocApp193Test for Java 21 and above +- #2660 - Update Response Code +- #2442, #2669 - Fix SpringDocApp193Test for Java 21 and above - #2671 - Ensure default media type order is preserved using LinkedHashSet in mergeArrays - #2711 - Missing descriptions on Kotlin ByteArray fields -- #2733 - Bad schema return type when created a generic wrapper class for response entity +- #2733 - Bad schema return type when created a generic wrapper class for response entity ## [2.6.0] - 2024-06-30 ### Added + - #2561 - NPE occurs when outputting an OpenAPI document since 2.5.0 -- #2579 - Add support for leading tab characters with trim-kotlin-indent. -- #2589 - Pass HttpRequest to ServerBaseUrlCustomizer -- #2596, #2600 - consumes and produces calculation. Fixes -- #2625, #2626 - Replace Page schema with PagedModel when pageSerializationMode is set to VIA_DTO +- #2579 - Add support for leading tab characters with trim-kotlin-indent. +- #2589 - Pass HttpRequest to ServerBaseUrlCustomizer +- #2596, #2600 - consumes and produces calculation. Fixes +- #2625, #2626 - Replace Page schema with PagedModel when pageSerializationMode is set to + VIA_DTO - #2627 - Ensure compatibility with previous version of spring data -- #2576 - GroupedApi orders by displayName instead of name. -- #2584 - Dynamically define ApiGroups does not work. +- #2576 - GroupedApi orders by displayName instead of name. +- #2584 - Dynamically define ApiGroups does not work. - #2595 - Spring security support of @RegisteredOAuth2AuthorizedClient ### Changed + - Upgrade spring-boot to 3.3.0 - Upgrade swagger-core to 2.2.22 - Upgrade swagger-ui to 5.17.14 @@ -163,30 +344,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Upgrade spring-security-oauth2-authorization-server to 1.3.0 ### Fixed + - #2577 - Fix missing exception response types in OpenAPI spec - #2591 - When an entity class contains fields of Class type, an infinite loop. -- #2603 - PolymorphicModelConverter only handles direct subtypes and misses indirect. +- #2603 - PolymorphicModelConverter only handles direct subtypes and misses indirect. - #2606 - Spring Authorization Server Metadata Endpoint not compatible. -- #2621 - Content-type for POST endpoints with multipart/form-data does not work since v2.4.0. +- #2621 - Content-type for POST endpoints with multipart/form-data does not work since + v2.4.0. - #2622 - Kotlin enums are always marked as required if used in Java controllers. -- #2601 - Multiple Superclasses Are Not Mapped To Multiple allOf If Used In Different Services. -- #2597 - Polymorphic fields on polymorphic parents don't get correct oneOf docs generated. +- #2601 - Multiple Superclasses Are Not Mapped To Multiple allOf If Used In Different + Services. +- #2597 - Polymorphic fields on polymorphic parents don't get correct oneOf docs + generated. ## [2.5.0] - 2024-04-01 ### Added + - #2318 - Add Info to GroupedOpenAPI properties - #2554 - Remove duplicate words from comments - #2418 - Improve support for externalizing strings in generated openapi -- #2535 - Add 'springdoc.trim-kotlin-indent' property to handle Kotlin multiline string indentation +- #2535 - Add 'springdoc.trim-kotlin-indent' property to handle Kotlin multiline string + indentation ### Changed + - Upgrade spring-boot to 3.2.4 - Upgrade swagger-core to 2.2.21 - Upgrade swagger-ui to 5.13.0 ### Fixed -- #2525 - Inherited Methods Not Included in Swagger Documentation with @RouterOperation in Spring Boot WebFlux Application + +- #2525 - Inherited Methods Not Included in Swagger Documentation with @RouterOperation in + Spring Boot WebFlux Application - #2526 - SpringDoc bean naming conflict error with GraphQL Spring boot starter - #2540 - Fix typo in SpringRepositoryRestResourceProvider.java - #2549 - Fix README.md @@ -194,47 +384,56 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.4.0] - 2024-03-12 ### Added + - #2443 - Respect schema annotations when using spring mvc with kotlin - #2492, #2488 - Support dynamic evaluation of description field in the RequestBody - #2510 - Option to disable root api-docs path when using groups ### Changed + - Upgrade spring-boot to 3.2.3 - Upgrade swagger-core to 2.2.20 - Upgrade swagger-ui to 5.11.8 ### Fixed + - #2453 - Fix CODE_OF_CONDUCT.md links - #2454 - Fix typo in SwaggerWelcomeWebMvc - #2507 - Fix typo in Constants - #2472 - Update JavadocPropertyCustomizer.java - #2495 - Fix broken links in README and CONTRIBUTING - #2501 - bug fix when "exported" is set to false in RestResource annotation -- #2447 - Serialization to openapi of org.springframework.data.domain.Sort is not done correctly +- #2447 - Serialization to openapi of org.springframework.data.domain.Sort is not done + correctly - #2449 - Extensions in subobjects of OpenAPI no longer work -- #2461 - Springdoc OpenApi Annotations @ExtensionProperty Not Evaluating Properties from application.yml +- #2461 - Springdoc OpenApi Annotations @ExtensionProperty Not Evaluating Properties from + application.yml - #2469 - Pom contains invalid organizationUrl - #2518 - Duplicate GroupConfigs in SpringDocConfigProperties -- #2506 - Springdoc breaks (Unexpected value: TRACE) when a spring-cloud-starter-gateway-mvc universal gateway is configured. +- #2506 - Springdoc breaks (Unexpected value: TRACE) when a + spring-cloud-starter-gateway-mvc universal gateway is configured. - #2519 - Request parameter parsing error after using @NotBlank from type interface field - #2516 - Spring Data REST fails when setting version to openapi_3_1 - #2509 - ArrayIndexOutOfBoundsException in SwaggerUiConfigParameters - #2484 - JavaDoc integration not working with SnakeCaseStrategy property naming -- #2483 - Controller advice documents ApiResponse on every operation, even if the operation does not annotate the exception to be thrown -- #2477 - buildApiResponses ignores produced ContentType in case of many @Operation +- #2483 - Controller advice documents ApiResponse on every operation, even if the + operation does not annotate the exception to be thrown +- #2477 - buildApiResponses ignores produced ContentType in case of many @Operation ## [2.3.0] - 2023-12-03 ### Added + - #2340 - Add support OIDC with Spring Authorization Server -- #2345 - Support Schema added in OpenAPI Specification v3.1 -- #2387 - Support get javadoc description from getter method +- #2345 - Support Schema added in OpenAPI Specification v3.1 +- #2387 - Support get javadoc description from getter method - #2404 - Update condition to register links schema customizer - #2359 - Update condition to register links schema customizer - #2348 - Enhance resource path processing - #2438, #2315 - Support for @JsonProperty with Javadoc Change in springdoc-openapi ### Changed + - Upgrade spring-boot to 3.2.0 - Upgrade swagger-core to 2.2.19 - Upgrade swagger-ui to 5.10.3 @@ -242,20 +441,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - #2366 - Fix the failed test due to hardcoded file separators -- #2370, #2371 - No empty description for polymorphic subtypes -- #2373 - SchemaProperty.array Schema is ignored in /api-docs or api-docs.yaml +- #2370, #2371 - No empty description for polymorphic subtypes +- #2373 - SchemaProperty.array Schema is ignored in /api-docs or api-docs.yaml - #2366 - Refactoring AbstractSwaggerResourceResolver.findWebJarResourcePath - #2320 - javadoc for class attribute ignored when in EntityModel. - #2347 - Not working if a property of entity contains generic parameters. -- #2399 - SpringdocRouteBuilder.onError is overriding last route defined. -- #2426 - StackOverflowError when using @ParameterObject on groovy class. +- #2399 - SpringdocRouteBuilder.onError is overriding last route defined. +- #2426 - StackOverflowError when using @ParameterObject on groovy class. ## [2.2.0] - 2023-08-06 ### Added -- #2189 - Add support for swagger-ui.url property + +- #2189 - Add support for swagger-ui.url property - #2200 - Support schema.requiredMode() on ParameterObject -- #2309 - Added function to preload by specifying locale +- #2309 - Added function to preload by specifying locale - #2332 - Group name cannot be null or empty - #2281 - Initial Virtual thread support @@ -267,17 +467,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- #2199 - Fix Schema get condition of ArraySchema. -- #2194 - Fix Swagger UI with provided spec -- #2213 - Using both generated and configured specs stoped working in 1.6.5 +- #2199 - Fix Schema get condition of ArraySchema. +- #2194 - Fix Swagger UI with provided spec +- #2213 - Using both generated and configured specs stoped working in 1.6.5 - #2222 - String Index Out of Bounce Exception Fix when deployed on Azure -- #2243, #2235 - Fix StringIndexOutOfBoundsException when path is same webjar -- #2291 - Fix default-flat-param-object doesn't work when using http body -- #2310 - Change bean name of objectMapperProvider +- #2243, #2235 - Fix StringIndexOutOfBoundsException when path is same webjar +- #2291 - Fix default-flat-param-object doesn't work when using http body +- #2310 - Change bean name of objectMapperProvider - #2207 - swagger-initializer.js is sent endcoded in the JVM's default charset -- #2271, #2280 - Fix loop when response inherits generic class fixes +- #2271, #2280 - Fix loop when response inherits generic class fixes - #2312 - Spec for @ParameterObject disappears if building native-images -- #2326 - @QuerydslPredicate(root = X.class) annotation at Controller Method level not getting documented in Spring Boot 3 +- #2326 - @QuerydslPredicate(root = X.class) annotation at Controller Method level not + getting documented in Spring Boot 3 ## [2.1.0] - 2023-04-01 @@ -301,16 +502,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #2131 - Fixed a bug that javadoc of record class parameters was not recognized. - #2140 - Javadoc record class parameters not recognized - #2123 #2141 - fix spring authorization server response. -- #2148 - Fix properties show-oauth2-endpoints and SpringDocConfigProperties#showOauth2Endpoint properties name mismatch +- #2148 - Fix properties show-oauth2-endpoints and + SpringDocConfigProperties#showOauth2Endpoint properties name mismatch - #2149 - Request parameters with default values are marked as required. - #2155 - openApi.getServers() is null in OpenApiCustomiser when using different locales. - #2152 - Redundant(wrong) direction appended to @PageableDefault. - #2181 #2183 - Fixed DefaultFlatParamObject to work with annotated parameters. -- #2170 #2187 - All request parameters marked as required for Java controllers in mixed projects in 2.0.3 +- #2170 #2187 - All request parameters marked as required for Java controllers in mixed + projects in 2.0.3 - #2165 - Custom Converters are not excluded if not registered for Http Message Converter. - #2185 - Fix behaviour of required flag for schema class fields. - #2139 - SpringDocSecurityConfiguration class not sufficiently constrained. -- #2142 - SpringDocJacksonModuleConfiguration is loaded even though there is no ObjectMapperProvider when springdoc.api-docs.enabled = false. +- #2142 - SpringDocJacksonModuleConfiguration is loaded even though there is no + ObjectMapperProvider when springdoc.api-docs.enabled = false. ## [2.0.4] - 2023-03-15 @@ -332,6 +536,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #2054 - Add copyright and license information to Jar. - #2021 - Required field in Schema annotation ignored in Kotlin. - #2094 - Initial support for Spring Authorization Server. + ### Changed - Upgrade spring-boot to 3.0.4 @@ -342,20 +547,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #2010 - findByNameContainingIgnoreCaseAndDateBefore throw NullPointerException. - #2031 - Path variables parameters are not assigned correctly to endpoints. -- #2038 - When extends JpaRepository, using @Parameter over the method results in duplicate of the same parameter. +- #2038 - When extends JpaRepository, using @Parameter over the method results in + duplicate of the same parameter. - #2046 - Map Fields Disappear with Groovy on Classpath. - #2051 - Malformed api-docs JSON when StringHttpMessageConverter is not active - #2062 - OperationCustomizer is not working with Spring Data REST. -- #2098 - When getting ExceptionHandler in the controller, use target class in case of AOP Proxy. +- #2098 - When getting ExceptionHandler in the controller, use target class in case of AOP + Proxy. - #2107 - Ordering of GlobalOpenApiCustomizers different than for OpenApiCustomisers. -- #2089 - Fixed a bug that a NullPointerException is thrown when the description field of RequestBody is null and there is a javadoc description. +- #2089 - Fixed a bug that a NullPointerException is thrown when the description field of + RequestBody is null and there is a javadoc description. - #2104 - OpenAPI Extensions no longer work. ## [2.0.2] - 2022-12-16 ### Fixed -- #2008 - Error when com.fasterxml.jackson.module.kotlin.KotlinModule is not present in classpath +- #2008 - Error when com.fasterxml.jackson.module.kotlin.KotlinModule is not present in + classpath ## [2.0.1] - 2022-12-16 @@ -368,7 +577,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #1957 - AdditionalModelsConverter Schema params rewriting - #1962 - override-with-generic-response shouldn't shallow copy -- #1985 - IllegalStateException: Duplicate key when two endpoints at the same URL with same header exist +- #1985 - IllegalStateException: Duplicate key when two endpoints at the same URL with + same header exist - #1992 - Java enumeration and Spring Converter no longer generates enum drop-down - #2001 - Enum Collection parameter missing type info in Spring Data Rest search method - #1961 - ContinuationObject leaks into schema @@ -380,6 +590,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #1284 - Add support for Jakarta EE ### What's Changed + - Upgrade spring-boot to v3.0.0 ## [2.0.0-RC2] - 2022-11-20 @@ -388,7 +599,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #1929 - Enables no cache on not cache swagger-initializer.js - #1922 - Check existence of superclass before accessing its name -- #1923 - Javadoc description of the @RequestPart param of multipart/form-data to the parameter description +- #1923 - Javadoc description of the @RequestPart param of multipart/form-data to the + parameter description + ### Changed - Upgrade spring-boot to 3.0.0-RC2 @@ -399,10 +612,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - #1892 - springdoc.model-and-view-allowed enhanced -- #1901 - When @Get, using @Parameter over the method results in duplicate of the same parameter +- #1901 - When @Get, using @Parameter over the method results in duplicate of the same + parameter - #1909 - ExceptionHandler in controller is not used by another controller -- #1904 - springdoc-openapi-webflux-ui 2.0.0-M7 + spring actuator + spring cloud crashes at startup -- #1911 - Wrong type for springdoc.swagger-ui.oauth.useBasicAuthenticationWithAccessCodeGrant configuration property +- #1904 - springdoc-openapi-webflux-ui 2.0.0-M7 + spring actuator + spring cloud crashes + at startup +- #1911 - Wrong type for + springdoc.swagger-ui.oauth.useBasicAuthenticationWithAccessCodeGrant configuration + property - #1931 - Spring Security form login only offers application/json req body type. ## [2.0.0-RC1] - 2022-10-23 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f7dce2d75..93ae9062f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -35,5 +35,6 @@ individual is representing the project or its community. This Code of Conduct is adapted from the [Contributor Covenant](https://contributor-covenant.org), version 1.3.0, available at -[contributor-covenant.org/version/1/3/0/](https://contributor-covenant.org/version/1/3/0/) and [spring-boot +[contributor-covenant.org/version/1/3/0/](https://contributor-covenant.org/version/1/3/0/) +and [spring-boot Contributor Code of Conduct](https://github.com/spring-projects/spring-boot/blob/master/CODE_OF_CONDUCT.adoc) diff --git a/README.md b/README.md index 5b3618093..851b03156 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,17 @@ [![Known Vulnerabilities](https://snyk.io/test/github/springdoc/springdoc-openapi.git/badge.svg)](https://snyk.io/test/github/springdoc/springdoc-openapi.git) [![Stack Exchange questions](https://img.shields.io/stackexchange/stackoverflow/t/springdoc)](https://stackoverflow.com/questions/tagged/springdoc?tab=Votes) -IMPORTANT: ``springdoc-openapi v1.8.0`` is the latest Open Source release supporting Spring Boot 2.x and 1.x. +IMPORTANT: ``springdoc-openapi v1.8.0`` is the latest Open Source release supporting +Spring Boot 2.x and 1.x. -An extended support for [*springdoc-openapi v1*](https://springdoc.org/v1) -project is now available for organizations that need support beyond 2023. +An extended support for [*springdoc-openapi v1*](https://springdoc.org/v1) +project is now available for organizations that need support beyond 2023. -For more details, feel free to reach out: [sales@springdoc.org](mailto:sales@springdoc.org) +For more details, feel free to reach +out: [sales@springdoc.org](mailto:sales@springdoc.org) -``springdoc-openapi`` is on [Open Collective](https://opencollective.com/springdoc). If you ❤️ this project consider becoming -a [sponsor](https://github.com/sponsors/springdoc). +``springdoc-openapi`` is on [Open Collective](https://opencollective.com/springdoc). If +you ❤️ this project consider becoming a [sponsor](https://github.com/sponsors/springdoc). This project is sponsored by @@ -33,7 +35,7 @@ This project is sponsored by - +

@@ -83,9 +85,11 @@ The following video introduces the Library: * [https://youtu.be/utRxyPfFlDw](https://youtu.be/utRxyPfFlDw) -For *spring-boot v3* support, make sure you use [springdoc-openapi v2](https://springdoc.org/) +For *spring-boot v3* support, make sure you +use [springdoc-openapi v2](https://springdoc.org/) -This is a community-based project, not maintained by the Spring Framework Contributors (Pivotal) +This is a community-based project, not maintained by the Spring Framework Contributors ( +Pivotal) # **Getting Started** @@ -106,6 +110,7 @@ This is a community-based project, not maintained by the Spring Framework Contri additional configuration is needed): Maven + ```xml org.springdoc @@ -115,6 +120,7 @@ Maven ``` Gradle + ```groovy implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:latest' ``` @@ -158,6 +164,7 @@ springdoc.swagger-ui.path=/swagger-ui.html is needed) Maven + ```xml org.springdoc @@ -167,6 +174,7 @@ Maven ``` Gradle + ```groovy implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:latest' ``` @@ -209,6 +217,7 @@ and `@SecurityScheme` annotations within a Spring managed bean. is needed) Maven + ```xml org.springdoc @@ -218,6 +227,7 @@ Maven ``` Gradle + ```groovy implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:latest' ``` @@ -235,12 +245,12 @@ The artifacts can be viewed accessed at the following locations: Releases: -* [https://s01.oss.sonatype.org/content/groups/public/org/springdoc/](https://s01.oss.sonatype.org/content/groups/public/org/springdoc/) +* [https://central.sonatype.com/search?q=g:org.springdoc)](https://central.sonatype.com/search?q=g:org.springdoc) . Snapshots: -* [https://s01.oss.sonatype.org/content/repositories/snapshots/org/springdoc/](https://s01.oss.sonatype.org/content/repositories/snapshots/org/springdoc/) +* [https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/springdoc/](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/org/springdoc/) . # Acknowledgements @@ -263,4 +273,4 @@ Thanks you all for your support! * [JetBrains](https://www.jetbrains.com/?from=springdoc-openapi) - Thanks a lot for supporting springdoc-openapi project. -![JenBrains logo](https://springdoc.org/img/jetbrains.svg) +![JenBrains logo](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg) diff --git a/SECURITY.md b/SECURITY.md index 0099d9342..fda5252c2 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,9 +2,9 @@ ## Supported Versions -| Version | Supported | -| ------- | ------------------ | -| latest-stable | :white_check_mark: | +| Version | Supported | +|---------------|--------------------| +| latest-stable | :white_check_mark: | ## Reporting a Vulnerability diff --git a/pom.xml b/pom.xml index dcda74974..e101d2b67 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.springdoc springdoc-openapi - 2.8.5 + 2.8.13 pom Spring openapi documentation Spring openapi documentation @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.2 + 3.5.5 @@ -35,18 +35,8 @@ scm:git:git@github.com:springdoc/springdoc-openapi.git scm:git:git@github.com:springdoc/springdoc-openapi.git - v2.8.5 + v2.8.13 - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - springdoc-openapi-starter-common @@ -54,19 +44,27 @@ springdoc-openapi-starter-webflux-api springdoc-openapi-starter-webmvc-ui springdoc-openapi-starter-webflux-ui + springdoc-openapi-starter-webmvc-scalar + springdoc-openapi-starter-webflux-scalar + springdoc-openapi-bom 1.6 2.5.3 - 1.6.8 - 2.2.28 - 5.18.3 + 0.7.0 + + 1.5.0 + 2.2.36 + 5.28.1 1.13.1 0.9.1 0.15.0 - 4.2.1 - 1.4.0 + 4.2.2 + 1.4.3 + + 0.1.0 + false @@ -83,74 +81,39 @@ swagger-ui ${swagger-ui.version} - - javax.xml - jaxb-impl - ${jaxb-impl.version} - - - javax.jws - javax.jws-api - ${javax.jws-api.version} - test - io.jsonwebtoken jjwt ${jjwt.version} - test - + org.springframework.cloud - spring-cloud-function-core - ${spring-cloud-function.version} - - - org.springframework.cloud - spring-cloud-function-web - ${spring-cloud-function.version} - - - org.springframework.cloud - spring-cloud-starter-function-web - ${spring-cloud-function.version} - - - org.springframework.cloud - spring-cloud-starter-function-webflux + spring-cloud-function-dependencies ${spring-cloud-function.version} + pom + import + org.springframework.security spring-security-oauth2-authorization-server ${spring-security-oauth2-authorization-server.version} - - - org.springdoc - springdoc-openapi-starter-common - ${project.version} - - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${project.version} - - org.springdoc - springdoc-openapi-starter-webflux-api - ${project.version} + com.scalar.maven + scalar + ${scalar.version} - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${project.version} + com.github.therapi + therapi-runtime-javadoc + ${therapi-runtime-javadoc.version} - org.springdoc - springdoc-openapi-starter-webflux-ui - ${project.version} + com.github.therapi + therapi-runtime-javadoc-scribe + ${therapi-runtime-javadoc.version} @@ -159,24 +122,9 @@ org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - ${gmavenplus-plugin.version} - - - org.apache.maven.plugins @@ -189,7 +137,8 @@ copy-resources - ${basedir}/target/classes/META-INF + ${basedir}/target/classes/META-INF + ${basedir}/.. @@ -268,22 +217,16 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin} + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} true - ossrh - https://s01.oss.sonatype.org/ - true + central + true + published + ${skipPublishing} - - - com.thoughtworks.xstream - xstream - 1.4.15 - - maven-release-plugin @@ -301,33 +244,13 @@ - - central - https://repo.maven.apache.org/maven2 - - false - - - - spring-release - Spring release - https://repo.spring.io/release - - false - - - - spring-snapshot - Spring Snapshots - https://repo.spring.io/snapshot - - true - - spring-milestones Spring Milestones https://repo.spring.io/milestone + + true + false @@ -335,9 +258,12 @@ - spring-releases - Spring Releases - https://repo.spring.io/release + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + true + false diff --git a/springdoc-openapi-bom/.gitignore b/springdoc-openapi-bom/.gitignore new file mode 100644 index 000000000..ab21548c1 --- /dev/null +++ b/springdoc-openapi-bom/.gitignore @@ -0,0 +1,144 @@ +###################### +# Project Specific +###################### +/target/www/** +/src/test/javascript/coverage/ + +###################### +# Node +###################### +/node/ +node_tmp/ +node_modules/ +npm-debug.log.* +/.awcache/* +/.cache-loader/* + +###################### +# SASS +###################### +.sass-cache/ + +###################### +# Eclipse +###################### +*.pydevproject +.project +.metadata +tmp/ +tmp/**/* +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath +.factorypath +/src/main/resources/rebel.xml + +# External tool builders +.externalToolBuilders/** + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + +###################### +# Intellij +###################### +.idea/ +*.iml +*.iws +*.ipr +*.ids +*.orig +classes/ +out/ + +###################### +# Visual Studio Code +###################### +.vscode/ + +###################### +# Maven +###################### +/log/ +/target/ + +###################### +# Gradle +###################### +.gradle/ +/build/ + +###################### +# Package Files +###################### +*.jar +*.war +*.ear +*.db + +###################### +# Windows +###################### +# Windows image file caches +Thumbs.db + +# Folder config file +Desktop.ini + +###################### +# Mac OSX +###################### +.DS_Store +.svn + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +###################### +# Directories +###################### +/bin/ +/deploy/ + +###################### +# Logs +###################### +*.log* + +###################### +# Others +###################### +*.class +*.*~ +*~ +.merge_file* + +###################### +# Gradle Wrapper +###################### +!gradle/wrapper/gradle-wrapper.jar + +###################### +# Maven Wrapper +###################### +!.mvn/wrapper/maven-wrapper.jar + +###################### +# ESLint +###################### +.eslintcache \ No newline at end of file diff --git a/springdoc-openapi-bom/pom.xml b/springdoc-openapi-bom/pom.xml new file mode 100644 index 000000000..a7aeedb52 --- /dev/null +++ b/springdoc-openapi-bom/pom.xml @@ -0,0 +1,83 @@ + + 4.0.0 + + org.springdoc + springdoc-openapi + 2.8.13 + + springdoc-openapi-bom + ${project.artifactId} + pom + + + + org.springdoc + springdoc-openapi-starter-common + ${project.version} + + + org.springdoc + springdoc-openapi-starter-webmvc-api + ${project.version} + + + org.springdoc + springdoc-openapi-starter-webflux-api + ${project.version} + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${project.version} + + + org.springdoc + springdoc-openapi-starter-webflux-ui + ${project.version} + + + org.springdoc + springdoc-openapi-starter-webmvc-scalar + ${project.version} + + + org.springdoc + springdoc-openapi-starter-webflux-scalar + ${project.version} + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + false + + + + flatten + process-resources + + flatten + + + true + bom + + remove + remove + keep + remove + remove + + + + + + + + + diff --git a/springdoc-openapi-starter-common/pom.xml b/springdoc-openapi-starter-common/pom.xml index 93483b2ac..fbb049f7e 100644 --- a/springdoc-openapi-starter-common/pom.xml +++ b/springdoc-openapi-starter-common/pom.xml @@ -3,14 +3,19 @@ org.springdoc springdoc-openapi - 2.8.5 + 2.8.13 springdoc-openapi-starter-common + ${project.artifactId} org.springframework.boot spring-boot-autoconfigure + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot spring-boot-configuration-processor @@ -23,7 +28,7 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-actuator-autoconfigure true @@ -42,7 +47,6 @@ com.github.therapi therapi-runtime-javadoc - ${therapi-runtime-javadoc.version} true @@ -88,6 +92,11 @@ querydsl-core true + + com.scalar.maven + scalar + true + @@ -155,4 +164,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java index 948a0e667..bb7f44361 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.api; @@ -86,6 +86,7 @@ import org.slf4j.LoggerFactory; import org.springdoc.core.annotations.RouterOperations; import org.springdoc.core.customizers.DataRestRouterOperationCustomizer; +import org.springdoc.core.customizers.GlobalOperationComponentsCustomizer; import org.springdoc.core.customizers.OpenApiLocaleCustomizer; import org.springdoc.core.customizers.OperationCustomizer; import org.springdoc.core.customizers.RouterOperationCustomizer; @@ -108,6 +109,7 @@ import org.springdoc.core.service.OpenAPIService; import org.springdoc.core.service.OperationService; import org.springdoc.core.utils.PropertyResolverUtils; +import org.springdoc.core.utils.SpringDocAnnotationsUtils; import org.springdoc.core.utils.SpringDocUtils; import org.springframework.aop.support.AopUtils; @@ -130,6 +132,7 @@ import static org.springdoc.core.utils.Constants.DOT; import static org.springdoc.core.utils.Constants.OPERATION_ATTRIBUTE; import static org.springdoc.core.utils.Constants.SPRING_MVC_SERVLET_PATH; +import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson; import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; /** @@ -139,6 +142,7 @@ * @author kevinraddatz * @author hyeonisism * @author doljae + * @author zdary */ public abstract class AbstractOpenApiResource extends SpecFilter { @@ -177,6 +181,11 @@ public abstract class AbstractOpenApiResource extends SpecFilter { */ protected final SpringDocProviders springDocProviders; + /** + * The Spring doc customizers. + */ + protected final SpringDocCustomizers springDocCustomizers; + /** * The open api builder object factory. */ @@ -202,16 +211,6 @@ public abstract class AbstractOpenApiResource extends SpecFilter { */ private final AntPathMatcher antPathMatcher = new AntPathMatcher(); - /** - * The Open api builder. - */ - protected OpenAPIService openAPIService; - - /** - * The Spring doc customizers. - */ - protected final SpringDocCustomizers springDocCustomizers; - /** * The Reentrant lock. */ @@ -222,6 +221,11 @@ public abstract class AbstractOpenApiResource extends SpecFilter { */ private final Pattern pathPattern = Pattern.compile("\\{(.*?)}"); + /** + * The Open api builder. + */ + protected OpenAPIService openAPIService; + /** * Instantiates a new Abstract open api resource. @@ -255,7 +259,7 @@ protected AbstractOpenApiResource(String groupName, ObjectFactory this.getOpenApi(Locale.forLanguageTag(locale))); + Executors.newSingleThreadExecutor().execute(() -> this.getOpenApi(null, Locale.forLanguageTag(locale))); } } } @@ -333,7 +337,7 @@ public static void setModelAndViewClass(Class modelAndViewClass) { * Gets open api. */ private void getOpenApi() { - this.getOpenApi(Locale.getDefault()); + this.getOpenApi(null, Locale.getDefault()); } /** @@ -342,7 +346,7 @@ private void getOpenApi() { * @param locale the locale * @return the open api */ - protected OpenAPI getOpenApi(Locale locale) { + protected OpenAPI getOpenApi(String serverBaseUrl, Locale locale) { this.reentrantLock.lock(); try { final OpenAPI openAPI; @@ -383,22 +387,15 @@ protected OpenAPI getOpenApi(Locale locale) { openAPIService.setServersPresent(true); else openAPIService.setServersPresent(false); - openAPIService.updateServers(openAPI); + openAPIService.updateServers(serverBaseUrl, openAPI); if (springDocConfigProperties.isRemoveBrokenReferenceDefinitions()) this.removeBrokenReferenceDefinitions(openAPI); // run the optional customizers List servers = openAPI.getServers(); - List serversCopy = null; - try { - serversCopy = springDocProviders.jsonMapper() - .readValue(springDocProviders.jsonMapper().writeValueAsString(servers), new TypeReference>() {}); - } - catch (JsonProcessingException e) { - LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage()); - } - + List serversCopy = cloneViaJson(servers, new TypeReference>() {}, springDocProviders.jsonMapper()); + openAPIService.getContext().getBeansOfType(OpenApiLocaleCustomizer.class).values().forEach(openApiLocaleCustomizer -> openApiLocaleCustomizer.customise(openAPI, finalLocale)); springDocCustomizers.getOpenApiCustomizers().ifPresent(apiCustomizers -> apiCustomizers.forEach(openApiCustomizer -> openApiCustomizer.customise(openAPI))); if (!CollectionUtils.isEmpty(openAPI.getServers()) && !openAPI.getServers().equals(serversCopy)) @@ -412,12 +409,12 @@ protected OpenAPI getOpenApi(Locale locale) { else { LOGGER.debug("Fetching openApi document from cache"); openAPI = openAPIService.getCachedOpenAPI(finalLocale); - openAPIService.updateServers(openAPI); + openAPIService.updateServers(serverBaseUrl, openAPI); } - openAPIService.updateServers(openAPI); return openAPI; } finally { + SpringDocAnnotationsUtils.clearCache(operationParser.getJavadocProvider()); this.reentrantLock.unlock(); } } @@ -426,8 +423,8 @@ private Locale selectLocale(Locale inputLocale) { List allowedLocales = springDocConfigProperties.getAllowedLocales(); if (!CollectionUtils.isEmpty(allowedLocales)) { Locale bestMatchingAllowedLocale = Locale.lookup( - Locale.LanguageRange.parse(inputLocale.toLanguageTag()), - allowedLocales.stream().map(Locale::forLanguageTag).collect(Collectors.toList()) + Locale.LanguageRange.parse(inputLocale.toLanguageTag()), + allowedLocales.stream().map(Locale::forLanguageTag).toList() ); return bestMatchingAllowedLocale == null ? Locale.forLanguageTag(allowedLocales.get(0)) : bestMatchingAllowedLocale; @@ -523,8 +520,12 @@ private void trimIndentOperation(Operation operation) { * @param locale the locale */ protected void calculateWebhooks(OpenAPI calculatedOpenAPI, Locale locale) { - Webhooks[] webhooksAttr = openAPIService.getWebhooks(); - if(ArrayUtils.isEmpty(webhooksAttr)) + Class[] classes = openAPIService.getWebhooksClasses(); + Class[] refinedClasses = Arrays.stream(classes) + .filter(clazz -> isPackageToScan(clazz.getPackage())) + .toArray(Class[]::new); + Webhooks[] webhooksAttr = openAPIService.getWebhooks(refinedClasses); + if (ArrayUtils.isEmpty(webhooksAttr)) return; var webhooks = Arrays.stream(webhooksAttr).map(Webhooks::value).flatMap(Arrays::stream).toArray(Webhook[]::new); Arrays.stream(webhooks).forEach(webhook -> { @@ -649,7 +650,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router buildCallbacks(openAPI, methodAttributes, operation, apiCallbacks); // allow for customisation - operation = customizeOperation(operation, handlerMethod); + operation = customizeOperation(operation, components, handlerMethod); if (StringUtils.contains(operationPath, "*")) { Matcher matcher = pathPattern.matcher(operationPath); @@ -659,7 +660,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router operationPath = operationPath.replace("{" + pathParam + "}", "{" + newPathParam + "}"); } } - + PathItem pathItemObject = buildPathItem(requestMethod, operation, operationPath, paths); paths.addPathItem(operationPath, pathItemObject); } @@ -1011,15 +1012,20 @@ protected Set getDefaultAllowedHttpMethods() { * Customise operation. * * @param operation the operation + * @param components * @param handlerMethod the handler method * @return the operation */ - protected Operation customizeOperation(Operation operation, HandlerMethod handlerMethod) { + protected Operation customizeOperation(Operation operation, Components components, HandlerMethod handlerMethod) { Optional> optionalOperationCustomizers = springDocCustomizers.getOperationCustomizers(); if (optionalOperationCustomizers.isPresent()) { Set operationCustomizerList = optionalOperationCustomizers.get(); - for (OperationCustomizer operationCustomizer : operationCustomizerList) - operation = operationCustomizer.customize(operation, handlerMethod); + for (OperationCustomizer operationCustomizer : operationCustomizerList) { + if (operationCustomizer instanceof GlobalOperationComponentsCustomizer globalOperationComponentsCustomizer) + operation = globalOperationComponentsCustomizer.customize(operation, components, handlerMethod); + else + operation = operationCustomizer.customize(operation, handlerMethod); + } } return operation; } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/ErrorMessage.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/ErrorMessage.java index 7a076bfd0..832f9af07 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/ErrorMessage.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/ErrorMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.api; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/OpenApiResourceNotFoundException.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/OpenApiResourceNotFoundException.java index 3dd2e7e39..46f0e01b9 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/OpenApiResourceNotFoundException.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/api/OpenApiResourceNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.api; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/ParameterObject.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/ParameterObject.java index 116b7f231..858f69935 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/ParameterObject.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/ParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.annotations; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperation.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperation.java index 79f31ca43..867402354 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperation.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperation.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.annotations; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperations.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperations.java index a3495cb7f..2a5a82cdf 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperations.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/annotations/RouterOperations.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.annotations; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/CacheOrGroupedOpenApiCondition.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/CacheOrGroupedOpenApiCondition.java index ae8da1105..1ac367413 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/CacheOrGroupedOpenApiCondition.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/CacheOrGroupedOpenApiCondition.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.conditions; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiGroupsCondition.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiGroupsCondition.java index b7246fc9a..58c394086 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiGroupsCondition.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiGroupsCondition.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.conditions; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiSupportCondition.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiSupportCondition.java index 3c050d0cd..9b16b8b75 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiSupportCondition.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiSupportCondition.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.conditions; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/SpecPropertiesCondition.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/SpecPropertiesCondition.java index b964da9ec..6f6ee89f8 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/SpecPropertiesCondition.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/SpecPropertiesCondition.java @@ -21,13 +21,13 @@ * * * * * * * * * - * + * */ package org.springdoc.core.conditions; /** - * @author bnasslahsen + * */ import java.util.Set; @@ -49,7 +49,7 @@ * @author bnasslahsen */ public class SpecPropertiesCondition implements Condition { - + @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { final BindResult result = Binder.get(context.getEnvironment()) @@ -63,5 +63,5 @@ public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) } return false; } - + } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java index 58c7ad34d..9bdbd742d 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java @@ -34,6 +34,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.Future; import com.fasterxml.jackson.databind.node.ObjectNode; import com.querydsl.core.types.Predicate; @@ -67,6 +68,7 @@ import org.springdoc.core.customizers.OpenApiCustomizer; import org.springdoc.core.customizers.OperationCustomizer; import org.springdoc.core.customizers.OperationIdCustomizer; +import org.springdoc.core.customizers.ParameterCustomizer; import org.springdoc.core.customizers.ParameterObjectNamingStrategyCustomizer; import org.springdoc.core.customizers.PropertyCustomizer; import org.springdoc.core.customizers.QuerydslPredicateOperationCustomizer; @@ -74,6 +76,7 @@ import org.springdoc.core.customizers.ServerBaseUrlCustomizer; import org.springdoc.core.customizers.SpringDocCustomizers; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; +import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.filters.GlobalOpenApiMethodFilter; import org.springdoc.core.filters.OpenApiMethodFilter; import org.springdoc.core.models.GroupedOpenApi; @@ -96,6 +99,8 @@ import org.springdoc.core.service.RequestBodyService; import org.springdoc.core.service.SecurityService; import org.springdoc.core.utils.PropertyResolverUtils; +import org.springdoc.core.utils.SchemaUtils; +import org.springdoc.core.utils.SpringDocKotlinUtils; import reactor.core.publisher.Flux; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; @@ -129,6 +134,8 @@ import static org.springdoc.core.utils.Constants.GLOBAL_OPEN_API_CUSTOMIZER; import static org.springdoc.core.utils.Constants.SPRINGDOC_DEPRECATING_CONVERTER_ENABLED; import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLED; +import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_EXTRA_SCHEMAS; +import static org.springdoc.core.utils.Constants.SPRINGDOC_EXPLICIT_OBJECT_SCHEMA; import static org.springdoc.core.utils.Constants.SPRINGDOC_POLYMORPHIC_CONVERTER_ENABLED; import static org.springdoc.core.utils.Constants.SPRINGDOC_SCHEMA_RESOLVE_PROPERTIES; import static org.springdoc.core.utils.Constants.SPRINGDOC_SHOW_ACTUATOR; @@ -153,7 +160,8 @@ public class SpringDocConfiguration { static { getConfig().replaceWithSchema(ObjectNode.class, new ObjectSchema()) .replaceWithClass(Charset.class, String.class) - .addResponseWrapperToIgnore(DeferredResult.class); + .addResponseWrapperToIgnore(DeferredResult.class) + .addResponseWrapperToIgnore(Future.class); } /** @@ -183,6 +191,14 @@ static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor2() { return SpringdocBeanFactoryConfigurer::initBeanFactoryPostProcessor; } + @Bean + @Lazy(false) + @ConditionalOnProperty(name = SPRINGDOC_ENABLE_EXTRA_SCHEMAS, matchIfMissing = true) + Object initExtraSchemas() { + getConfig().initExtraSchemas(); + return null; + } + /** * Local spring doc parameter name discoverer local variable table parameter name discoverer. * @@ -371,7 +387,6 @@ SecurityService securityParser(PropertyResolverUtils propertyResolverUtils) { * Parameter builder generic parameter builder. * * @param propertyResolverUtils the property resolver utils - * @param optionalDelegatingMethodParameterCustomizers the optional list delegating method parameter customizer * @param optionalWebConversionServiceProvider the optional web conversion service provider * @param objectMapperProvider the object mapper provider * @param javadocProvider the javadoc provider @@ -381,9 +396,8 @@ SecurityService securityParser(PropertyResolverUtils propertyResolverUtils) { @ConditionalOnMissingBean @Lazy(false) GenericParameterService parameterBuilder(PropertyResolverUtils propertyResolverUtils, - Optional> optionalDelegatingMethodParameterCustomizers, Optional optionalWebConversionServiceProvider, ObjectMapperProvider objectMapperProvider, Optional javadocProvider) { - return new GenericParameterService(propertyResolverUtils, optionalDelegatingMethodParameterCustomizers, + return new GenericParameterService(propertyResolverUtils, optionalWebConversionServiceProvider, objectMapperProvider, javadocProvider); } @@ -441,6 +455,77 @@ ObjectMapperProvider springdocObjectMapperProvider(SpringDocConfigProperties spr return new ObjectMapperProvider(springDocConfigProperties); } + /** + * Spring doc customizers spring doc customizers. + * + * @param openApiCustomizers the open api customizers + * @param operationCustomizers the operation customizers + * @param routerOperationCustomizers the router operation customizers + * @param dataRestRouterOperationCustomizers the data rest router operation customizers + * @param methodFilters the method filters + * @param globalOpenApiCustomizers the global open api customizers + * @param globalOperationCustomizers the global operation customizers + * @param globalOpenApiMethodFilters the global open api method filters + * @return the spring doc customizers + */ + @Bean + @ConditionalOnMissingBean + @Lazy(false) + public SpringDocCustomizers springDocCustomizers(Optional> openApiCustomizers, + Optional> operationCustomizers, + Optional> routerOperationCustomizers, + Optional> dataRestRouterOperationCustomizers, + Optional> methodFilters, Optional> globalOpenApiCustomizers, + Optional> globalOperationCustomizers, + Optional> globalOpenApiMethodFilters, + Optional> optionalDelegatingMethodParameterCustomizers, + Optional> parameterCustomizers) { + return new SpringDocCustomizers(openApiCustomizers, + operationCustomizers, + routerOperationCustomizers, + dataRestRouterOperationCustomizers, + methodFilters, globalOpenApiCustomizers, globalOperationCustomizers, globalOpenApiMethodFilters, + optionalDelegatingMethodParameterCustomizers, parameterCustomizers); + } + + /** + * Parameter object naming strategy customizer delegating method parameter customizer. + * + * @return the delegating method parameter customizer + */ + @Bean + @ConditionalOnMissingBean + @Lazy(false) + ParameterObjectNamingStrategyCustomizer parameterObjectNamingStrategyCustomizer() { + return new ParameterObjectNamingStrategyCustomizer(); + } + + /** + * Global open api customizer global open api customizer. + * + * @return the global open api customizer + */ + @Bean + @ConditionalOnMissingBean(name = GLOBAL_OPEN_API_CUSTOMIZER) + @Lazy(false) + GlobalOpenApiCustomizer globalOpenApiCustomizer() { + return new OperationIdCustomizer(); + } + + /** + * Oas 31 model converter oas 31 model converter. + * + * @param springDocConfigProperties the spring doc config properties + * @return the oas 31 model converter + */ + @Bean + @ConditionalOnMissingBean + @ConditionalOnProperty(name = SPRINGDOC_EXPLICIT_OBJECT_SCHEMA, havingValue = "true") + @Lazy(false) + OAS31ModelConverter oas31ModelConverter(SpringDocConfigProperties springDocConfigProperties) { + return springDocConfigProperties.isOpenapi31() ? new OAS31ModelConverter() : null; + } + /** * The type Spring doc web mvc actuator configuration. * @@ -558,57 +643,6 @@ WebFluxSupportConverter webFluxSupportConverter(ObjectMapperProvider objectMappe } - /** - * The type Open api resource advice. - * - * @author bnasslashen - */ - @RestControllerAdvice - @Hidden - class OpenApiResourceAdvice { - /** - * Handle no handler found response entity. - * - * @param e the e - * @return the response entity - */ - @ExceptionHandler(OpenApiResourceNotFoundException.class) - @ResponseStatus(HttpStatus.NOT_FOUND) - public ResponseEntity handleNoHandlerFound(OpenApiResourceNotFoundException e) { - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorMessage(e.getMessage())); - } - } - - /** - * Spring doc customizers spring doc customizers. - * - * @param openApiCustomizers the open api customizers - * @param operationCustomizers the operation customizers - * @param routerOperationCustomizers the router operation customizers - * @param dataRestRouterOperationCustomizers the data rest router operation customizers - * @param methodFilters the method filters - * @param globalOpenApiCustomizers the global open api customizers - * @param globalOperationCustomizers the global operation customizers - * @param globalOpenApiMethodFilters the global open api method filters - * @return the spring doc customizers - */ - @Bean - @ConditionalOnMissingBean - @Lazy(false) - public SpringDocCustomizers springDocCustomizers(Optional> openApiCustomizers, - Optional> operationCustomizers, - Optional> routerOperationCustomizers, - Optional> dataRestRouterOperationCustomizers, - Optional> methodFilters, Optional> globalOpenApiCustomizers, - Optional> globalOperationCustomizers, - Optional> globalOpenApiMethodFilters) { - return new SpringDocCustomizers(openApiCustomizers, - operationCustomizers, - routerOperationCustomizers, - dataRestRouterOperationCustomizers, - methodFilters, globalOpenApiCustomizers, globalOperationCustomizers, globalOpenApiMethodFilters); - } - /** * The type Querydsl provider. * @@ -638,39 +672,49 @@ QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomize } /** - * Parameter object naming strategy customizer delegating method parameter customizer. + * The type Open api resource advice. * - * @return the delegating method parameter customizer + * @author bnasslashen */ - @Bean - @ConditionalOnMissingBean - @Lazy(false) - ParameterObjectNamingStrategyCustomizer parameterObjectNamingStrategyCustomizer() { - return new ParameterObjectNamingStrategyCustomizer(); + @RestControllerAdvice + @Hidden + class OpenApiResourceAdvice { + /** + * Handle no handler found response entity. + * + * @param e the e + * @return the response entity + */ + @ExceptionHandler(OpenApiResourceNotFoundException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ResponseEntity handleNoHandlerFound(OpenApiResourceNotFoundException e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorMessage(e.getMessage())); + } } /** - * Global open api customizer global open api customizer. + * Schema utils schema utils. * - * @return the global open api customizer + * @param springDocKotlinUtils the spring doc kotlin utils + * @return the schema utils */ @Bean - @ConditionalOnMissingBean(name = GLOBAL_OPEN_API_CUSTOMIZER) + @ConditionalOnMissingBean @Lazy(false) - GlobalOpenApiCustomizer globalOpenApiCustomizer() { - return new OperationIdCustomizer(); + SchemaUtils schemaUtils(Optional springDocKotlinUtils){ + return new SchemaUtils(springDocKotlinUtils); } /** - * Oas 31 model converter oas 31 model converter. + * Method parameter pojo extractor method parameter pojo extractor. * - * @param springDocConfigProperties the spring doc config properties - * @return the oas 31 model converter + * @param schemaUtils the schema utils + * @return the method parameter pojo extractor */ @Bean @ConditionalOnMissingBean @Lazy(false) - OAS31ModelConverter oas31ModelConverter(SpringDocConfigProperties springDocConfigProperties) { - return springDocConfigProperties.isOpenapi31() ? new OAS31ModelConverter() : null; + MethodParameterPojoExtractor methodParameterPojoExtractor(SchemaUtils schemaUtils){ + return new MethodParameterPojoExtractor(schemaUtils); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java index f7d17aefb..56442ba1e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -42,11 +42,9 @@ import org.springdoc.core.providers.ObjectMapperProvider; import org.springdoc.core.providers.SpringRepositoryRestResourceProvider; import org.springdoc.core.service.AbstractRequestService; -import org.springdoc.core.service.GenericParameterService; import org.springdoc.core.service.GenericResponseService; import org.springdoc.core.service.OpenAPIService; import org.springdoc.core.service.OperationService; -import org.springdoc.core.service.RequestBodyService; import org.springdoc.core.utils.SpringDocDataRestUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -128,8 +126,8 @@ static class SpringRepositoryRestResourceProviderConfiguration { @Bean @ConditionalOnMissingBean @Lazy(false) - SpringRepositoryRestResourceProvider springRepositoryRestResourceProvider(DataRestRouterOperationService dataRestRouterOperationService, - ObjectMapper mapper, + SpringRepositoryRestResourceProvider springRepositoryRestResourceProvider(DataRestRouterOperationService dataRestRouterOperationService, + ObjectMapper mapper, SpringDocDataRestUtils springDocDataRestUtils) { return new SpringRepositoryRestResourceProvider( dataRestRouterOperationService, mapper, springDocDataRestUtils); @@ -173,8 +171,6 @@ DataRestOperationService dataRestOperationBuilder(DataRestRequestService dataRes * Data rest request builder data rest request builder. * * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer - * @param parameterBuilder the parameter builder - * @param requestBodyService the request body builder * @param requestBuilder the request builder * @param springDocDataRestUtils the spring doc data rest utils * @return the data rest request builder @@ -182,10 +178,9 @@ DataRestOperationService dataRestOperationBuilder(DataRestRequestService dataRes @Bean @ConditionalOnMissingBean @Lazy(false) - DataRestRequestService dataRestRequestBuilder(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, GenericParameterService parameterBuilder, - RequestBodyService requestBodyService, AbstractRequestService requestBuilder, SpringDocDataRestUtils springDocDataRestUtils) { - return new DataRestRequestService(localSpringDocParameterNameDiscoverer, parameterBuilder, - requestBodyService, requestBuilder, springDocDataRestUtils); + DataRestRequestService dataRestRequestBuilder(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, + AbstractRequestService requestBuilder, SpringDocDataRestUtils springDocDataRestUtils) { + return new DataRestRequestService(localSpringDocParameterNameDiscoverer, requestBuilder, springDocDataRestUtils); } /** diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocFunctionCatalogConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocFunctionCatalogConfiguration.java index e50f4b00f..d15d8ab70 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocFunctionCatalogConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocFunctionCatalogConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocGroovyConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocGroovyConfiguration.java index a5d19c91b..589d5caca 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocGroovyConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocGroovyConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocHateoasConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocHateoasConfiguration.java index 17fb5c28a..3f93c82b6 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocHateoasConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocHateoasConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -122,8 +122,7 @@ GlobalOpenApiCustomizer linksSchemaCustomizer(HateoasHalProvider halProvider, Sp @ConditionalOnMissingBean @Lazy(false) HateoasLinksConverter hateoasLinksConverter(ObjectMapperProvider springDocObjectMapper) { - return new HateoasLinksConverter(springDocObjectMapper) ; + return new HateoasLinksConverter(springDocObjectMapper); } - - + } \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJacksonKotlinModuleConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJacksonKotlinModuleConfiguration.java index 5316593b0..51d54aecd 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJacksonKotlinModuleConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJacksonKotlinModuleConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -61,7 +61,7 @@ public class SpringDocJacksonKotlinModuleConfiguration { @Bean @Primary ObjectMapperProvider springdocKotlinObjectMapperProvider(SpringDocConfigProperties springDocConfigProperties) { - ObjectMapperProvider mapperProvider = new ObjectMapperProvider(springDocConfigProperties); + ObjectMapperProvider mapperProvider = new ObjectMapperProvider(springDocConfigProperties); mapperProvider.jsonMapper().registerModule(new KotlinModule.Builder().build()); return mapperProvider; } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJavadocConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJavadocConfiguration.java index 981878603..fd65c9982 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJavadocConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocJavadocConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinConfiguration.kt b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinConfiguration.kt index d11d0cb91..11812085b 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinConfiguration.kt +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinConfiguration.kt @@ -26,11 +26,11 @@ package org.springdoc.core.configuration -import io.swagger.v3.oas.annotations.Parameter +import org.springdoc.core.converters.KotlinInlineClassUnwrappingConverter import org.springdoc.core.customizers.KotlinDeprecatedPropertyCustomizer -import org.springdoc.core.customizers.ParameterCustomizer import org.springdoc.core.providers.ObjectMapperProvider import org.springdoc.core.utils.Constants +import org.springdoc.core.utils.SpringDocKotlinUtils import org.springdoc.core.utils.SpringDocUtils import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.autoconfigure.condition.ConditionalOnClass @@ -41,14 +41,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Lazy -import org.springframework.core.KotlinDetector -import org.springframework.core.MethodParameter -import org.springframework.core.annotation.AnnotatedElementUtils -import org.springframework.web.bind.annotation.RequestParam -import org.springframework.web.bind.annotation.ValueConstants import kotlin.coroutines.Continuation -import kotlin.reflect.KParameter -import kotlin.reflect.jvm.kotlinFunction /** * The type Spring doc kotlin configuration. @@ -74,60 +67,6 @@ class SpringDocKotlinConfiguration() { .addDeprecatedType(Deprecated::class.java) } - /** - * Kotlin springdoc-openapi ParameterCustomizer - * - * @return the nullable Kotlin Request Parameter Customizer - */ - @Bean - @Lazy(false) - @ConditionalOnProperty( - name = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED], - matchIfMissing = true - ) - @ConditionalOnMissingBean - fun nullableKotlinRequestParameterCustomizer(): ParameterCustomizer { - return ParameterCustomizer { parameterModel, methodParameter -> - if (parameterModel == null) return@ParameterCustomizer null - if (KotlinDetector.isKotlinReflectPresent() && KotlinDetector.isKotlinType(methodParameter.parameterType)) { - val kParameter = methodParameter.toKParameter() - if (kParameter != null) { - val parameterDoc = AnnotatedElementUtils.findMergedAnnotation( - AnnotatedElementUtils.forAnnotations(*methodParameter.parameterAnnotations), - Parameter::class.java - ) - val requestParam = AnnotatedElementUtils.findMergedAnnotation( - AnnotatedElementUtils.forAnnotations(*methodParameter.parameterAnnotations), - RequestParam::class.java - ) - // Swagger @Parameter annotation takes precedence - if (parameterDoc != null && parameterDoc.required) - parameterModel.required = parameterDoc.required - // parameter is not required if a default value is provided in @RequestParam - else if (requestParam != null && requestParam.defaultValue != ValueConstants.DEFAULT_NONE) - parameterModel.required = false - else{ - val isJavaNullableAnnotationPresent = methodParameter.parameterAnnotations.any { - it.annotationClass.qualifiedName == "jakarta.annotation.Nullable" - } - parameterModel.required = - kParameter.type.isMarkedNullable == false && !isJavaNullableAnnotationPresent - } - } - } - return@ParameterCustomizer parameterModel - } - } - - private fun MethodParameter.toKParameter(): KParameter? { - // ignore return type, see org.springframework.core.MethodParameter.getParameterIndex - if (parameterIndex == -1) return null - val kotlinFunction = method?.kotlinFunction ?: return null - // The first parameter of the kotlin function is the "this" reference and not needed here. - // See also kotlin.reflect.KCallable.getParameters - return kotlinFunction.parameters[parameterIndex + 1] - } - @ConditionalOnClass(name = ["kotlin.reflect.full.KClasses"]) class KotlinReflectDependingConfiguration { @@ -137,6 +76,22 @@ class SpringDocKotlinConfiguration() { fun kotlinDeprecatedPropertyCustomizer(objectMapperProvider: ObjectMapperProvider): KotlinDeprecatedPropertyCustomizer { return KotlinDeprecatedPropertyCustomizer(objectMapperProvider) } + + @Bean + @Lazy(false) + @ConditionalOnMissingBean + fun kotlinModelConverter(objectMapperProvider: ObjectMapperProvider): KotlinInlineClassUnwrappingConverter { + return KotlinInlineClassUnwrappingConverter(objectMapperProvider) + } + + @Bean + @ConditionalOnProperty( + name = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED], + matchIfMissing = true + ) + @Lazy(false) + fun springDocKotlinUtils(): SpringDocKotlinUtils = + SpringDocKotlinUtils() } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinxConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinxConfiguration.java index ca51110ad..f1b5706c6 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinxConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinxConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocPageableConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocPageableConfiguration.java index d77d5dbc0..57de3cd76 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocPageableConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocPageableConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -95,8 +95,8 @@ PageableOpenAPIConverter pageableOpenAPIConverter(ObjectMapperProvider objectMap PageOpenAPIConverter pageOpenAPIConverter(Optional settings, ObjectMapperProvider objectMapperProvider) { boolean replacePageWithPagedModel = settings.map(SpringDataWebSettings::pageSerializationMode) - .map(EnableSpringDataWebSupport.PageSerializationMode.VIA_DTO::equals) - .orElse(false); + .map(EnableSpringDataWebSupport.PageSerializationMode.VIA_DTO::equals) + .orElse(false); return new PageOpenAPIConverter(replacePageWithPagedModel, objectMapperProvider); } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocRequiredModule.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocRequiredModule.java index 1c2380106..b36a74a4f 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocRequiredModule.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocRequiredModule.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSealedClassModule.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSealedClassModule.java index d0b27ad81..aa459270e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSealedClassModule.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSealedClassModule.java @@ -26,10 +26,12 @@ import java.util.Arrays; import java.util.List; +import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.databind.introspect.Annotated; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.fasterxml.jackson.databind.module.SimpleModule; import io.swagger.v3.core.jackson.SwaggerAnnotationIntrospector; +import io.swagger.v3.oas.annotations.media.Schema; /** * The type Spring doc sealed class module. @@ -52,10 +54,22 @@ private static class RespectSealedClassAnnotationIntrospector extends SwaggerAnn public List findSubtypes(Annotated annotated) { ArrayList subTypes = new ArrayList<>(); - if (annotated.getAnnotated() instanceof Class clazz + if (annotated.getAnnotated() instanceof Class clazz && clazz.isSealed() && !clazz.getPackage().getName().startsWith("java") ) { + + Schema schema = clazz.getAnnotation(Schema.class); + if (schema != null && schema.oneOf().length > 0) { + return new ArrayList<>(); + } + + JsonSubTypes jsonSubTypes = clazz.getAnnotation(JsonSubTypes.class); + if (jsonSubTypes != null && jsonSubTypes.value().length > 0) { + return new ArrayList<>(); + } + + Class[] permittedSubClasses = clazz.getPermittedSubclasses(); if (permittedSubClasses.length > 0) { Arrays.stream(permittedSubClasses).map(NamedType::new).forEach(subTypes::add); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityConfiguration.java index 051b2b20e..728c4dfa4 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -66,7 +66,10 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter; import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; +import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import org.springframework.security.web.util.matcher.RequestMatcher; +import org.springframework.web.util.pattern.PathPattern; import static org.springdoc.core.utils.Constants.SPRINGDOC_SHOW_LOGIN_ENDPOINT; import static org.springdoc.core.utils.Constants.SPRINGDOC_SHOW_OAUTH2_ENDPOINTS; @@ -155,8 +158,26 @@ OpenApiCustomizer springSecurityLoginEndpointCustomizer(ApplicationContext appli operation.addTagsItem("login-endpoint"); PathItem pathItem = new PathItem().post(operation); try { - AntPathRequestMatcher requestMatcher = (AntPathRequestMatcher)FieldUtils.readField(usernamePasswordAuthenticationFilter, "requiresAuthenticationRequestMatcher", true); - String loginPath = requestMatcher.getPattern(); + RequestMatcher requestMatcher = (RequestMatcher) FieldUtils.readField( + usernamePasswordAuthenticationFilter, + "requiresAuthenticationRequestMatcher", + true + ); + + String loginPath = null; + + if (requestMatcher instanceof AntPathRequestMatcher) { + loginPath = ((AntPathRequestMatcher) requestMatcher).getPattern(); + } + else if (requestMatcher instanceof PathPatternRequestMatcher) { + PathPattern pathPattern = (PathPattern) FieldUtils.readField( + requestMatcher, + "pattern", + true + ); + loginPath = pathPattern.getPatternString(); + } + openAPI.getPaths().addPathItem(loginPath, pathItem); } catch (IllegalAccessException | diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2Customizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2Customizer.java index 94b933eca..dfdfb4cd4 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2Customizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2Customizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -114,6 +114,21 @@ public class SpringDocSecurityOAuth2Customizer implements GlobalOpenApiCustomize */ private ApplicationContext applicationContext; + /** + * Build o auth 2 error. + * + * @param openAPI the open api + * @param apiResponses the api responses + * @param httpStatus the http status + * @param openapi31 the openapi 31 + */ + private static void buildOAuth2Error(OpenAPI openAPI, ApiResponses apiResponses, HttpStatus httpStatus, boolean openapi31) { + Schema oAuth2ErrorSchema = AnnotationsUtils.resolveSchemaFromType(OAuth2Error.class, openAPI.getComponents(), null, openapi31); + apiResponses.addApiResponse(String.valueOf(httpStatus.value()), new ApiResponse().description(httpStatus.getReasonPhrase()).content(new Content().addMediaType( + APPLICATION_JSON_VALUE, + new MediaType().schema(oAuth2ErrorSchema)))); + } + @Override public void customise(OpenAPI openAPI) { FilterChainProxy filterChainProxy = applicationContext.getBean(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME, FilterChainProxy.class); @@ -196,7 +211,7 @@ private void getOAuth2TokenIntrospectionEndpointFilter(OpenAPI openAPI, Security * @param openapi31 the openapi 31 */ private void getOAuth2AuthorizationServerMetadataEndpoint(OpenAPI openAPI, SecurityFilterChain securityFilterChain, boolean openapi31) { - ClassauthorizationServerMetadataEndpointClass = OAuth2AuthorizationServerMetadataEndpointFilter.class; + Class authorizationServerMetadataEndpointClass = OAuth2AuthorizationServerMetadataEndpointFilter.class; Object oAuth2EndpointFilter = new SpringDocSecurityOAuth2EndpointUtils(authorizationServerMetadataEndpointClass).findEndpoint(securityFilterChain); if (oAuth2EndpointFilter != null) { @@ -208,11 +223,11 @@ private void getOAuth2AuthorizationServerMetadataEndpoint(OpenAPI openAPI, Secur if (field != null) { ReflectionUtils.makeAccessible(field); String defaultOauth2MetadataUri = (String) ReflectionUtils.getField(field, null); - openAPI.getPaths().addPathItem(defaultOauth2MetadataUri , new PathItem().get(operation)); + openAPI.getPaths().addPathItem(defaultOauth2MetadataUri, new PathItem().get(operation)); operation = buildOperation(apiResponses); operation.addParametersItem(new PathParameter().name("subpath").schema(new StringSchema())); operation.summary("Valid when multiple issuers are allowed"); - openAPI.getPaths().addPathItem(defaultOauth2MetadataUri+"/{subpath}" , new PathItem().get(operation)); + openAPI.getPaths().addPathItem(defaultOauth2MetadataUri + "/{subpath}", new PathItem().get(operation)); } } } @@ -340,11 +355,11 @@ private void getOidcProviderConfigurationEndpoint(OpenAPI openAPI, SecurityFilte if (field != null) { ReflectionUtils.makeAccessible(field); String defaultOidcConfigUri = (String) ReflectionUtils.getField(field, null); - openAPI.getPaths().addPathItem(defaultOidcConfigUri , new PathItem().get(operation)); + openAPI.getPaths().addPathItem(defaultOidcConfigUri, new PathItem().get(operation)); operation = buildOperation(apiResponses); operation.addParametersItem(new PathParameter().name("subpath").schema(new StringSchema())); operation.summary("Valid when multiple issuers are allowed"); - openAPI.getPaths().addPathItem("/{subpath}"+defaultOidcConfigUri , new PathItem().get(operation)); + openAPI.getPaths().addPathItem("/{subpath}" + defaultOidcConfigUri, new PathItem().get(operation)); } } } @@ -382,7 +397,7 @@ private void getOidcClientRegistrationEndpoint(OpenAPI openAPI, SecurityFilterCh if (oAuth2EndpointFilter != null) { ApiResponses apiResponses = new ApiResponses(); - buildApiResponsesOnCreated(apiResponses, AnnotationsUtils.resolveSchemaFromType(SpringDocOidcClientRegistrationResponse.class, openAPI.getComponents(), null,openapi31 )); + buildApiResponsesOnCreated(apiResponses, AnnotationsUtils.resolveSchemaFromType(SpringDocOidcClientRegistrationResponse.class, openAPI.getComponents(), null, openapi31)); buildApiResponsesOnInternalServerError(apiResponses); buildApiResponsesOnBadRequest(apiResponses, openAPI, openapi31); buildOAuth2Error(openAPI, apiResponses, HttpStatus.UNAUTHORIZED, openapi31); @@ -468,21 +483,6 @@ private ApiResponses buildApiResponsesOnBadRequest(ApiResponses apiResponses, Op return apiResponses; } - /** - * Build o auth 2 error. - * - * @param openAPI the open api - * @param apiResponses the api responses - * @param httpStatus the http status - * @param openapi31 the openapi 31 - */ - private static void buildOAuth2Error(OpenAPI openAPI, ApiResponses apiResponses, HttpStatus httpStatus, boolean openapi31) { - Schema oAuth2ErrorSchema = AnnotationsUtils.resolveSchemaFromType(OAuth2Error.class, openAPI.getComponents(), null, openapi31); - apiResponses.addApiResponse(String.valueOf(httpStatus.value()), new ApiResponse().description(httpStatus.getReasonPhrase()).content(new Content().addMediaType( - APPLICATION_JSON_VALUE, - new MediaType().schema(oAuth2ErrorSchema)))); - } - /** * Build path. * diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2EndpointUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2EndpointUtils.java index 201db0de2..07fca30d4 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2EndpointUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSecurityOAuth2EndpointUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -60,10 +60,10 @@ public SpringDocSecurityOAuth2EndpointUtils(T oauth2EndpointFilter) { */ public Object findEndpoint(SecurityFilterChain filterChain) { Optional oAuth2EndpointFilterOptional = - filterChain.getFilters().stream() - .filter(((Class ) oauth2EndpointFilter)::isInstance) - .map(((Class ) oauth2EndpointFilter)::cast) - .findAny(); + filterChain.getFilters().stream() + .filter(((Class) oauth2EndpointFilter)::isInstance) + .map(((Class) oauth2EndpointFilter)::cast) + .findAny(); return oAuth2EndpointFilterOptional.orElse(null); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSortConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSortConfiguration.java index ff751eb5e..de665ed0c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSortConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSortConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSpecPropertiesConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSpecPropertiesConfiguration.java index 5e87fb67e..8893299ab 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSpecPropertiesConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocSpecPropertiesConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration; @@ -63,13 +63,13 @@ public class SpringDocSpecPropertiesConfiguration { * @return the springdoc customizer */ @Bean - @ConditionalOnMissingBean - @Lazy(false) + @ConditionalOnMissingBean + @Lazy(false) SpecPropertiesCustomizer specificationStringPropertiesCustomizer( - SpringDocConfigProperties springDocConfigProperties - ) { - return new SpecPropertiesCustomizer(springDocConfigProperties); - } + SpringDocConfigProperties springDocConfigProperties + ) { + return new SpecPropertiesCustomizer(springDocConfigProperties); + } /** * Bean post processor that applies the specification string properties customization to @@ -79,19 +79,19 @@ SpecPropertiesCustomizer specificationStringPropertiesCustomizer( * @return the bean post processor */ @Bean - @ConditionalOnMissingBean - @Lazy(false) - SpecificationStringPropertiesCustomizerBeanPostProcessor specificationStringPropertiesCustomizerBeanPostProcessor( + @ConditionalOnMissingBean + @Lazy(false) + SpecificationStringPropertiesCustomizerBeanPostProcessor specificationStringPropertiesCustomizerBeanPostProcessor( SpringDocConfigProperties springDocConfigProperties - ) { - return new SpecificationStringPropertiesCustomizerBeanPostProcessor(springDocConfigProperties); - } + ) { + return new SpecificationStringPropertiesCustomizerBeanPostProcessor(springDocConfigProperties); + } /** * The type Specification string properties customizer bean post processor. */ - private static class SpecificationStringPropertiesCustomizerBeanPostProcessor implements BeanPostProcessor { + public static class SpecificationStringPropertiesCustomizerBeanPostProcessor implements BeanPostProcessor { /** * The Spring doc config properties. @@ -105,25 +105,24 @@ private static class SpecificationStringPropertiesCustomizerBeanPostProcessor im */ public SpecificationStringPropertiesCustomizerBeanPostProcessor( SpringDocConfigProperties springDocConfigProperties - ) { - this.springDocConfigProperties = springDocConfigProperties; - } + ) { + this.springDocConfigProperties = springDocConfigProperties; + } - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) { - if (bean instanceof GroupedOpenApi groupedOpenApi) { - Set groupConfigs = springDocConfigProperties.getGroupConfigs(); + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) { + if (bean instanceof GroupedOpenApi groupedOpenApi) { + Set groupConfigs = springDocConfigProperties.getGroupConfigs(); for (GroupConfig groupConfig : groupConfigs) { - if(groupConfig.getGroup().equals(groupedOpenApi.getGroup())) { + if (groupConfig.getGroup().equals(groupedOpenApi.getGroup())) { groupedOpenApi.addAllOpenApiCustomizer(List.of(new SpecPropertiesCustomizer( groupConfig.getOpenApi() ))); } } - } - return bean; - } - } - + } + return bean; + } + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocDataRestHints.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocDataRestHints.java index 27538ccaf..1730031e6 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocDataRestHints.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocDataRestHints.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.hints; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocHints.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocHints.java index dad4e1b11..55eb0e7d8 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocHints.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocHints.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.hints; @@ -196,7 +196,9 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) { MemberCategory.INVOKE_DECLARED_METHODS)) .registerType(java.lang.ModuleLayer.class, MemberCategory.INVOKE_DECLARED_METHODS) .registerType(java.lang.module.Configuration.class, MemberCategory.INVOKE_DECLARED_METHODS) - .registerType(java.lang.module.ResolvedModule.class, MemberCategory.INVOKE_DECLARED_METHODS); + .registerType(java.lang.module.ResolvedModule.class, MemberCategory.INVOKE_DECLARED_METHODS) + .registerType(java.lang.invoke.MethodHandles.class, MemberCategory.DECLARED_CLASSES) + .registerType(java.lang.invoke.MethodHandles.Lookup.class); //swagger-models Arrays.stream(typesToRegister).forEach(aClass -> hints.reflection().registerType(aClass, diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocSecurityHints.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocSecurityHints.java index 0af857d8e..cb3209c59 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocSecurityHints.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/hints/SpringDocSecurityHints.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.hints; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2AuthorizationServerMetadata.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2AuthorizationServerMetadata.java index 6ffccf630..d3948bcef 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2AuthorizationServerMetadata.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2AuthorizationServerMetadata.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.oauth2; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2Token.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2Token.java index 31667ef27..cdbee67f7 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2Token.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2Token.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.oauth2; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2TokenIntrospection.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2TokenIntrospection.java index cc127ce55..b9a77823a 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2TokenIntrospection.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOAuth2TokenIntrospection.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.oauth2; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationRequest.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationRequest.java index 1894545e8..4f5f3f774 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationRequest.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationRequest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.oauth2; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java index 365f08a2c..8b404b9ce 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcClientRegistrationResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.oauth2; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcProviderConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcProviderConfiguration.java index 55d9d7313..62c4c607b 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcProviderConfiguration.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/oauth2/SpringDocOidcProviderConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configuration.oauth2; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocActuatorBeanFactoryConfigurer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocActuatorBeanFactoryConfigurer.java index 1adedafcd..bf09cdd8c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocActuatorBeanFactoryConfigurer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocActuatorBeanFactoryConfigurer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configurer; @@ -73,12 +73,12 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) .bind(MANAGEMENT_ENDPOINTS_WEB, WebEndpointProperties.class); final BindResult springDocConfigPropertiesBindResult = Binder.get(environment) .bind(SPRINGDOC_PREFIX, SpringDocConfigProperties.class); - + if (result.isBound() && springDocConfigPropertiesBindResult.isBound()) { WebEndpointProperties webEndpointProperties = result.get(); SpringDocConfigProperties springDocConfigProperties = springDocConfigPropertiesBindResult.get(); List newGroups = new ArrayList<>(); - + ActuatorOperationCustomizer actuatorCustomizer = new ActuatorOperationCustomizer(springDocConfigProperties); beanFactory.registerSingleton("actuatorCustomizer", actuatorCustomizer); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocBeanFactoryConfigurer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocBeanFactoryConfigurer.java index 816f407fb..86746bf48 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocBeanFactoryConfigurer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configurer/SpringdocBeanFactoryConfigurer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.configurer; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/AdditionalModelsConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/AdditionalModelsConverter.java index 7c7a34f6d..c2b47676c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/AdditionalModelsConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/AdditionalModelsConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; @@ -30,7 +30,6 @@ import java.util.Iterator; import java.util.Map; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JavaType; import io.swagger.v3.core.converter.AnnotatedType; @@ -41,6 +40,7 @@ import org.slf4j.LoggerFactory; import org.springdoc.core.providers.ObjectMapperProvider; +import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson; import static org.springdoc.core.utils.SpringDocUtils.handleSchemaTypes; /** @@ -133,36 +133,6 @@ public static void disableReplacement(Class clazz) { modelToClassMap.remove(clazz); } - /** - * Resolve schema. - * - * @param type the type - * @param context the context - * @param chain the chain - * @return the schema - */ - @Override - public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterator chain) { - JavaType javaType = springDocObjectMapper.jsonMapper().constructType(type.getType()); - if (javaType != null) { - Class cls = javaType.getRawClass(); - if (modelToSchemaMap.containsKey(cls)) - try { - Schema schema = modelToSchemaMap.get(cls); - if(springDocObjectMapper.isOpenapi31()) - handleSchemaTypes(schema); - return springDocObjectMapper.jsonMapper() - .readValue(springDocObjectMapper.jsonMapper().writeValueAsString(schema), new TypeReference() {}); - } - catch (JsonProcessingException e) { - LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage()); - } - if (modelToClassMap.containsKey(cls)) - type = new AnnotatedType(modelToClassMap.get(cls)).resolveAsRef(true); - } - return (chain.hasNext()) ? chain.next().resolve(type, context, chain) : null; - } - /** * Remove from schema map. * @@ -180,4 +150,29 @@ public static void removeFromSchemaMap(Class clazz) { public static void removeFromClassMap(Class clazz) { modelToClassMap.remove(clazz); } + + /** + * Resolve schema. + * + * @param type the type + * @param context the context + * @param chain the chain + * @return the schema + */ + @Override + public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterator chain) { + JavaType javaType = springDocObjectMapper.jsonMapper().constructType(type.getType()); + if (javaType != null) { + Class cls = javaType.getRawClass(); + if (modelToSchemaMap.containsKey(cls)) { + Schema schema = modelToSchemaMap.get(cls); + if (springDocObjectMapper.isOpenapi31()) + handleSchemaTypes(schema); + return cloneViaJson(schema, new TypeReference() {}, springDocObjectMapper.jsonMapper()); + } + if (modelToClassMap.containsKey(cls)) + type = new AnnotatedType(modelToClassMap.get(cls)).resolveAsRef(true); + } + return (chain.hasNext()) ? chain.next().resolve(type, context, chain) : null; + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/CollectionModelContentConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/CollectionModelContentConverter.java index 08e8e6e52..e630c06f0 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/CollectionModelContentConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/CollectionModelContentConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ConverterUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ConverterUtils.java index b49a02e82..e52b7ec6c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ConverterUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ConverterUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/FileSupportConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/FileSupportConverter.java index 547fd4c17..f112db10a 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/FileSupportConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/FileSupportConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/HateoasLinksConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/HateoasLinksConverter.java index bcde9140c..36b69f9af 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/HateoasLinksConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/HateoasLinksConverter.java @@ -77,7 +77,7 @@ public Schema resolve( .filter(ref -> ref.startsWith(Components.COMPONENTS_SCHEMAS_REF)) .map(ref -> ref.substring(Components.COMPONENTS_SCHEMAS_REF.length())) .orElse(schema.getName()); - if(schemaName != null) { + if (schemaName != null) { Schema original = context.getDefinedModels().get(schemaName); if (original == null || original.getProperties() == null) { return schema; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/JavaTypeToIgnoreConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/JavaTypeToIgnoreConverter.java index a8457b378..482128e9a 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/JavaTypeToIgnoreConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/JavaTypeToIgnoreConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/KotlinInlineClassUnwrappingConverter.kt b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/KotlinInlineClassUnwrappingConverter.kt new file mode 100644 index 000000000..0bc789851 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/KotlinInlineClassUnwrappingConverter.kt @@ -0,0 +1,44 @@ +package org.springdoc.core.converters + +import com.fasterxml.jackson.databind.JavaType +import io.swagger.v3.core.converter.AnnotatedType +import io.swagger.v3.core.converter.ModelConverter +import io.swagger.v3.core.converter.ModelConverterContext +import io.swagger.v3.oas.models.media.Schema +import org.springdoc.core.providers.ObjectMapperProvider +import kotlin.reflect.full.findAnnotation +import kotlin.reflect.full.primaryConstructor +import kotlin.reflect.jvm.jvmErasure + +class KotlinInlineClassUnwrappingConverter( + private val objectMapperProvider: ObjectMapperProvider +) : ModelConverter { + + override fun resolve( + type: AnnotatedType?, + context: ModelConverterContext?, + chain: Iterator + ): Schema<*>? { + if (type?.type == null || context == null || !chain.hasNext()) { + return null + } + val javaType: JavaType = + objectMapperProvider.jsonMapper().constructType(type.type) + val kClass = javaType.rawClass.kotlin + if (kClass.findAnnotation() != null) { + val constructor = kClass.primaryConstructor + val param = constructor?.parameters?.firstOrNull() + val unwrappedClass = param?.type?.jvmErasure?.java + if (unwrappedClass != null) { + val unwrappedType = AnnotatedType() + .type(unwrappedClass) + .ctxAnnotations(type.ctxAnnotations) + .jsonViewAnnotation(type.jsonViewAnnotation) + .resolveAsRef(false) + + return chain.next().resolve(unwrappedType, context, chain) + } + } + return chain.next().resolve(type, context, chain) + } +} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ModelConverterRegistrar.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ModelConverterRegistrar.java index 8a363c93b..5b7d279c6 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ModelConverterRegistrar.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ModelConverterRegistrar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; @@ -44,14 +44,14 @@ public class ModelConverterRegistrar { /** - * The constant modelConvertersInstance. + * The constant LOGGER. */ - private final ModelConverters modelConvertersInstance; + private static final Logger LOGGER = LoggerFactory.getLogger(ModelConverterRegistrar.class); /** - * The constant LOGGER. + * The constant modelConvertersInstance. */ - private static final Logger LOGGER = LoggerFactory.getLogger(ModelConverterRegistrar.class); + private final ModelConverters modelConvertersInstance; /** * Instantiates a new Model converter registrar. @@ -99,6 +99,6 @@ private boolean isSameConverter(ModelConverter modelConverter1, ModelConverter m // comparing by the converter type Class modelConverter1Class = modelConverter1.getClass(); Class modelConverter2Class = modelConverter2.getClass(); - return modelConverter1Class.equals(modelConverter2Class); + return modelConverter1Class.getName().equals(modelConverter2Class.getName()); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageOpenAPIConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageOpenAPIConverter.java index 34e7e7f3a..9d517981e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageOpenAPIConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageOpenAPIConverter.java @@ -21,12 +21,11 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Iterator; @@ -82,9 +81,10 @@ public PageOpenAPIConverter(boolean replacePageWithPagedModel, ObjectMapperProvi /** * Resolve schema. - * @param type the type + * + * @param type the type * @param context the context - * @param chain the chain + * @param chain the chain * @return the schema */ @Override @@ -94,7 +94,7 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato Class cls = javaType.getRawClass(); if (replacePageWithPagedModel && PAGE_TO_REPLACE.equals(cls.getCanonicalName())) { if (!type.isSchemaProperty()) - type = resolvePagedModelType(type); + type = resolvePagedModelType(javaType); else type.name(getParentTypeName(type, cls)); } @@ -108,13 +108,12 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato * @param type the type * @return the annotated type */ - private AnnotatedType resolvePagedModelType(AnnotatedType type) { - Type pageType = type.getType(); - if (pageType instanceof ParameterizedType) { - Type argumentType = ((ParameterizedType) type.getType()).getActualTypeArguments()[0]; + private AnnotatedType resolvePagedModelType(JavaType type) { + if (type.hasGenericTypes()) { + JavaType innerType = type.containedType(0); Type pagedModelType = ResolvableType - .forClassWithGenerics(PagedModel.class, ResolvableType.forType(argumentType)) - .getType(); + .forClassWithGenerics(PagedModel.class, ResolvableType.forType(innerType)) + .getType(); return new AnnotatedType(pagedModelType).resolveAsRef(true); } else { diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageableOpenAPIConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageableOpenAPIConverter.java index 0bae9272a..567b9234e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageableOpenAPIConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageableOpenAPIConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; @@ -77,9 +77,9 @@ public PageableOpenAPIConverter(ObjectMapperProvider springDocObjectMapper) { /** * Resolve schema. * - * @param type the type + * @param type the type * @param context the context - * @param chain the chain + * @param chain the chain * @return the schema */ @Override diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PolymorphicModelConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PolymorphicModelConverter.java index 9a940d349..31ad67cd7 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PolymorphicModelConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PolymorphicModelConverter.java @@ -26,7 +26,7 @@ package org.springdoc.core.converters; -import java.lang.reflect.Field; +import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; @@ -34,10 +34,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition; import io.swagger.v3.core.converter.AnnotatedType; @@ -50,9 +50,11 @@ import io.swagger.v3.oas.models.media.ObjectSchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.reflect.FieldUtils; import org.springdoc.core.providers.ObjectMapperProvider; +import static java.util.function.Function.identity; +import static java.util.stream.Collectors.toMap; + /** * The type Polymorphic model converter. * @@ -60,11 +62,6 @@ */ public class PolymorphicModelConverter implements ModelConverter { - /** - * The Spring doc object mapper. - */ - private final ObjectMapperProvider springDocObjectMapper; - /** * The constant PARENT_TYPES_TO_IGNORE. */ @@ -81,6 +78,11 @@ public class PolymorphicModelConverter implements ModelConverter { PARENT_TYPES_TO_IGNORE.add("EntityModel"); } + /** + * The Spring doc object mapper. + */ + private final ObjectMapperProvider springDocObjectMapper; + /** * Instantiates a new Polymorphic model converter. * @@ -122,28 +124,20 @@ else if (resolvedSchema.getProperties().containsKey(javaType.getRawClass().getSi public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterator chain) { JavaType javaType = springDocObjectMapper.jsonMapper().constructType(type.getType()); if (javaType != null) { - BeanDescription javaTypeIntrospection = springDocObjectMapper.jsonMapper().getDeserializationConfig().introspect(javaType); - for (BeanPropertyDefinition property : javaTypeIntrospection.findProperties()) { - boolean isUnwrapped = (property.getField() != null && property.getField().hasAnnotation(JsonUnwrapped.class)) || - (property.getGetter() != null && property.getGetter().hasAnnotation(JsonUnwrapped.class)); - - if (isUnwrapped) { + for (BeanPropertyBiDefinition propertyDef : introspectBeanProperties(javaType)) { + if (propertyDef.isAnyAnnotated(JsonUnwrapped.class)) { if (!TypeNameResolver.std.getUseFqn()) PARENT_TYPES_TO_IGNORE.add(javaType.getRawClass().getSimpleName()); else PARENT_TYPES_TO_IGNORE.add(javaType.getRawClass().getName()); } else { - io.swagger.v3.oas.annotations.media.Schema declaredSchema = null; - if (property.getField() != null) { - declaredSchema = property.getField().getAnnotation(io.swagger.v3.oas.annotations.media.Schema.class); - } else if (property.getGetter() != null) { - declaredSchema = property.getGetter().getAnnotation(io.swagger.v3.oas.annotations.media.Schema.class); - } - + io.swagger.v3.oas.annotations.media.Schema declaredSchema = propertyDef.getAnyAnnotation(io.swagger.v3.oas.annotations.media.Schema.class); if (declaredSchema != null && - (ArrayUtils.isNotEmpty(declaredSchema.oneOf()) || ArrayUtils.isNotEmpty(declaredSchema.allOf()))) { - TYPES_TO_SKIP.add(property.getPrimaryType().getRawClass().getSimpleName()); + (ArrayUtils.isNotEmpty(declaredSchema.oneOf()) || ArrayUtils.isNotEmpty(declaredSchema.allOf())) && + propertyDef.getPrimaryType() != null && + propertyDef.getPrimaryType().getRawClass() != null) { + TYPES_TO_SKIP.add(propertyDef.getPrimaryType().getRawClass().getSimpleName()); } } } @@ -227,4 +221,99 @@ private boolean isConcreteClass(AnnotatedType type) { Class clazz = javaType.getRawClass(); return !Modifier.isAbstract(clazz.getModifiers()) && !clazz.isInterface(); } + + /** + * Introspects the properties of the given Java type based on serialization and deserialization configurations. + * This method identifies properties present in both JSON serialization and deserialization views, + * and pairs them into a list of {@code BeanPropertyBiDefinition}. + */ + private List introspectBeanProperties(JavaType javaType) { + Map forSerializationProps = + springDocObjectMapper.jsonMapper() + .getSerializationConfig() + .introspect(javaType) + .findProperties() + .stream() + .collect(toMap(BeanPropertyDefinition::getName, identity())); + Map forDeserializationProps = + springDocObjectMapper.jsonMapper() + .getDeserializationConfig() + .introspect(javaType) + .findProperties() + .stream() + .collect(toMap(BeanPropertyDefinition::getName, identity())); + + return forSerializationProps.keySet().stream() + .map(key -> new BeanPropertyBiDefinition(forSerializationProps.get(key), forDeserializationProps.get(key))) + .toList(); + } + + /** + * A record representing the bi-definition of a bean property, combining both + * serialization and deserialization property views. + */ + private record BeanPropertyBiDefinition( + BeanPropertyDefinition forSerialization, + BeanPropertyDefinition forDeserialization + ) { + + /** + * Retrieves an annotation of the specified type from either the serialization or + * deserialization property definition (field, getter, setter), returning the first available match. + */ + public A getAnyAnnotation(Class acls) { + A anyForSerializationAnnotation = getAnyAnnotation(forSerialization, acls); + A anyForDeserializationAnnotation = getAnyAnnotation(forDeserialization, acls); + + return anyForSerializationAnnotation != null ? anyForSerializationAnnotation : anyForDeserializationAnnotation; + } + + /** + * Checks if any annotation of the specified type exists across serialization + * or deserialization property definitions. + */ + public boolean isAnyAnnotated(Class acls) { + return getAnyAnnotation(acls) != null; + } + + /** + * Type determined from the primary member for the property being built. + */ + public JavaType getPrimaryType() { + JavaType forSerializationType = null; + if (forSerialization != null) { + forSerializationType = forSerialization.getPrimaryType(); + } + + JavaType forDeserializationType = null; + if (forDeserialization != null) { + forDeserializationType = forDeserialization.getPrimaryType(); + } + + if (forSerializationType != null && forDeserializationType != null && forSerializationType != forDeserializationType) { + throw new IllegalStateException("The property " + forSerialization.getName() + " has different types for serialization and deserialization: " + + forSerializationType + " and " + forDeserializationType); + } + + return forSerializationType != null ? forSerializationType : forDeserializationType; + } + + private A getAnyAnnotation(BeanPropertyDefinition prop, Class acls) { + if (prop == null) { + return null; + } + + if (prop.getField() != null) { + return prop.getField().getAnnotation(acls); + } + if (prop.getGetter() != null) { + return prop.getGetter().getAnnotation(acls); + } + if (prop.getSetter() != null) { + return prop.getSetter().getAnnotation(acls); + } + + return null; + } + } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PropertyCustomizingConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PropertyCustomizingConverter.java index 85fb1e30c..f667ea278 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PropertyCustomizingConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PropertyCustomizingConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ResponseSupportConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ResponseSupportConverter.java index 118152a3c..fa8539f02 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ResponseSupportConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ResponseSupportConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; @@ -33,6 +33,7 @@ import io.swagger.v3.core.converter.AnnotatedType; import io.swagger.v3.core.converter.ModelConverter; import io.swagger.v3.core.converter.ModelConverterContext; +import io.swagger.v3.oas.models.media.ObjectSchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; import org.springdoc.core.providers.ObjectMapperProvider; @@ -73,6 +74,8 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato JavaType innerType = findResponseEntity(javaType).containedType(0); if (innerType == null) return new StringSchema(); + if (Object.class.equals(innerType.getRawClass())) + return new ObjectSchema(); return context.resolve(new AnnotatedType(innerType) .jsonViewAnnotation(type.getJsonViewAnnotation()) .ctxAnnotations((type.getCtxAnnotations())) @@ -90,8 +93,8 @@ else if (isResponseTypeToIgnore(cls)) * @param javaType the java type * @return the java type */ - private JavaType findResponseEntity(JavaType javaType){ - if(ResponseEntity.class.isAssignableFrom(javaType.getRawClass())){ + private JavaType findResponseEntity(JavaType javaType) { + if (ResponseEntity.class.isAssignableFrom(javaType.getRawClass())) { while (ResponseEntity.class != javaType.getRawClass()) javaType = javaType.getSuperClass(); } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SchemaPropertyDeprecatingConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SchemaPropertyDeprecatingConverter.java index 06340b00a..e31802ba5 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SchemaPropertyDeprecatingConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SchemaPropertyDeprecatingConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SortOpenAPIConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SortOpenAPIConverter.java index 3b2b77929..886344982 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SortOpenAPIConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SortOpenAPIConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; @@ -72,9 +72,9 @@ public SortOpenAPIConverter(ObjectMapperProvider springDocObjectMapper) { /** * Resolve schema. * - * @param type the type + * @param type the type * @param context the context - * @param chain the chain + * @param chain the chain * @return the schema */ @Override diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/WebFluxSupportConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/WebFluxSupportConverter.java index 62f04c19e..f948566da 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/WebFluxSupportConverter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/WebFluxSupportConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/DefaultPageable.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/DefaultPageable.java index 2d0afe986..121ae4a86 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/DefaultPageable.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/DefaultPageable.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/MonetaryAmount.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/MonetaryAmount.java index a37c4c33c..da3a1108e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/MonetaryAmount.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/MonetaryAmount.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Pageable.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Pageable.java index b469e88a3..a3bb4c62c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Pageable.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Pageable.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/PageableAsQueryParam.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/PageableAsQueryParam.java index 6bad26ab1..413266004 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/PageableAsQueryParam.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/PageableAsQueryParam.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Sort.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Sort.java index 15055afc8..a37c5a7a7 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Sort.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/Sort.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortAsQueryParam.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortAsQueryParam.java index 56e3b62bd..ea7cca1b2 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortAsQueryParam.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortAsQueryParam.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters.models; @@ -44,9 +44,9 @@ @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) @Parameter(in = ParameterIn.QUERY - , description = "Sorting criteria in the format: property,(asc|desc). " - + "Default sort order is ascending. " + "Multiple sort criteria are supported." - , name = "sort" - , array = @ArraySchema(schema = @Schema(type = "string")) + , description = "Sorting criteria in the format: property,(asc|desc). " + + "Default sort order is ascending. " + "Multiple sort criteria are supported." + , name = "sort" + , array = @ArraySchema(schema = @Schema(type = "string")) ) public @interface SortAsQueryParam {} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortObject.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortObject.java index f59d862eb..88b84bc34 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortObject.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/models/SortObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.converters.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOpenApiCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOpenApiCustomizer.java index 5810af1da..0dd4d6a92 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOpenApiCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOpenApiCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; @@ -89,16 +89,16 @@ private void handleActuatorOperationIdUniqueness(OpenAPI openApi) { Set usedOperationIds = new HashSet<>(); actuatorPathEntryStream(openApi, null) .sorted(Comparator.comparing(Entry::getKey)) - .forEachOrdered(stringPathItemEntry -> - stringPathItemEntry.getValue().readOperations().forEach(operation -> { - String initialOperationId = operation.getOperationId(); - String uniqueOperationId = operation.getOperationId(); - int counter = 1; - while (!usedOperationIds.add(uniqueOperationId)) { - uniqueOperationId = initialOperationId + "_" + ++counter; - } - operation.setOperationId(uniqueOperationId); - }) + .forEachOrdered(stringPathItemEntry -> + stringPathItemEntry.getValue().readOperations().forEach(operation -> { + String initialOperationId = operation.getOperationId(); + String uniqueOperationId = operation.getOperationId(); + int counter = 1; + while (!usedOperationIds.add(uniqueOperationId)) { + uniqueOperationId = initialOperationId + "_" + ++counter; + } + operation.setOperationId(uniqueOperationId); + }) ); } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOperationCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOperationCustomizer.java index df37c2b43..2730034a5 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOperationCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ActuatorOperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; @@ -31,6 +31,7 @@ import io.swagger.v3.core.util.AnnotationsUtils; import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Content; import io.swagger.v3.oas.models.media.MediaType; @@ -61,7 +62,7 @@ * * @author bnasslahsen */ -public class ActuatorOperationCustomizer implements GlobalOperationCustomizer { +public class ActuatorOperationCustomizer implements GlobalOperationComponentsCustomizer { /** * The constant OPERATION. @@ -94,11 +95,11 @@ public ActuatorOperationCustomizer(SpringDocConfigProperties springDocConfigProp } @Override - public Operation customize(Operation operation, HandlerMethod handlerMethod) { + public Operation customize(Operation operation, Components components, HandlerMethod handlerMethod) { if (operationHasValidTag(operation)) { - Field operationField = FieldUtils.getDeclaredField(handlerMethod.getBean().getClass(), OPERATION,true); + Field operationField = FieldUtils.getDeclaredField(handlerMethod.getBean().getClass(), OPERATION, true); if (operationField != null) { - processOperationField(handlerMethod, operation, operationField); + processOperationField(handlerMethod, operation, components, operationField); } setOperationSummary(operation, handlerMethod); } @@ -120,16 +121,17 @@ private boolean operationHasValidTag(Operation operation) { * * @param handlerMethod the handler method * @param operation the operation + * @param components the components * @param operationField the operation field */ - private void processOperationField(HandlerMethod handlerMethod, Operation operation, Field operationField) { + private void processOperationField(HandlerMethod handlerMethod, Operation operation, Components components, Field operationField) { try { Object actuatorOperation = operationField.get(handlerMethod.getBean()); Field actuatorOperationField = FieldUtils.getDeclaredField(actuatorOperation.getClass(), OPERATION, true); if (actuatorOperationField != null) { AbstractDiscoveredOperation discoveredOperation = (AbstractDiscoveredOperation) actuatorOperationField.get(actuatorOperation); - handleOperationMethod(discoveredOperation.getOperationMethod(), operation); + handleOperationMethod(discoveredOperation.getOperationMethod(), components, operation); } } catch (IllegalAccessException e) { @@ -141,25 +143,26 @@ private void processOperationField(HandlerMethod handlerMethod, Operation operat * Handle operation method. * * @param operationMethod the operation method + * @param components the components * @param operation the operation */ - private void handleOperationMethod(OperationMethod operationMethod, Operation operation) { + private void handleOperationMethod(OperationMethod operationMethod, Components components, Operation operation) { String operationId = operationMethod.getMethod().getName(); operation.setOperationId(operationId); switch (operationMethod.getOperationType()) { case READ: - addParameters(operationMethod, operation, ParameterIn.QUERY); + addParameters(operationMethod, operation, components, ParameterIn.QUERY); break; case WRITE: - addWriteParameters(operationMethod, operation); + addWriteParameters(operationMethod, components, operation); operation.setResponses(new ApiResponses() .addApiResponse(String.valueOf(HttpStatus.NO_CONTENT.value()), new ApiResponse().description(HttpStatus.NO_CONTENT.getReasonPhrase())) .addApiResponse(String.valueOf(HttpStatus.BAD_REQUEST.value()), new ApiResponse().description(HttpStatus.BAD_REQUEST.getReasonPhrase()))); break; case DELETE: operation.setResponses(new ApiResponses().addApiResponse(String.valueOf(HttpStatus.NO_CONTENT.value()), new ApiResponse().description(HttpStatus.NO_CONTENT.getReasonPhrase()))); - addParameters(operationMethod, operation, ParameterIn.QUERY); + addParameters(operationMethod, operation, components, ParameterIn.QUERY); break; default: break; @@ -171,13 +174,14 @@ private void handleOperationMethod(OperationMethod operationMethod, Operation op * * @param operationMethod the operation method * @param operation the operation + * @param components the components * @param parameterIn the parameter in */ - private void addParameters(OperationMethod operationMethod, Operation operation, ParameterIn parameterIn) { + private void addParameters(OperationMethod operationMethod, Operation operation, Components components, ParameterIn parameterIn) { for (OperationParameter operationParameter : operationMethod.getParameters()) { Parameter parameter = getParameterFromField(operationParameter); - if(parameter == null) continue; - Schema schema = resolveSchema(parameter); + if (parameter == null) continue; + Schema schema = resolveSchema(parameter, components); if (parameter.getAnnotation(Selector.class) != null) { operation.addParametersItem(new io.swagger.v3.oas.models.parameters.PathParameter() .name(parameter.getName()) @@ -197,13 +201,14 @@ else if (isValidParameterType(parameter)) { * Add write parameters. * * @param operationMethod the operation method + * @param components the components * @param operation the operation */ - private void addWriteParameters(OperationMethod operationMethod, Operation operation) { + private void addWriteParameters(OperationMethod operationMethod, Components components, Operation operation) { for (OperationParameter operationParameter : operationMethod.getParameters()) { Parameter parameter = getParameterFromField(operationParameter); - if(parameter == null) continue; - Schema schema = resolveSchema(parameter); + if (parameter == null) continue; + Schema schema = resolveSchema(parameter, components); if (parameter.getAnnotation(Selector.class) != null) { operation.addParametersItem(new io.swagger.v3.oas.models.parameters.PathParameter() .name(parameter.getName()) @@ -237,12 +242,13 @@ private Parameter getParameterFromField(OperationParameter operationParameter) { /** * Resolve schema schema. * - * @param parameter the parameter + * @param parameter the parameter + * @param components * @return the schema */ - private Schema resolveSchema(Parameter parameter) { - Schema schema = AnnotationsUtils.resolveSchemaFromType(parameter.getType(), null, null, springDocConfigProperties.isOpenapi31()); - if(springDocConfigProperties.isOpenapi31()) handleSchemaTypes(schema); + private Schema resolveSchema(Parameter parameter, Components components) { + Schema schema = AnnotationsUtils.resolveSchemaFromType(parameter.getType(), components, null, springDocConfigProperties.isOpenapi31()); + if (springDocConfigProperties.isOpenapi31()) handleSchemaTypes(schema); return schema; } @@ -271,4 +277,8 @@ private void setOperationSummary(Operation operation, HandlerMethod handlerMetho } } + @Override + public Operation customize(Operation operation, HandlerMethod handlerMethod) { + return this.customize(operation, null, handlerMethod); + } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java index 1db18a182..d4aa5dbd7 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; @@ -65,8 +65,8 @@ /** * The type Data rest delegating method parameter customizer. * - * @author bnasslahsen - * @author pheyken + * @author bnasslahsen + * @author pheyken */ public class DataRestDelegatingMethodParameterCustomizer implements DelegatingMethodParameterCustomizer { @@ -192,13 +192,13 @@ public boolean allowReserved() { @Override public Schema schema() { return new Schema() { + private Schema parameterSchema = parameter.schema(); + @Override public SchemaResolution schemaResolution() { return parameterSchema.schemaResolution(); } - private Schema parameterSchema = parameter.schema(); - @Override public Class annotationType() { return parameterSchema.annotationType(); @@ -449,6 +449,11 @@ public Class contains() { return parameterSchema.$dynamicAnchor(); } + @Override + public String $dynamicRef() { + return parameterSchema.$dynamicRef(); + } + @Override public String contentEncoding() { return parameterSchema.contentEncoding(); @@ -836,6 +841,11 @@ public Class contains() { return schema.$dynamicAnchor(); } + @Override + public String $dynamicRef() { + return schema.$dynamicRef(); + } + @Override public String contentEncoding() { return schema.contentEncoding(); @@ -1029,6 +1039,11 @@ public Extension[] extensions() { public String ref() { return parameter.ref(); } + + @Override + public Class[] validationGroups() { + return new Class[0]; + } }; return Optional.of(parameterNew); } @@ -1137,7 +1152,8 @@ else if (isSpringDataWebPropertiesPresent()) if (pageableDefault != null) { if (isSpringDataWebPropertiesPresent() && optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().isOneIndexedParameters()) { defaultValue = String.valueOf(pageableDefault.page() + 1); - } else { + } + else { defaultValue = String.valueOf(pageableDefault.page()); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestRouterOperationCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestRouterOperationCustomizer.java index a31015f4e..5bd102b10 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestRouterOperationCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestRouterOperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DelegatingMethodParameterCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DelegatingMethodParameterCustomizer.java index d6475c4c4..5d0546ba2 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DelegatingMethodParameterCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DelegatingMethodParameterCustomizer.java @@ -21,18 +21,34 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; +import java.util.List; + import org.springframework.core.MethodParameter; +import org.springframework.lang.Nullable; /** * The interface Delegating method parameter customizer. + * + * @author dyun */ @FunctionalInterface public interface DelegatingMethodParameterCustomizer { + /** + * Customize. + * tip: parameters include the parent fields, you can choose how to deal with the methodParameters + * + * @param originalParameter the original parameter + * @param methodParameters the exploded parameters + */ + @Nullable + default void customizeList(MethodParameter originalParameter, List methodParameters) { + methodParameters.forEach(parameter -> customize(originalParameter, parameter)); + } /** * Customize. diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOpenApiCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOpenApiCustomizer.java index a2a2fc631..f0338854c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOpenApiCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOpenApiCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOperationComponentsCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOperationComponentsCustomizer.java new file mode 100644 index 000000000..3e09a9e51 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOperationComponentsCustomizer.java @@ -0,0 +1,52 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.core.customizers; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.Operation; + +import org.springframework.web.method.HandlerMethod; + +/** + * Implement and register a bean of type {@link GlobalOperationComponentsCustomizer} to + * customize an operation based on the components and handler method input on default OpenAPI + * description and groups + * + * @author christophejan + * @see OperationCustomizer operations on default OpenAPI description but not groups + */ +public interface GlobalOperationComponentsCustomizer extends GlobalOperationCustomizer { + + /** + * Customize operation. + * + * @param operation input operation + * @param handlerMethod original handler method + * @return customized operation + */ + Operation customize(Operation operation, Components components, HandlerMethod handlerMethod); +} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOperationCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOperationCustomizer.java index 22dc998ec..0793af2df 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOperationCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/GlobalOperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/JavadocPropertyCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/JavadocPropertyCustomizer.java index db9cf5141..b18ed2fcd 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/JavadocPropertyCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/JavadocPropertyCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; @@ -109,7 +109,7 @@ else if (resolvedSchema != null && resolvedSchema.get$ref() != null && resolvedS try { Field processedTypesField = FieldUtils.getDeclaredField(ModelConverterContextImpl.class, "processedTypes", true); Set processedType = (Set) processedTypesField.get(context); - if(processedType.contains(type)) + if (processedType.contains(type)) setJavadocDescription(cls, fields, clsProperties, resolvedSchema, true); } catch (IllegalAccessException e) { @@ -163,7 +163,7 @@ public void setJavadocDescription(Class cls, List fields, List optionalPd = clsProperties.stream().filter(pd -> pd.getName().equals(stringSchemaEntry.getKey())).findAny(); optionalPd.ifPresent(pd1 -> { - if(pd1.getReadMethod() != null) { + if (pd1.getReadMethod() != null) { String fieldJavadoc = javadocProvider.getMethodJavadocDescription(pd1.getReadMethod()); if (StringUtils.isNotBlank(fieldJavadoc)) stringSchemaEntry.getValue().setDescription(fieldJavadoc); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiBuilderCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiBuilderCustomizer.java index 4631fbd0b..53a44967c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiBuilderCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiBuilderCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiCustomizer.java index f54d294c4..40f0be199 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiHateoasLinksCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiHateoasLinksCustomizer.java index c3cae9d1e..663d642e1 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiHateoasLinksCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiHateoasLinksCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiLocaleCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiLocaleCustomizer.java index af86fc0ea..fd2cfd089 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiLocaleCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OpenApiLocaleCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationCustomizer.java index 518802606..c52f16052 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationIdCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationIdCustomizer.java index dc718aa5e..0f4adebe5 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationIdCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/OperationIdCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; @@ -72,7 +72,7 @@ private void processOperation(Operation operation, Map operatio String originalOperationId = operation.getOperationId(); // Check if operationId already exists - if ( originalOperationId!=null && operationIdCount.containsKey(originalOperationId)) { + if (originalOperationId != null && operationIdCount.containsKey(originalOperationId)) { // Get the count for the current operationId and increment int count = operationIdCount.get(originalOperationId); count++; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterCustomizer.java index 084ae2cc6..96987bf6b 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterObjectNamingStrategyCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterObjectNamingStrategyCustomizer.java index 5a7875474..4cbefc3cb 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterObjectNamingStrategyCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ParameterObjectNamingStrategyCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/PropertyCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/PropertyCustomizer.java index 9f500c4d7..0b6228cb9 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/PropertyCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/PropertyCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/QuerydslPredicateOperationCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/QuerydslPredicateOperationCustomizer.java index 7f86ea597..e0c280d96 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/QuerydslPredicateOperationCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/QuerydslPredicateOperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; @@ -94,8 +94,8 @@ public class QuerydslPredicateOperationCustomizer implements GlobalOperationCust */ public QuerydslPredicateOperationCustomizer(QuerydslBindingsFactory querydslBindingsFactory, SpringDocConfigProperties springDocConfigProperties) { this.querydslBindingsFactory = querydslBindingsFactory; - this.springDocConfigProperties= springDocConfigProperties; - + this.springDocConfigProperties = springDocConfigProperties; + } @Override @@ -160,7 +160,8 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) { private boolean getFieldValueOfBoolean(QuerydslBindings instance, String fieldName) { try { return (boolean) FieldUtils.readDeclaredField(instance, fieldName, true); - } catch (IllegalAccessException e) { + } + catch (IllegalAccessException e) { LOGGER.warn(e.getMessage()); } return false; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/RouterOperationCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/RouterOperationCustomizer.java index 42b98a7f5..8c4790aa7 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/RouterOperationCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/RouterOperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ServerBaseUrlCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ServerBaseUrlCustomizer.java index 985a4ffba..4ebc95351 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ServerBaseUrlCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/ServerBaseUrlCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpecPropertiesCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpecPropertiesCustomizer.java index 98ed3883c..f79612e42 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpecPropertiesCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpecPropertiesCustomizer.java @@ -21,17 +21,19 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.Consumer; import java.util.function.Supplier; import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; @@ -89,6 +91,7 @@ * * @author Anton Tkachenko tkachenkoas@gmail.com * @author bnasslahsen + * @author Huijin Hong */ public class SpecPropertiesCustomizer implements GlobalOpenApiCustomizer { @@ -135,7 +138,7 @@ private void customizeOpenApi(OpenAPI openApi, OpenAPI openApiProperties) { Components componentsProperties = openApiProperties.getComponents(); if (componentsProperties != null) customizeComponents(openApi, componentsProperties); - + Paths pathsProperties = openApiProperties.getPaths(); if (pathsProperties != null) customizePaths(openApi, pathsProperties); @@ -144,13 +147,37 @@ private void customizeOpenApi(OpenAPI openApi, OpenAPI openApiProperties) { if (!CollectionUtils.isEmpty(securityRequirementsProperties)) { customizeSecurity(openApi, securityRequirementsProperties); } + if (!CollectionUtils.isEmpty(openApiProperties.getServers())) { + openApi.setServers(new ArrayList<>(openApiProperties.getServers())); + } + + ExternalDocumentation externalDocumentationProperties = openApiProperties.getExternalDocs(); + if (externalDocumentationProperties != null) { + customizeExternalDocs(openApi, externalDocumentationProperties); + } + } + } + + /** + * Customized external docs. + * + * @param openApi the open api + * @param externalDocumentationProperties the external documentation + */ + private void customizeExternalDocs(OpenAPI openApi, ExternalDocumentation externalDocumentationProperties) { + ExternalDocumentation externalDocumentation = openApi.getExternalDocs(); + if (externalDocumentation != null) { + resolveString(externalDocumentation::description, externalDocumentationProperties::getDescription); + resolveString(externalDocumentation::url, externalDocumentationProperties::getUrl); + } else { + openApi.setExternalDocs(externalDocumentationProperties); } } /** * Customize security. * - * @param openApi the open api + * @param openApi the open api * @param securityRequirementsProperties the security requirements */ private void customizeSecurity(OpenAPI openApi, List securityRequirementsProperties) { @@ -188,8 +215,8 @@ private void customizePaths(OpenAPI openApi, Paths pathsProperties) { resolveString(pathItem::description, pathItemProperties::getDescription); resolveString(pathItem::summary, pathItemProperties::getSummary); - Map operationMap = pathItem.readOperationsMap(); - Map operationMapProperties = pathItemProperties.readOperationsMap(); + Map operationMap = pathItem.readOperationsMap(); + Map operationMapProperties = pathItemProperties.readOperationsMap(); operationMapProperties.forEach((httpMethod, operationProperties) -> { Operation operationToCustomize = operationMap.get(httpMethod); @@ -199,7 +226,8 @@ private void customizePaths(OpenAPI openApi, Paths pathsProperties) { resolveSet(operationToCustomize::tags, operationProperties::getTags); } }); - }}); + } + }); } } @@ -217,25 +245,25 @@ private void customizeComponents(OpenAPI openApi, Components componentsPropertie else { Map schemaMap = components.getSchemas(); schemaMap.forEach((key, schema) -> { - Schema schemaProperties = componentsProperties.getSchemas().get(key); - if (schemaProperties != null) { - resolveString(schema::setDescription, schemaProperties::getDescription); - Map properties = schema.getProperties(); - if (CollectionUtils.isEmpty(properties)) { - return; - } - properties.forEach((propKey, propSchema) -> { - Schema propSchemaProperties = (Schema) schemaProperties.getProperties().get(propKey); - if (propSchemaProperties != null) { - resolveString(propSchema::description, propSchemaProperties::getDescription); - resolveString(propSchema::title, propSchemaProperties::getTitle); - resolveString(propSchema::example, propSchemaProperties::getExample); + if (!CollectionUtils.isEmpty(componentsProperties.getSchemas())) { + Schema schemaProperties = componentsProperties.getSchemas().get(key); + if (schemaProperties != null) { + resolveString(schema::setDescription, schemaProperties::getDescription); + Map properties = schema.getProperties(); + if (CollectionUtils.isEmpty(properties)) { + return; } - }); + properties.forEach((propKey, propSchema) -> { + Schema propSchemaProperties = (Schema) schemaProperties.getProperties().get(propKey); + if (propSchemaProperties != null) { + resolveString(propSchema::description, propSchemaProperties::getDescription); + resolveString(propSchema::title, propSchemaProperties::getTitle); + resolveString(propSchema::example, propSchemaProperties::getExample); + } + }); + } } }); - - Map securitySchemeMap = components.getSecuritySchemes(); if (CollectionUtils.isEmpty(securitySchemeMap)) { components.setSecuritySchemes(componentsProperties.getSecuritySchemes()); @@ -319,7 +347,7 @@ private void resolveString(Consumer setter, Supplier getter) { */ private void resolveType(Consumer setter, Supplier getter) { Type value = (Type) getter.get(); - if (value!=null) { + if (value != null) { setter.accept(value); } } @@ -332,7 +360,7 @@ private void resolveType(Consumer setter, Supplier getter) { */ private void resolveIn(Consumer setter, Supplier getter) { In value = (In) getter.get(); - if (value!=null) { + if (value != null) { setter.accept(value); } } @@ -345,12 +373,12 @@ private void resolveIn(Consumer setter, Supplier getter) { */ private void resolveOAuthFlows(Consumer setter, Supplier getter) { OAuthFlows value = (OAuthFlows) getter.get(); - if (value!=null) { + if (value != null) { setter.accept(value); } } - + /** * Resolve set. * @@ -358,11 +386,10 @@ private void resolveOAuthFlows(Consumer setter, Supplier get * @param getter the getter */ private void resolveSet(Consumer setter, Supplier getter) { - List value = getter.get(); + List value = getter.get(); if (!CollectionUtils.isEmpty(value)) { setter.accept(value); } } - } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpringDocCustomizers.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpringDocCustomizers.java index 8acc651c7..8dd56a7fb 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpringDocCustomizers.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/SpringDocCustomizers.java @@ -21,10 +21,11 @@ * * * * * * * * * - * + * */ package org.springdoc.core.customizers; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -70,14 +71,14 @@ public class SpringDocCustomizers implements ApplicationContextAware, Initializi private final Optional> dataRestRouterOperationCustomizers; /** - * The Context. + * The method filters to use. */ - private ApplicationContext context; + private final Optional> methodFilters; /** - * The method filters to use. + * The Context. */ - private final Optional> methodFilters; + private ApplicationContext context; /** * The Global open api customizers. @@ -94,7 +95,16 @@ public class SpringDocCustomizers implements ApplicationContextAware, Initializi */ private Optional> globalOpenApiMethodFilters; + /** + * The Optional delegating method parameter customizers. + */ + private final Optional> optionalDelegatingMethodParameterCustomizers; + /** + * The Parameter customizers. + */ + private final Optional> parameterCustomizers; + /** * Instantiates a new Spring doc customizers. * @@ -113,12 +123,14 @@ public SpringDocCustomizers(Optional> openApiCustomizers, Optional> dataRestRouterOperationCustomizers, Optional> methodFilters, Optional> globalOpenApiCustomizers, Optional> globalOperationCustomizers, - Optional> globalOpenApiMethodFilters) { + Optional> globalOpenApiMethodFilters, Optional> optionalDelegatingMethodParameterCustomizers, Optional> parameterCustomizers) { this.openApiCustomizers = openApiCustomizers; this.operationCustomizers = operationCustomizers; this.globalOpenApiCustomizers = globalOpenApiCustomizers; this.globalOperationCustomizers = globalOperationCustomizers; this.globalOpenApiMethodFilters = globalOpenApiMethodFilters; + this.optionalDelegatingMethodParameterCustomizers = optionalDelegatingMethodParameterCustomizers; + this.parameterCustomizers = parameterCustomizers; operationCustomizers.ifPresent(customizers -> customizers.removeIf(Objects::isNull)); this.routerOperationCustomizers = routerOperationCustomizers; this.dataRestRouterOperationCustomizers = dataRestRouterOperationCustomizers; @@ -134,11 +146,14 @@ public SpringDocCustomizers(Optional> openApiCustomizers, * @param openApiMethodFilters the open api method filters */ public SpringDocCustomizers(Optional> openApiCustomizers, Optional> operationCustomizers, - Optional> routerOperationCustomizers, Optional> openApiMethodFilters) { + Optional> routerOperationCustomizers, Optional> openApiMethodFilters, + Optional> optionalDelegatingMethodParameterCustomizers, Optional> parameterCustomizers) { this.openApiCustomizers = openApiCustomizers; this.operationCustomizers = operationCustomizers; this.routerOperationCustomizers = routerOperationCustomizers; this.methodFilters = openApiMethodFilters; + this.optionalDelegatingMethodParameterCustomizers = optionalDelegatingMethodParameterCustomizers; + this.parameterCustomizers = parameterCustomizers; this.dataRestRouterOperationCustomizers = Optional.empty(); } @@ -219,6 +234,24 @@ public Optional> getGlobalOpenApiMethodFilters() return globalOpenApiMethodFilters; } + /** + * Gets optional delegating method parameter customizers. + * + * @return the optional delegating method parameter customizers + */ + public Optional> getOptionalDelegatingMethodParameterCustomizers() { + return optionalDelegatingMethodParameterCustomizers; + } + + /** + * Gets parameter customizers. + * + * @return the parameter customizers + */ + public Optional> getParameterCustomizers() { + return parameterCustomizers; + } + @Override public void afterPropertiesSet() { //add the default customizers diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/ControllerType.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/ControllerType.java index adfc18cb4..2a3e4f59c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/ControllerType.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/ControllerType.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.data; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestOperationService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestOperationService.java index b75ce3fa3..8de97208f 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestOperationService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestOperationService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.data; @@ -210,7 +210,7 @@ private Operation buildSearchOperation(HandlerMethod handlerMethod, DataRestRepo String pName = parameterMetadatum.getName(); ResourceDescription description = parameterMetadatum.getDescription(); if (description instanceof TypedResourceDescription) { - Type type = getParameterType(pName,method,description); + Type type = getParameterType(pName, method, description); Schema schema = SpringDocAnnotationsUtils.extractSchema(openAPI.getComponents(), type, null, null, openAPI.getSpecVersion()); Parameter parameter = getParameterFromAnnotations(openAPI, methodAttributes, method, pName); if (parameter == null) { @@ -248,7 +248,7 @@ private Type getParameterType(String pName, Method method, ResourceDescription d java.lang.reflect.Parameter[] parameters = method.getParameters(); for (int i = 0; i < parameters.length; i++) { java.lang.reflect.Parameter parameter = parameters[i]; - if (pName.equals(parameter.getName()) || (parameter.getAnnotation(Param.class)!=null && pName.equals(parameter.getAnnotation(Param.class).value()))) { + if (pName.equals(parameter.getName()) || (parameter.getAnnotation(Param.class) != null && pName.equals(parameter.getAnnotation(Param.class).value()))) { ResolvableType resolvableType = ResolvableType.forMethodParameter(method, i); type = resolvableType.getType(); break; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRepository.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRepository.java index 305fe969e..a6837dd6b 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRepository.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.data; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRequestService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRequestService.java index 6fad33712..cc0ce4c49 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRequestService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRequestService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.data; @@ -43,8 +43,10 @@ import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.lang3.ArrayUtils; +import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; import org.springdoc.core.extractor.DelegatingMethodParameter; +import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.models.MethodAttributes; import org.springdoc.core.models.ParameterInfo; import org.springdoc.core.models.RequestBodyInfo; @@ -99,22 +101,33 @@ public class DataRestRequestService { */ private final SpringDocDataRestUtils springDocDataRestUtils; + /** + * The Optional delegating method parameter customizers. + */ + private final Optional> optionalDelegatingMethodParameterCustomizers; + + /** + * The Method parameter pojo extractor. + */ + private final MethodParameterPojoExtractor methodParameterPojoExtractor; + /** * Instantiates a new Data rest request builder. * * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer - * @param parameterBuilder the parameter builder - * @param requestBodyService the request body builder * @param requestBuilder the request builder * @param springDocDataRestUtils the spring doc data rest utils */ - public DataRestRequestService(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, GenericParameterService parameterBuilder, - RequestBodyService requestBodyService, AbstractRequestService requestBuilder, SpringDocDataRestUtils springDocDataRestUtils) { + public DataRestRequestService(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, + AbstractRequestService requestBuilder, + SpringDocDataRestUtils springDocDataRestUtils) { this.localSpringDocParameterNameDiscoverer = localSpringDocParameterNameDiscoverer; - this.parameterBuilder = parameterBuilder; - this.requestBodyService = requestBodyService; this.requestBuilder = requestBuilder; this.springDocDataRestUtils = springDocDataRestUtils; + this.optionalDelegatingMethodParameterCustomizers = requestBuilder.getOptionalDelegatingMethodParameterCustomizers(); + this.methodParameterPojoExtractor = requestBuilder.getMethodParameterPojoExtractor(); + this.parameterBuilder = requestBuilder.getParameterBuilder(); + this.requestBodyService=requestBuilder.getRequestBodyBuilder(); } /** @@ -156,7 +169,7 @@ public void buildParameters(OpenAPI openAPI, HandlerMethod handlerMethod, Reques */ public void buildCommonParameters(OpenAPI openAPI, RequestMethod requestMethod, MethodAttributes methodAttributes, Operation operation, String[] pNames, MethodParameter[] parameters, DataRestRepository dataRestRepository) { - parameters = DelegatingMethodParameter.customize(pNames, parameters, parameterBuilder.getOptionalDelegatingMethodParameterCustomizers(), requestBuilder.isDefaultFlatParamObject()); + parameters = DelegatingMethodParameter.customize(pNames, parameters, this.optionalDelegatingMethodParameterCustomizers, this.methodParameterPojoExtractor, requestBuilder.isDefaultFlatParamObject()); Class domainType = dataRestRepository.getDomainType(); for (MethodParameter methodParameter : parameters) { final String pName = methodParameter.getParameterName(); @@ -226,8 +239,8 @@ private boolean isParamToIgnore(MethodParameter methodParameter) { private void addParameters(OpenAPI openAPI, RequestMethod requestMethod, MethodAttributes methodAttributes, Operation operation, MethodParameter methodParameter, ParameterInfo parameterInfo, Parameter parameter) { List parameterAnnotations = Arrays.asList(getParameterAnnotations(methodParameter)); - if (requestBuilder.isValidParameter(parameter,methodAttributes)) { - requestBuilder.applyBeanValidatorAnnotations(parameter, parameterAnnotations, parameterInfo.isParameterObject()); + if (requestBuilder.isValidParameter(parameter, methodAttributes)) { + requestBuilder.applyBeanValidatorAnnotations(methodParameter, parameter, parameterAnnotations, parameterInfo.isParameterObject(), openAPI.getOpenapi()); operation.addParametersItem(parameter); } else if (!RequestMethod.GET.equals(requestMethod)) { diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestResponseService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestResponseService.java index 46412ad2e..ba5674861 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestResponseService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestResponseService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.data; @@ -243,7 +243,7 @@ else if ((HttpEntity.class.equals(parameterizedType.getRawType()) } } else if ((CollectionModel.class.equals(parameterizedType.getRawType()) - && parameterizedType.getActualTypeArguments()[0]!=null)) { + && parameterizedType.getActualTypeArguments()[0] != null)) { return getTypeForCollectionModel(returnedEntityType, resourceMetadata.isPagingResource()); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRouterOperationService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRouterOperationService.java index 41660655b..bd37f965a 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRouterOperationService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestRouterOperationService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.data; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestTagsService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestTagsService.java index faafd1976..df6d22367 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestTagsService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestTagsService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.data; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/discoverer/SpringDocParameterNameDiscoverer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/discoverer/SpringDocParameterNameDiscoverer.java index 0bef332a3..e8a97cbca 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/discoverer/SpringDocParameterNameDiscoverer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/discoverer/SpringDocParameterNameDiscoverer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.discoverer; @@ -50,7 +50,7 @@ public class SpringDocParameterNameDiscoverer extends DefaultParameterNameDiscov @Nullable public String[] getParameterNames(Method method) { String[] params = super.getParameterNames(method); - if(ArrayUtils.isEmpty(params) || Objects.requireNonNull(params).length!=method.getParameters().length) + if (ArrayUtils.isEmpty(params) || Objects.requireNonNull(params).length != method.getParameters().length) params = standardReflectionParameterNameDiscoverer.getParameterNames(method); return params; } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/DelegatingMethodParameter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/DelegatingMethodParameter.java index 11b39e482..e9a0e6708 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/DelegatingMethodParameter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/DelegatingMethodParameter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.extractor; @@ -38,6 +38,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.concurrent.CopyOnWriteArrayList; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -88,6 +89,11 @@ public class DelegatingMethodParameter extends MethodParameter { */ private final boolean isParameterObject; + /** + * If Is parameter object. then The Field should be not null + */ + private final Field field; + /** * The Method annotations. */ @@ -108,14 +114,15 @@ public class DelegatingMethodParameter extends MethodParameter { * @param isParameterObject the is parameter object * @param isNotRequired the is required */ - DelegatingMethodParameter(MethodParameter delegate, String parameterName, Annotation[] additionalParameterAnnotations, Annotation[] methodAnnotations, boolean isParameterObject, boolean isNotRequired) { + DelegatingMethodParameter(MethodParameter delegate, String parameterName, Annotation[] additionalParameterAnnotations, Annotation[] methodAnnotations, boolean isParameterObject, Field field, boolean isNotRequired) { super(delegate); this.delegate = delegate; + this.field = field; this.additionalParameterAnnotations = additionalParameterAnnotations; this.parameterName = parameterName; this.isParameterObject = isParameterObject; this.isNotRequired = isNotRequired; - this.methodAnnotations =methodAnnotations; + this.methodAnnotations = methodAnnotations; } /** @@ -124,11 +131,12 @@ public class DelegatingMethodParameter extends MethodParameter { * @param pNames the p names * @param parameters the parameters * @param optionalDelegatingMethodParameterCustomizers the optional list delegating method parameter customizer + * @param methodParameterPojoExtractor the method parameter pojo extractor * @param defaultFlatParamObject the default flat param object * @return the method parameter [ ] */ public static MethodParameter[] customize(String[] pNames, MethodParameter[] parameters, - Optional> optionalDelegatingMethodParameterCustomizers, boolean defaultFlatParamObject) { + Optional> optionalDelegatingMethodParameterCustomizers, MethodParameterPojoExtractor methodParameterPojoExtractor, boolean defaultFlatParamObject) { List explodedParameters = new ArrayList<>(); for (int i = 0; i < parameters.length; ++i) { MethodParameter p = parameters[i]; @@ -139,14 +147,14 @@ public static MethodParameter[] customize(String[] pNames, MethodParameter[] par .anyMatch(annotation -> Arrays.asList(RequestBody.class, RequestPart.class).contains(annotation.annotationType())); if (!MethodParameterPojoExtractor.isSimpleType(paramClass) && (hasFlatAnnotation || (defaultFlatParamObject && !hasNotFlatAnnotation && !AbstractRequestService.isRequestTypeToIgnore(paramClass)))) { - MethodParameterPojoExtractor.extractFrom(paramClass).forEach(methodParameter -> { - optionalDelegatingMethodParameterCustomizers.ifPresent(delegatingMethodParameterCustomizers -> delegatingMethodParameterCustomizers.forEach(customizer -> customizer.customize(p, methodParameter))); - explodedParameters.add(methodParameter); - }); + List flatParams = new CopyOnWriteArrayList<>(); + methodParameterPojoExtractor.extractFrom(paramClass).forEach(flatParams::add); + optionalDelegatingMethodParameterCustomizers.orElseGet(ArrayList::new).forEach(cz -> cz.customizeList(p, flatParams)); + explodedParameters.addAll(flatParams); } else { String name = pNames != null ? pNames[i] : p.getParameterName(); - explodedParameters.add(new DelegatingMethodParameter(p, name, null, null, false, false)); + explodedParameters.add(new DelegatingMethodParameter(p, name, null, null, false, null, false)); } } return explodedParameters.toArray(new MethodParameter[0]); @@ -297,4 +305,14 @@ public boolean isParameterObject() { return isParameterObject; } -} \ No newline at end of file + /** + * Gets field. If Is parameter object. then The Field should be not null + * + * @return the field + * @see #isParameterObject + */ + @Nullable + public Field getField() { + return field; + } +} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java index 643c2d9fd..96395fe36 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.extractor; @@ -35,12 +35,18 @@ import java.lang.reflect.TypeVariable; import java.nio.charset.Charset; import java.time.Duration; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.LocalTime; +import java.time.MonthDay; +import java.time.OffsetTime; +import java.time.Period; +import java.time.Year; +import java.time.YearMonth; +import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -49,20 +55,20 @@ import java.util.OptionalInt; import java.util.OptionalLong; import java.util.Set; +import java.util.TimeZone; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; import io.swagger.v3.core.util.PrimitiveType; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; +import org.springdoc.core.utils.SchemaUtils; import org.springframework.core.GenericTypeResolver; import org.springframework.core.MethodParameter; -import static org.springdoc.core.service.AbstractRequestService.hasNotNullAnnotation; import static org.springdoc.core.utils.Constants.DOT; /** @@ -72,6 +78,11 @@ */ public class MethodParameterPojoExtractor { + /** + * The Schema utils. + */ + private final SchemaUtils schemaUtils; + /** * The constant SIMPLE_TYPE_PREDICATES. */ @@ -96,7 +107,16 @@ public class MethodParameterPojoExtractor { SIMPLE_TYPES.add(Iterable.class); SIMPLE_TYPES.add(Duration.class); SIMPLE_TYPES.add(LocalTime.class); + SIMPLE_TYPES.add(LocalDateTime.class); + SIMPLE_TYPES.add(LocalDate.class); + SIMPLE_TYPES.add(YearMonth.class); + SIMPLE_TYPES.add(MonthDay.class); + SIMPLE_TYPES.add(Year.class); SIMPLE_TYPES.add(Class.class); + SIMPLE_TYPES.add(Period.class); + SIMPLE_TYPES.add(OffsetTime.class); + SIMPLE_TYPES.add(ZoneOffset.class); + SIMPLE_TYPES.add(TimeZone.class); SIMPLE_TYPE_PREDICATES.add(Class::isPrimitive); SIMPLE_TYPE_PREDICATES.add(Class::isEnum); @@ -108,7 +128,8 @@ public class MethodParameterPojoExtractor { /** * Instantiates a new Method parameter pojo extractor. */ - private MethodParameterPojoExtractor() { + public MethodParameterPojoExtractor(SchemaUtils schemaUtils) { + this.schemaUtils = schemaUtils; } /** @@ -117,7 +138,7 @@ private MethodParameterPojoExtractor() { * @param clazz the clazz * @return the stream */ - static Stream extractFrom(Class clazz) { + Stream extractFrom(Class clazz) { return extractFrom(clazz, "", true); } @@ -129,7 +150,7 @@ static Stream extractFrom(Class clazz) { * @param parentRequired whether the field that hold the class currently being inspected was required or optional * @return the stream */ - private static Stream extractFrom(Class clazz, String fieldNamePrefix, boolean parentRequired) { + private Stream extractFrom(Class clazz, String fieldNamePrefix, boolean parentRequired) { return allFieldsOf(clazz).stream() .filter(field -> !field.getType().equals(clazz)) .flatMap(f -> fromGetterOfField(clazz, f, fieldNamePrefix, parentRequired)) @@ -145,7 +166,7 @@ private static Stream extractFrom(Class clazz, String fieldN * @param parentRequired whether the field that holds the class currently being examined was required or optional * @return the stream */ - private static Stream fromGetterOfField(Class paramClass, Field field, String fieldNamePrefix, boolean parentRequired) { + private Stream fromGetterOfField(Class paramClass, Field field, String fieldNamePrefix, boolean parentRequired) { Class type = extractType(paramClass, field); if (Objects.isNull(type)) @@ -156,13 +177,13 @@ private static Stream fromGetterOfField(Class paramClass, Fi else { Parameter parameter = field.getAnnotation(Parameter.class); Schema schema = field.getAnnotation(Schema.class); - boolean visible = resolveVisible(parameter, schema); + boolean visible = SchemaUtils.swaggerVisible(schema, parameter); if (!visible) { return Stream.empty(); } String prefix = fieldNamePrefix + resolveName(parameter, schema).orElse(field.getName()) + DOT; - boolean isNullable = isNullable(field.getDeclaredAnnotations()); - return extractFrom(type, prefix, parentRequired && resolveRequired(schema, parameter, isNullable)); + boolean fieldRequired = schemaUtils.fieldRequired(field, schema, parameter); + return extractFrom(type, prefix, parentRequired && fieldRequired); } } @@ -190,46 +211,6 @@ private static Optional resolveNameFromSchema(Schema schema) { return Optional.of(schema.name()); } - private static boolean resolveVisible(Parameter parameter, Schema schema) { - if (parameter != null) { - return !parameter.hidden(); - } - if (schema != null) { - return !schema.hidden(); - } - return true; - } - - private static boolean resolveRequired(Schema schema, Parameter parameter, boolean nullable) { - if (parameter != null) { - return resolveRequiredFromParameter(parameter, nullable); - } - if (schema != null) { - return resolveRequiredFromSchema(schema, nullable); - } - return !nullable; - } - - private static boolean resolveRequiredFromParameter(Parameter parameter, boolean nullable) { - if (parameter.required()) { - return true; - } - return !nullable; - } - - private static boolean resolveRequiredFromSchema(Schema schema, boolean nullable) { - if (schema.required()) { - return true; - } - else if (schema.requiredMode() == Schema.RequiredMode.REQUIRED) { - return true; - } - else if (schema.requiredMode() == Schema.RequiredMode.NOT_REQUIRED) { - return false; - } - return !nullable; - } - /** * Extract the type * @@ -259,20 +240,21 @@ private static Class extractType(Class paramClass, Field field) { * @param fieldNamePrefix the field name prefix * @return the stream */ - private static Stream fromSimpleClass(Class paramClass, Field field, String fieldNamePrefix, boolean isParentRequired) { + private Stream fromSimpleClass(Class paramClass, Field field, String fieldNamePrefix, boolean parentRequired) { Annotation[] fieldAnnotations = field.getDeclaredAnnotations(); try { Parameter parameter = field.getAnnotation(Parameter.class); Schema schema = field.getAnnotation(Schema.class); - boolean isNullable = isNullable(fieldAnnotations); - boolean isNotRequired = !(isParentRequired && resolveRequired(schema, parameter, isNullable)); + boolean fieldRequired = schemaUtils.fieldRequired(field, schema, parameter); + + boolean paramRequired = parentRequired && fieldRequired; if (paramClass.getSuperclass() != null && paramClass.isRecord()) { return Stream.of(paramClass.getRecordComponents()) .filter(d -> d.getName().equals(field.getName())) .map(RecordComponent::getAccessor) .map(method -> new MethodParameter(method, -1)) .map(methodParameter -> DelegatingMethodParameter.changeContainingClass(methodParameter, paramClass)) - .map(param -> new DelegatingMethodParameter(param, fieldNamePrefix + field.getName(), fieldAnnotations, param.getMethodAnnotations(), true, isNotRequired)); + .map(param -> new DelegatingMethodParameter(param, fieldNamePrefix + field.getName(), fieldAnnotations, param.getMethodAnnotations(), true, field, !paramRequired)); } else return Stream.of(Introspector.getBeanInfo(paramClass).getPropertyDescriptors()) @@ -281,7 +263,7 @@ private static Stream fromSimpleClass(Class paramClass, Fiel .filter(Objects::nonNull) .map(method -> new MethodParameter(method, -1)) .map(methodParameter -> DelegatingMethodParameter.changeContainingClass(methodParameter, paramClass)) - .map(param -> new DelegatingMethodParameter(param, fieldNamePrefix + field.getName(), fieldAnnotations, param.getMethodAnnotations(), true, isNotRequired)); + .map(param -> new DelegatingMethodParameter(param, fieldNamePrefix + field.getName(), fieldAnnotations, param.getMethodAnnotations(), true, field, !paramRequired)); } catch (IntrospectionException e) { return Stream.of(); @@ -289,7 +271,7 @@ private static Stream fromSimpleClass(Class paramClass, Fiel } /** - * All fields of list. + * All fields of list. include parent fields * * @param clazz the clazz * @return the list @@ -352,17 +334,4 @@ public static void removeSimpleTypes(Class... classes) { SIMPLE_TYPES.removeAll(Arrays.asList(classes)); } - /** - * Is nullable boolean. - * - * @param fieldAnnotations the field annotations - * @return the boolean - */ - private static boolean isNullable(Annotation[] fieldAnnotations) { - Collection annotationSimpleNames = Arrays.stream(fieldAnnotations) - .map(Annotation::annotationType) - .map(Class::getSimpleName) - .collect(Collectors.toCollection(LinkedHashSet::new)); - return !hasNotNullAnnotation(annotationSimpleNames); - } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/GlobalOpenApiMethodFilter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/GlobalOpenApiMethodFilter.java index f47daca2b..90a48fbfb 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/GlobalOpenApiMethodFilter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/GlobalOpenApiMethodFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.filters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/OpenApiMethodFilter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/OpenApiMethodFilter.java index bf6b24124..563278014 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/OpenApiMethodFilter.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/filters/OpenApiMethodFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.filters; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractRouterFunctionVisitor.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractRouterFunctionVisitor.java index 6064b7b1f..e7698523d 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractRouterFunctionVisitor.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractRouterFunctionVisitor.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractSpringdocRouteBuilder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractSpringdocRouteBuilder.java index cfd641ac1..4391f1301 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractSpringdocRouteBuilder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/AbstractSpringdocRouteBuilder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterFunctionData.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterFunctionData.java index 1018af8c8..2d1aec84f 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterFunctionData.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterFunctionData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterOperation.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterOperation.java index 94da9fe60..693547609 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterOperation.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/RouterOperation.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/apiresponse/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/apiresponse/Builder.java index 782d1df06..4b85172ae 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/apiresponse/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/apiresponse/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.apiresponse; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/arrayschema/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/arrayschema/Builder.java index 0007e66e2..966af0e1d 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/arrayschema/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/arrayschema/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.arrayschema; @@ -79,17 +79,17 @@ public class Builder { /** * The Max contain. */ - private int maxContains= 0; + private int maxContains = 0; /** * The Min contains. */ - private int minContains= 0; + private int minContains = 0; /** * The Unevaluated items. */ - private Schema unevaluatedItems= org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build(); + private Schema unevaluatedItems = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build(); /** * The Prefix items. diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/content/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/content/Builder.java index 7c3a863f7..73d621010 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/content/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/content/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.content; @@ -139,7 +139,7 @@ public class Builder { /** * The All of. */ - private Schema[] allOf ={}; + private Schema[] allOf = {}; /** * Instantiates a new Content builder. diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/discriminatormapping/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/discriminatormapping/Builder.java index f30e8a138..580c32b9a 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/discriminatormapping/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/discriminatormapping/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.discriminatormapping; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/encoding/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/encoding/Builder.java index 2e2da146f..bb3ca4b35 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/encoding/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/encoding/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.encoding; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/exampleobject/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/exampleobject/Builder.java index d0bf83e9a..f9b22f288 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/exampleobject/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/exampleobject/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.exampleobject; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extension/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extension/Builder.java index 2d5860599..96d7c79b7 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extension/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extension/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.extension; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extensionproperty/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extensionproperty/Builder.java index 4c198043e..7c02a9d31 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extensionproperty/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/extensionproperty/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.extensionproperty; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/externaldocumentation/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/externaldocumentation/Builder.java index aa6624646..17764d79e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/externaldocumentation/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/externaldocumentation/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.externaldocumentation; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/header/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/header/Builder.java index 8f57a1ded..14066d790 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/header/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/header/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.header; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/link/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/link/Builder.java index 964ccf9b2..35e443f72 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/link/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/link/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.link; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/linkparameter/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/linkparameter/Builder.java index 62588982c..ad1ff5445 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/linkparameter/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/linkparameter/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.linkparameter; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/operation/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/operation/Builder.java index 35a157dcf..e9cb90e19 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/operation/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/operation/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.operation; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/parameter/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/parameter/Builder.java index 8c02e861e..c13f93e3c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/parameter/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/parameter/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.parameter; @@ -132,6 +132,11 @@ public class Builder { */ private String ref = ""; + /** + * The Validation groups. + */ + private Class[] validationGroups = {}; + /** * Instantiates a new Parameter builder. @@ -454,6 +459,11 @@ public Extension[] extensions() { public String ref() { return ref; } + + @Override + public Class[] validationGroups() { + return validationGroups; + } }; } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/requestbody/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/requestbody/Builder.java index 8f1ccb2c3..a36d100cf 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/requestbody/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/requestbody/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.requestbody; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java index fe7bbaff0..7d96555e0 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.schema; @@ -257,7 +257,7 @@ public class Builder { /** * The Types. */ - private String[] types ={}; + private String[] types = {}; /** * The Exclusive maximum value. @@ -299,6 +299,11 @@ public class Builder { */ private String $dynamicAnchor = ""; + /** + * The Dynamic ref. + */ + private String $dynamicRef = ""; + /** * The Content encoding. */ @@ -382,7 +387,7 @@ public class Builder { /** * The Properties. */ - private StringToClassMapItem[] properties= {}; + private StringToClassMapItem[] properties = {}; /** * The Unevaluated properties. @@ -837,6 +842,50 @@ public Builder schemaResolution(SchemaResolution schemaResolution) { return this; } + /** + * Dependent required map builder. + * + * @param dependentRequiredMap the dependent required map + * @return the builder + */ + public Builder dependentRequiredMap(DependentRequired[] dependentRequiredMap) { + this.dependentRequiredMap = dependentRequiredMap; + return this; + } + + /** + * Dependent schemas builder. + * + * @param dependentSchemas the dependent schemas + * @return the builder + */ + public Builder dependentSchemas(StringToClassMapItem[] dependentSchemas) { + this.dependentSchemas = dependentSchemas; + return this; + } + + /** + * Pattern properties builder. + * + * @param patternProperties the pattern properties + * @return the builder + */ + public Builder patternProperties(StringToClassMapItem[] patternProperties) { + this.patternProperties = patternProperties; + return this; + } + + /** + * Properties builder. + * + * @param properties the properties + * @return the builder + */ + public Builder properties(StringToClassMapItem[] properties) { + this.properties = properties; + return this; + } + /** * Additional properties builder. * @@ -1105,6 +1154,11 @@ public Class contains() { return $dynamicAnchor; } + @Override + public String $dynamicRef() { + return $dynamicRef; + } + @Override public String contentEncoding() { return contentEncoding; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/securityrequirement/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/securityrequirement/Builder.java index 3aa093f5c..f12fd5d8d 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/securityrequirement/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/securityrequirement/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.securityrequirement; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/server/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/server/Builder.java index bea8eb511..294c42e7a 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/server/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/server/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.server; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/servervariable/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/servervariable/Builder.java index f5a975613..1967d0997 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/servervariable/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/servervariable/Builder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.fn.builders.servervariable; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin.java index d1200600b..b68ca8c25 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.mixins; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin31.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin31.java index 8c7b53311..1798cb490 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin31.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedOpenAPIMixin31.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.mixins; @@ -42,7 +42,7 @@ * * @author bnasslashen */ -@JsonPropertyOrder(value = {"openapi", "info", "externalDocs", "servers", "security", "tags", "paths", "components", "webhooks"}, alphabetic = true) +@JsonPropertyOrder(value = { "openapi", "info", "externalDocs", "servers", "security", "tags", "paths", "components", "webhooks" }, alphabetic = true) public interface SortedOpenAPIMixin31 { /** diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin.java index 9459b2e96..a41c7f383 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.mixins; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin31.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin31.java index a7f820a71..1b7d9d2af 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin31.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/mixins/SortedSchemaMixin31.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.mixins; @@ -44,7 +44,7 @@ * * @author bnasslashen */ -@JsonPropertyOrder(value = {"type", "format", "if", "then", "else"}, alphabetic = true) +@JsonPropertyOrder(value = { "type", "format", "if", "then", "else" }, alphabetic = true) public interface SortedSchemaMixin31 { /** diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ControllerAdviceInfo.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ControllerAdviceInfo.java index e31eabec8..88d36f6e8 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ControllerAdviceInfo.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ControllerAdviceInfo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/GroupedOpenApi.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/GroupedOpenApi.java index 137ba3704..b43c2abba 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/GroupedOpenApi.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/GroupedOpenApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.models; @@ -123,7 +123,7 @@ public class GroupedOpenApi { */ private GroupedOpenApi(Builder builder) { Assert.isTrue(StringUtils.isNotBlank(builder.group), GROUP_NAME_NOT_NULL_OR_EMPTY); - this.group =builder.group; + this.group = builder.group; this.pathsToMatch = builder.pathsToMatch; this.packagesToScan = builder.packagesToScan; this.producesToMatch = builder.producesToMatch; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAdviceInfo.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAdviceInfo.java index 4da609961..ebe88daf3 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAdviceInfo.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAdviceInfo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAttributes.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAttributes.java index bbe7666ed..8baac19d9 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAttributes.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/MethodAttributes.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.models; @@ -270,7 +270,11 @@ public void calculateConsumesProduces(Method method) { RequestMapping reqMappingClass = AnnotatedElementUtils.findMergedAnnotation(method.getDeclaringClass(), RequestMapping.class); if (reqMappingMethod != null && reqMappingClass != null) { - fillMethods(ArrayUtils.addAll(reqMappingMethod.produces(), reqMappingClass.produces()), ArrayUtils.addAll(reqMappingMethod.consumes(), reqMappingClass.consumes()), reqMappingMethod.headers()); + fillMethods( + calculateMethodMediaTypes(reqMappingMethod.produces(), reqMappingClass.produces()), + calculateMethodMediaTypes(reqMappingMethod.consumes(), reqMappingClass.consumes()), + reqMappingMethod.headers() + ); } else if (reqMappingMethod != null) { fillMethods(reqMappingMethod.produces(), reqMappingMethod.consumes(), reqMappingMethod.headers()); @@ -290,23 +294,42 @@ else if (reqMappingClass != null) { * @param headers the headers */ private void fillMethods(String[] produces, String[] consumes, String[] headers) { - if (ArrayUtils.isNotEmpty(produces)) { - methodProduces = mergeArrays(methodProduces, produces); - } else if (ArrayUtils.isNotEmpty(classProduces)) { - methodProduces = mergeArrays(methodProduces, classProduces); - } else if (ArrayUtils.isEmpty(methodProduces)) { - methodProduces = new String[] {defaultProducesMediaType}; - } + if (ArrayUtils.isNotEmpty(produces)) { + methodProduces = mergeArrays(methodProduces, produces); + } + else if (ArrayUtils.isNotEmpty(classProduces)) { + methodProduces = mergeArrays(methodProduces, classProduces); + } + else if (ArrayUtils.isEmpty(methodProduces)) { + methodProduces = new String[] { defaultProducesMediaType }; + } + + if (ArrayUtils.isNotEmpty(consumes)) { + methodConsumes = mergeArrays(methodConsumes, consumes); + } + else if (ArrayUtils.isNotEmpty(classConsumes)) { + methodConsumes = mergeArrays(methodConsumes, classConsumes); + } + else if (ArrayUtils.isEmpty(methodConsumes)) { + methodConsumes = new String[] { defaultConsumesMediaType }; + } - if (ArrayUtils.isNotEmpty(consumes)) { - methodConsumes = mergeArrays(methodConsumes, consumes); - } else if (ArrayUtils.isNotEmpty(classConsumes)) { - methodConsumes = mergeArrays(methodConsumes, classConsumes); - } else if (ArrayUtils.isEmpty(methodConsumes)) { - methodConsumes = new String[] {defaultConsumesMediaType}; - } + setHeaders(headers); + } - setHeaders(headers); + /** + * If there is any method type(s) present, then these will override the class type(s). + * See ... for details + * + * @param methodTypes the method types + * @param classTypes the class types + * @return the string [ ] containing the types that can be used for the method + */ + private String[] calculateMethodMediaTypes(@Nullable String[] methodTypes, String[] classTypes) { + if (ArrayUtils.isNotEmpty(methodTypes)) { + return methodTypes; + } + return classTypes; } /** @@ -474,7 +497,7 @@ public void setWithResponseBodySchemaDoc(boolean withResponseBodySchemaDoc) { public void calculateHeadersForClass(Class declaringClass) { RequestMapping reqMappingClass = AnnotatedElementUtils.findMergedAnnotation(declaringClass, RequestMapping.class); if (reqMappingClass != null) { - fillMethods(reqMappingClass.produces(), reqMappingClass.consumes(), reqMappingClass.headers()); + setHeaders(reqMappingClass.headers()); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterId.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterId.java index e541d8b4d..5371cff8e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterId.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterId.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterInfo.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterInfo.java index 158198bed..93098ce6d 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterInfo.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/ParameterInfo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.models; @@ -85,7 +85,7 @@ public class ParameterInfo { private String paramType; /** - * if the paramater type is RequestPart + * if the parameter type is RequestPart */ private boolean requestPart; @@ -345,7 +345,7 @@ public void setParameterId(ParameterId parameterId) { * @return the boolean */ public boolean isParameterObject() { - return methodParameter instanceof DelegatingMethodParameter delegatingMethodParameter + return methodParameter instanceof DelegatingMethodParameter delegatingMethodParameter && delegatingMethodParameter.isParameterObject(); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/RequestBodyInfo.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/RequestBodyInfo.java index b5130e395..957421adf 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/RequestBodyInfo.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/models/RequestBodyInfo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.models; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/AbstractSwaggerUiConfigProperties.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/AbstractSwaggerUiConfigProperties.java index ce857ea4e..49e8fe065 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/AbstractSwaggerUiConfigProperties.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/AbstractSwaggerUiConfigProperties.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.properties; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SpringDocConfigProperties.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SpringDocConfigProperties.java index 25d76f1d2..d27787f51 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SpringDocConfigProperties.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SpringDocConfigProperties.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.properties; @@ -274,6 +274,41 @@ public class SpringDocConfigProperties { */ private OpenAPI OpenApi; + /** + * The Enable extra schemas resolution. + */ + private boolean enableExtraSchemas; + + /** + * Set explicit-object-schema to true to always include type: + * object in the schema, or to false to omit type: object. + */ + private boolean explicitObjectSchema; + + /** + * When set to true, schemas without a defined type will be deserialized as an ArbitrarySchema (with no type), + * instead of an ObjectSchema with type: object. + */ + private boolean useArbitrarySchemas; + + /** + * Is enable additional schemas resolution boolean. + * + * @return the boolean + */ + public boolean isEnableExtraSchemas() { + return enableExtraSchemas; + } + + /** + * Sets enable additional schemas resolution. + * + * @param enableExtraSchemas the enable additional schemas resolution + */ + public void setEnableExtraSchemas(boolean enableExtraSchemas) { + this.enableExtraSchemas = enableExtraSchemas; + } + /** * Gets open api. * @@ -319,15 +354,6 @@ public Boolean getOverrideWithGenericResponse() { return overrideWithGenericResponse; } - /** - * Sets override with generic response. - * - * @param overrideWithGenericResponse the override with generic response - */ - public void setOverrideWithGenericResponse(Boolean overrideWithGenericResponse) { - this.overrideWithGenericResponse = overrideWithGenericResponse; - } - /** * Is nullable request parameter enabled boolean. * @@ -544,7 +570,6 @@ public void setModelConverters(ModelConverters modelConverters) { this.modelConverters = modelConverters; } - /** * Is use management port boolean. * @@ -842,7 +867,6 @@ public boolean isCacheDisabled() { return cache.isDisabled(); } - /** * Gets group configs. * @@ -915,6 +939,15 @@ public boolean isOverrideWithGenericResponse() { return overrideWithGenericResponse != null && overrideWithGenericResponse; } + /** + * Sets override with generic response. + * + * @param overrideWithGenericResponse the override with generic response + */ + public void setOverrideWithGenericResponse(Boolean overrideWithGenericResponse) { + this.overrideWithGenericResponse = overrideWithGenericResponse; + } + /** * Sets override with generic response. * @@ -1036,21 +1069,21 @@ public boolean isPreLoadingEnabled() { } /** - * locale list to pre-loading. + * Sets locale list to pre-loading. * - * @return the Locales + * @param preLoadingEnabled the Locales */ - public List getPreLoadingLocales() { - return preLoadingLocales; + public void setPreLoadingEnabled(boolean preLoadingEnabled) { + this.preLoadingEnabled = preLoadingEnabled; } /** - * Sets locale list to pre-loading. + * locale list to pre-loading. * - * @param preLoadingEnabled the Locales + * @return the Locales */ - public void setPreLoadingEnabled(boolean preLoadingEnabled) { - this.preLoadingEnabled = preLoadingEnabled; + public List getPreLoadingLocales() { + return preLoadingLocales; } /** @@ -1062,6 +1095,100 @@ public void setPreLoadingLocales(List preLoadingLocales) { this.preLoadingLocales = preLoadingLocales; } + /** + * Is show oauth 2 endpoints boolean. + * + * @return the boolean + */ + public boolean isShowOauth2Endpoints() { + return showOauth2Endpoints; + } + + /** + * Sets show oauth 2 endpoints. + * + * @param showOauth2Endpoints the show oauth 2 endpoints + */ + public void setShowOauth2Endpoints(boolean showOauth2Endpoints) { + this.showOauth2Endpoints = showOauth2Endpoints; + } + + /** + * Gets spec version. + * + * @return the spec version + */ + public SpecVersion getSpecVersion() { + if (apiDocs.getVersion() == OpenApiVersion.OPENAPI_3_1) + return SpecVersion.V31; + return SpecVersion.V30; + } + + /** + * Is openapi 31 boolean. + * + * @return the boolean + */ + public boolean isOpenapi31() { + if (apiDocs.getVersion() == OpenApiVersion.OPENAPI_3_1) + return true; + return false; + } + + /** + * Is enable default api docs boolean. + * + * @return the boolean + */ + public boolean isEnableDefaultApiDocs() { + return enableDefaultApiDocs; + } + + /** + * Sets enable default api docs. + * + * @param enableDefaultApiDocs the enable default api docs + */ + public void setEnableDefaultApiDocs(boolean enableDefaultApiDocs) { + this.enableDefaultApiDocs = enableDefaultApiDocs; + } + + /** + * Is explicit object schema boolean. + * + * @return the boolean + */ + public boolean isExplicitObjectSchema() { + return explicitObjectSchema; + } + + /** + * Sets explicit object schema. + * + * @param explicitObjectSchema the explicit object schema + */ + public void setExplicitObjectSchema(boolean explicitObjectSchema) { + this.explicitObjectSchema = explicitObjectSchema; + } + + /** + * Is use arbitrary schemas boolean. + * + * @return the boolean + */ + public boolean isUseArbitrarySchemas() { + return useArbitrarySchemas; + } + + /** + * Sets use arbitrary schemas. + * + * @param useArbitrarySchemas the use arbitrary schemas + */ + public void setUseArbitrarySchemas(boolean useArbitrarySchemas) { + this.useArbitrarySchemas = useArbitrarySchemas; + } + /** * The type Model converters. * @@ -1419,6 +1546,24 @@ public void setVersion(OpenApiVersion version) { this.version = version; } + /** + * Is resolve extensions properties boolean. + * + * @return the boolean + */ + public boolean isResolveExtensionsProperties() { + return resolveExtensionsProperties; + } + + /** + * Sets resolve extensions properties. + * + * @param resolveExtensionsProperties the resolve extensions properties + */ + public void setResolveExtensionsProperties(boolean resolveExtensionsProperties) { + this.resolveExtensionsProperties = resolveExtensionsProperties; + } + /** * The enum OpenApiVersion. */ @@ -1455,24 +1600,6 @@ public String getVersion() { return version; } } - - /** - * Is resolve extensions properties boolean. - * - * @return the boolean - */ - public boolean isResolveExtensionsProperties() { - return resolveExtensionsProperties; - } - - /** - * Sets resolve extensions properties. - * - * @param resolveExtensionsProperties the resolve extensions properties - */ - public void setResolveExtensionsProperties(boolean resolveExtensionsProperties) { - this.resolveExtensionsProperties = resolveExtensionsProperties; - } } /** @@ -1505,7 +1632,6 @@ public void setEnabled(boolean enabled) { } } - /** * The type Cache. * @@ -1821,63 +1947,4 @@ public int hashCode() { return Objects.hash(group); } } - - - /** - * Is show oauth 2 endpoints boolean. - * - * @return the boolean - */ - public boolean isShowOauth2Endpoints() { - return showOauth2Endpoints; - } - - /** - * Sets show oauth 2 endpoints. - * - * @param showOauth2Endpoints the show oauth 2 endpoints - */ - public void setShowOauth2Endpoints(boolean showOauth2Endpoints) { - this.showOauth2Endpoints = showOauth2Endpoints; - } - - /** - * Gets spec version. - * - * @return the spec version - */ - public SpecVersion getSpecVersion() { - if (apiDocs.getVersion() == OpenApiVersion.OPENAPI_3_1) - return SpecVersion.V31; - return SpecVersion.V30; - } - - /** - * Is openapi 31 boolean. - * - * @return the boolean - */ - public boolean isOpenapi31() { - if (apiDocs.getVersion() == OpenApiVersion.OPENAPI_3_1) - return true; - return false; - } - - /** - * Is enable default api docs boolean. - * - * @return the boolean - */ - public boolean isEnableDefaultApiDocs() { - return enableDefaultApiDocs; - } - - /** - * Sets enable default api docs. - * - * @param enableDefaultApiDocs the enable default api docs - */ - public void setEnableDefaultApiDocs(boolean enableDefaultApiDocs) { - this.enableDefaultApiDocs = enableDefaultApiDocs; - } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigParameters.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigParameters.java index dab9a56fb..ee3dac07c 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigParameters.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigParameters.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.properties; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigProperties.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigProperties.java index d4158bcc3..dd3544909 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigProperties.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigProperties.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.properties; @@ -63,6 +63,16 @@ @ConditionalOnBean(SpringDocConfiguration.class) public class SwaggerUiConfigProperties extends AbstractSwaggerUiConfigProperties implements InitializingBean { + /** + * The constant SPRINGDOC_CONFIG_PROPERTIES. + */ + public static final String SPRINGDOC_CONFIG_PROPERTIES = "springdoc.config.properties"; + + /** + * The constant SPRINGDOC_SWAGGERUI_VERSION. + */ + private static final String SPRINGDOC_SWAGGER_VERSION = SPRINGDOC_SWAGGER_PREFIX + ".version"; + /** * The Disable swagger default url. */ @@ -93,17 +103,6 @@ public class SwaggerUiConfigProperties extends AbstractSwaggerUiConfigProperties */ private boolean useRootPath; - /** - * The constant SPRINGDOC_SWAGGERUI_VERSION. - */ - private static final String SPRINGDOC_SWAGGER_VERSION = SPRINGDOC_SWAGGER_PREFIX+".version"; - - /** - * The constant SPRINGDOC_CONFIG_PROPERTIES. - */ - public static final String SPRINGDOC_CONFIG_PROPERTIES = "springdoc.config.properties"; - - @Override public void afterPropertiesSet() { if (StringUtils.isEmpty(version)) { @@ -117,6 +116,7 @@ public void afterPropertiesSet() { } } } + /** * Gets swagger ui version. * diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiOAuthProperties.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiOAuthProperties.java index 68ae492b5..a41491cd6 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiOAuthProperties.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiOAuthProperties.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.properties; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ActuatorProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ActuatorProvider.java index a4ad04a9b..c072d0283 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ActuatorProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ActuatorProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; @@ -97,7 +97,7 @@ public abstract class ActuatorProvider implements ApplicationListener hateoasPropertiesOptional, this.objectMapperProvider = objectMapperProvider; } + private static boolean isHalEnabled(@NonNull HateoasProperties hateoasProperties) { + // In spring-boot 3.5, the method name was changed from getUseHalAsDefaultJsonMediaType to isUseHalAsDefaultJsonMediaType + var possibleMethodNames = List.of("isUseHalAsDefaultJsonMediaType", "getUseHalAsDefaultJsonMediaType"); + + for (var methodName : possibleMethodNames) { + var method = ReflectionUtils.findMethod(HateoasProperties.class, methodName); + if (method != null) { + var result = ReflectionUtils.invokeMethod(method, hateoasProperties); + if (result instanceof Boolean halEnabled) { + return halEnabled; + } + + throw new IllegalStateException("Method " + methodName + " did not return a boolean value"); + } + } + + throw new IllegalStateException("No suitable method found to determine if HAL is enabled"); + } + /** * Init. */ @@ -79,8 +101,7 @@ protected void init() { */ public boolean isHalEnabled() { return hateoasPropertiesOptional - .map(HateoasProperties::getUseHalAsDefaultJsonMediaType) + .map(HateoasHalProvider::isHalEnabled) .orElse(true); } - } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/JavadocProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/JavadocProvider.java index 3a85fb940..7e73c4f28 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/JavadocProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/JavadocProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; @@ -102,4 +102,9 @@ public interface JavadocProvider { * @return the first sentence based on javadoc guidelines */ String getFirstSentence(String text); + + /** + * Clean the temp resources. + */ + default void clearCache() {} } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ObjectMapperProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ObjectMapperProvider.java index 1b5f8eeb9..e7e0710d0 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ObjectMapperProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/ObjectMapperProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; @@ -74,6 +74,12 @@ public ObjectMapperProvider(SpringDocConfigProperties springDocConfigProperties) if (openApiVersion == OpenApiVersion.OPENAPI_3_1) { jsonMapper = Json31.mapper(); yamlMapper = Yaml31.mapper(); + if (springDocConfigProperties.isUseArbitrarySchemas()) { + System.setProperty(Schema.USE_ARBITRARY_SCHEMA_PROPERTY, "true"); + } + if (springDocConfigProperties.isExplicitObjectSchema()) { + System.setProperty(Schema.EXPLICIT_OBJECT_SCHEMA_PROPERTY, "true"); + } } else { jsonMapper = Json.mapper(); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestConfigurationProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestConfigurationProvider.java index c51746fff..e45b78ee1 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestConfigurationProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestConfigurationProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestResourceProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestResourceProvider.java index 23fbddf1a..2f5c89859 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestResourceProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RepositoryRestResourceProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RouterFunctionProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RouterFunctionProvider.java index ab338a25f..6dd455762 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RouterFunctionProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/RouterFunctionProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SecurityOAuth2Provider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SecurityOAuth2Provider.java index 284685dbf..9b028a848 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SecurityOAuth2Provider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SecurityOAuth2Provider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringCloudFunctionProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringCloudFunctionProvider.java index c729384c0..c8cdae452 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringCloudFunctionProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringCloudFunctionProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDataWebPropertiesProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDataWebPropertiesProvider.java index 6892fed96..b2fd4757e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDataWebPropertiesProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDataWebPropertiesProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocJavadocProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocJavadocProvider.java index dc0fa7dd7..d3b940090 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocJavadocProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocJavadocProvider.java @@ -21,15 +21,18 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import com.github.therapi.runtimejavadoc.ClassJavadoc; @@ -56,6 +59,11 @@ public class SpringDocJavadocProvider implements JavadocProvider { */ private final CommentFormatter formatter = new CommentFormatter(); + /** + * The Class javadoc cache. + */ + private final Map, ClassJavadoc> classJavadocCache = new HashMap<>(); + /** * Gets class description. @@ -65,7 +73,7 @@ public class SpringDocJavadocProvider implements JavadocProvider { */ @Override public String getClassJavadoc(Class cl) { - ClassJavadoc classJavadoc = RuntimeJavadoc.getJavadoc(cl); + ClassJavadoc classJavadoc = getJavadoc(cl); return formatter.format(classJavadoc.getComment()); } @@ -77,7 +85,7 @@ public String getClassJavadoc(Class cl) { */ @Override public Map getRecordClassParamJavadoc(Class cl) { - ClassJavadoc classJavadoc = RuntimeJavadoc.getJavadoc(cl); + ClassJavadoc classJavadoc = getJavadoc(cl); return classJavadoc.getRecordComponents().stream() .collect(Collectors.toMap(ParamJavadoc::getName, recordClass -> formatter.format(recordClass.getComment()))); } @@ -90,7 +98,7 @@ public Map getRecordClassParamJavadoc(Class cl) { */ @Override public String getMethodJavadocDescription(Method method) { - MethodJavadoc methodJavadoc = RuntimeJavadoc.getJavadoc(method); + MethodJavadoc methodJavadoc = getJavadoc(method); return formatter.format(methodJavadoc.getComment()); } @@ -102,7 +110,7 @@ public String getMethodJavadocDescription(Method method) { */ @Override public String getMethodJavadocReturn(Method method) { - MethodJavadoc methodJavadoc = RuntimeJavadoc.getJavadoc(method); + MethodJavadoc methodJavadoc = getJavadoc(method); return formatter.format(methodJavadoc.getReturns()); } @@ -113,7 +121,7 @@ public String getMethodJavadocReturn(Method method) { * @return the method throws (name-description map) */ public Map getMethodJavadocThrows(Method method) { - return RuntimeJavadoc.getJavadoc(method) + return getJavadoc(method) .getThrows() .stream() .collect(toMap(ThrowsJavadoc::getName, javadoc -> formatter.format(javadoc.getComment()))); @@ -123,12 +131,12 @@ public Map getMethodJavadocThrows(Method method) { * Gets param javadoc. * * @param method the method - * @param name the name + * @param name the name * @return the param javadoc */ @Override public String getParamJavadoc(Method method, String name) { - MethodJavadoc methodJavadoc = RuntimeJavadoc.getJavadoc(method); + MethodJavadoc methodJavadoc = getJavadoc(method); List paramsDoc = methodJavadoc.getParams(); return paramsDoc.stream().filter(paramJavadoc1 -> name.equals(paramJavadoc1.getName())).findAny() .map(paramJavadoc1 -> formatter.format(paramJavadoc1.getComment())).orElse(null); @@ -142,7 +150,7 @@ public String getParamJavadoc(Method method, String name) { */ @Override public String getFieldJavadoc(Field field) { - FieldJavadoc fieldJavadoc = RuntimeJavadoc.getJavadoc(field); + FieldJavadoc fieldJavadoc = getJavadoc(field); return formatter.format(fieldJavadoc.getComment()); } @@ -173,4 +181,38 @@ public String getFirstSentence(String text) { } return text; } + + private ClassJavadoc getJavadoc(Class cl) { + ClassJavadoc classJavadoc = classJavadocCache.get(cl); + if (classJavadoc != null) { + return classJavadoc; + } + classJavadoc = RuntimeJavadoc.getJavadoc(cl); + classJavadocCache.put(cl, classJavadoc); + return classJavadoc; + } + + private MethodJavadoc getJavadoc(Method method) { + ClassJavadoc classJavadoc = getJavadoc(method.getDeclaringClass()); + List paramTypes = Arrays.stream(method.getParameterTypes()) + .map(Class::getCanonicalName) + .toList(); + return classJavadoc.getMethods() + .stream() + .filter(it -> Objects.equals(method.getName(), it.getName()) && Objects.equals(paramTypes, it.getParamTypes())) + .findFirst().orElseGet(() -> MethodJavadoc.createEmpty(method)); + } + + private FieldJavadoc getJavadoc(Field field) { + ClassJavadoc classJavadoc = getJavadoc(field.getDeclaringClass()); + return classJavadoc.getFields() + .stream() + .filter(it -> Objects.equals(field.getName(), it.getName())) + .findFirst().orElseGet(() -> FieldJavadoc.createEmpty(field.getName())); + } + + @Override + public void clearCache() { + classJavadocCache.clear(); + } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocProviders.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocProviders.java index c386fb932..a86382b82 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocProviders.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocProviders.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java index e1f84ac17..e918da933 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; @@ -149,14 +149,14 @@ public class SpringRepositoryRestResourceProvider implements RepositoryRestResou private final ObjectMapper mapper; /** - * The Application context. + * The Spring doc data rest utils. */ - private ApplicationContext applicationContext; + private final SpringDocDataRestUtils springDocDataRestUtils; /** - * The Spring doc data rest utils. + * The Application context. */ - private final SpringDocDataRestUtils springDocDataRestUtils; + private ApplicationContext applicationContext; /** * The Handler mapping list. @@ -170,7 +170,7 @@ public class SpringRepositoryRestResourceProvider implements RepositoryRestResou * @param mapper the mapper * @param springDocDataRestUtils the spring doc data rest utils */ - public SpringRepositoryRestResourceProvider(DataRestRouterOperationService dataRestRouterOperationService, + public SpringRepositoryRestResourceProvider(DataRestRouterOperationService dataRestRouterOperationService, ObjectMapper mapper, SpringDocDataRestUtils springDocDataRestUtils) { this.dataRestRouterOperationService = dataRestRouterOperationService; this.mapper = mapper; @@ -182,7 +182,7 @@ public SpringRepositoryRestResourceProvider(DataRestRouterOperationService dataR * Gets router operations. * * @param openAPI the open api - * @param locale the locale + * @param locale the locale * @return the router operations */ public List getRouterOperations(OpenAPI openAPI, Locale locale) { @@ -201,7 +201,7 @@ public List getRouterOperations(OpenAPI openAPI, Locale locale) final JacksonMetadata jackson = new JacksonMetadata(mapper, domainType); boolean hiddenRepository = (AnnotationUtils.findAnnotation(repository, Hidden.class) != null); if (!hiddenRepository) { - if (resourceMetadata!=null && resourceMetadata.isExported()) { + if (resourceMetadata != null && resourceMetadata.isExported()) { for (HandlerMapping handlerMapping : handlerMappingList) { if (handlerMapping instanceof RepositoryRestHandlerMapping repositoryRestHandlerMapping) { Map handlerMethodMap = repositoryRestHandlerMapping.getHandlerMethods(); @@ -335,7 +335,7 @@ private void findSearchResourceMappings(OpenAPI openAPI, List r .getValue().getBeanType().getName())) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1)); ResourceMetadata metadata = associations.getMetadataFor(dataRestRepository.getDomainType()); - if(metadata!=null && metadata.isExported()) { + if (metadata != null && metadata.isExported()) { SearchResourceMappings searchResourceMappings = metadata.getSearchResourceMappings(); if (searchResourceMappings.isExported()) { findSearchControllers(routerOperationList, handlerMethodMapFiltered, resourceMetadata, dataRestRepository, openAPI, searchResourceMappings); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringWebProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringWebProvider.java index 0c392d78c..aebda82b2 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringWebProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringWebProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/WebConversionServiceProvider.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/WebConversionServiceProvider.java index e572422c8..063550427 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/WebConversionServiceProvider.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/WebConversionServiceProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.providers; @@ -120,7 +120,7 @@ public Class getSpringConvertedType(Class clazz) { Field convertersField = FieldUtils.getDeclaredField(GenericConversionService.class, CONVERTERS, true); if (convertersField != null) { Object converters; - if (!AopUtils.isAopProxy(formattingConversionService)){ + if (!AopUtils.isAopProxy(formattingConversionService)) { try { converters = convertersField.get(formattingConversionService); Map springConverters = (Map) FieldUtils.readDeclaredField(converters, CONVERTERS, true); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java index c232d7e79..209cbfd02 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/AbstractRequestService.java @@ -31,8 +31,9 @@ import java.io.Reader; import java.io.Writer; import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedParameterizedType; +import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.math.BigDecimal; import java.security.Principal; import java.time.ZoneId; import java.util.ArrayList; @@ -54,32 +55,35 @@ import java.util.stream.Stream; import com.fasterxml.jackson.annotation.JsonView; +import io.swagger.v3.core.converter.AnnotatedType; import io.swagger.v3.core.util.PrimitiveType; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; -import jakarta.validation.constraints.DecimalMax; -import jakarta.validation.constraints.DecimalMin; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer; import org.springdoc.core.customizers.ParameterCustomizer; +import org.springdoc.core.customizers.SpringDocCustomizers; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; import org.springdoc.core.extractor.DelegatingMethodParameter; +import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.models.MethodAttributes; import org.springdoc.core.models.ParameterId; import org.springdoc.core.models.ParameterInfo; import org.springdoc.core.models.RequestBodyInfo; import org.springdoc.core.properties.SpringDocConfigProperties.ApiDocs.OpenApiVersion; import org.springdoc.core.providers.JavadocProvider; +import org.springdoc.core.providers.ObjectMapperProvider; +import org.springdoc.core.utils.SchemaUtils; import org.springdoc.core.utils.SpringDocAnnotationsUtils; import org.springframework.core.MethodParameter; @@ -104,8 +108,7 @@ import static org.springdoc.core.converters.SchemaPropertyDeprecatingConverter.containsDeprecatedAnnotation; import static org.springdoc.core.service.GenericParameterService.isFile; -import static org.springdoc.core.utils.Constants.OPENAPI_ARRAY_TYPE; -import static org.springdoc.core.utils.Constants.OPENAPI_STRING_TYPE; +import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson; import static org.springdoc.core.utils.SpringDocUtils.getParameterAnnotations; import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE; import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; @@ -118,25 +121,14 @@ public abstract class AbstractRequestService { /** - * The constant PARAM_TYPES_TO_IGNORE. - */ - private static final List> PARAM_TYPES_TO_IGNORE = Collections.synchronizedList(new ArrayList<>()); - - /** - * The constant ANNOTATIONS_FOR_REQUIRED. - */ -// using string litterals to support both validation-api v1 and v2 - private static final String[] ANNOTATIONS_FOR_REQUIRED = { "NotNull", "NonNull", "NotBlank", "NotEmpty" }; - - /** - * The constant POSITIVE_OR_ZERO. + * The constant LOGGER. */ - private static final String POSITIVE_OR_ZERO = "PositiveOrZero"; - + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRequestService.class); + /** - * The constant NEGATIVE_OR_ZERO. + * The constant PARAM_TYPES_TO_IGNORE. */ - private static final String NEGATIVE_OR_ZERO = "NegativeOrZero"; + private static final List> PARAM_TYPES_TO_IGNORE = Collections.synchronizedList(new ArrayList<>()); static { PARAM_TYPES_TO_IGNORE.add(WebRequest.class); @@ -190,23 +182,36 @@ public abstract class AbstractRequestService { */ private boolean defaultSupportFormData; + /** + * The Optional delegating method parameter customizers. + */ + private final Optional> optionalDelegatingMethodParameterCustomizers; + + /** + * The Method parameter pojo extractor. + */ + private final MethodParameterPojoExtractor methodParameterPojoExtractor; /** * Instantiates a new Abstract request builder. * * @param parameterBuilder the parameter builder * @param requestBodyService the request body builder - * @param parameterCustomizers the parameter customizers + * @param springDocCustomizers the spring doc customizers * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer + * @param methodParameterPojoExtractor the method parameter pojo extractor */ protected AbstractRequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService, - Optional> parameterCustomizers, - SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) { + SpringDocCustomizers springDocCustomizers, + SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, + MethodParameterPojoExtractor methodParameterPojoExtractor) { super(); this.parameterBuilder = parameterBuilder; this.requestBodyService = requestBodyService; + this.optionalDelegatingMethodParameterCustomizers = springDocCustomizers.getOptionalDelegatingMethodParameterCustomizers(); + this.methodParameterPojoExtractor = methodParameterPojoExtractor; + this.parameterCustomizers = springDocCustomizers.getParameterCustomizers(); parameterCustomizers.ifPresent(customizers -> customizers.removeIf(Objects::isNull)); - this.parameterCustomizers = parameterCustomizers; this.localSpringDocParameterNameDiscoverer = localSpringDocParameterNameDiscoverer; this.defaultFlatParamObject = parameterBuilder.getPropertyResolverUtils().getSpringDocConfigProperties().isDefaultFlatParamObject(); this.defaultSupportFormData = parameterBuilder.getPropertyResolverUtils().getSpringDocConfigProperties().isDefaultSupportFormData(); @@ -280,6 +285,9 @@ public static Collection getHeaders(MethodAttributes methodAttributes * @param methodAttributes the method attributes * @param openAPI the open api * @return the operation + * @see org.springdoc.core.customizers.DelegatingMethodParameterCustomizer#customizeList(MethodParameter, List) + * @see ParameterCustomizer#customize(Parameter, MethodParameter) + * @see org.springdoc.core.customizers.PropertyCustomizer#customize(Schema, AnnotatedType) */ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod, Operation operation, MethodAttributes methodAttributes, OpenAPI openAPI) { @@ -292,7 +300,8 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod, String[] reflectionParametersNames = Arrays.stream(handlerMethod.getMethod().getParameters()).map(java.lang.reflect.Parameter::getName).toArray(String[]::new); if (pNames == null || Arrays.stream(pNames).anyMatch(Objects::isNull)) pNames = reflectionParametersNames; - parameters = DelegatingMethodParameter.customize(pNames, parameters, parameterBuilder.getOptionalDelegatingMethodParameterCustomizers(), this.defaultFlatParamObject); + // Process: DelegatingMethodParameterCustomizer + parameters = DelegatingMethodParameter.customize(pNames, parameters, optionalDelegatingMethodParameterCustomizers, methodParameterPojoExtractor, this.defaultFlatParamObject); RequestBodyInfo requestBodyInfo = new RequestBodyInfo(); List operationParameters = (operation.getParameters() != null) ? operation.getParameters() : new ArrayList<>(); Map parametersDocMap = getApiParameters(handlerMethod.getMethod()); @@ -343,15 +352,18 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod, parameter.setDescription(paramJavadocDescription); } } - applyBeanValidatorAnnotations(parameter, parameterAnnotations, parameterInfo.isParameterObject()); + // Process: applyValidationsToSchema + applyBeanValidatorAnnotations(methodParameter, parameter, parameterAnnotations, parameterInfo.isParameterObject(), openAPI.getOpenapi()); } else if (!RequestMethod.GET.equals(requestMethod) || OpenApiVersion.OPENAPI_3_1.getVersion().equals(openAPI.getOpenapi())) { if (operation.getRequestBody() != null) requestBodyInfo.setRequestBody(operation.getRequestBody()); + // Process: PropertyCustomizer requestBodyService.calculateRequestBodyInfo(components, methodAttributes, parameterInfo, requestBodyInfo); applyBeanValidatorAnnotations(requestBodyInfo.getRequestBody(), parameterAnnotations, methodParameter.isOptional()); } + // Process: ParameterCustomizer customiseParameter(parameter, parameterInfo, operationParameters); } } @@ -402,7 +414,12 @@ else if (!RequestMethod.GET.equals(requestMethod) || OpenApiVersion.OPENAPI_3_1. */ private LinkedHashMap getParameterLinkedHashMap(Components components, MethodAttributes methodAttributes, List operationParameters, Map parametersDocMap) { LinkedHashMap map = operationParameters.stream().collect(Collectors.toMap(ParameterId::new, parameter -> parameter, (u, v) -> { - throw new IllegalStateException(String.format("Duplicate key %s", u)); + LOGGER.warn( + "Duplicate OpenAPI parameter detected: name='{}', in='{}'. Keeping the first found and ignoring the rest. " + + "Declare the parameter only once.", + u.getName(), u.getIn() + ); + return u; }, LinkedHashMap::new)); for (Entry entry : parametersDocMap.entrySet()) { @@ -473,6 +490,8 @@ public boolean isParamToIgnore(MethodParameter parameter) { return false; if (isRequestBodyWithMapType(parameter)) return false; + if (isRequestPartWithMapType(parameter)) + return false; return isRequestTypeToIgnore(parameter.getParameterType()); } @@ -512,6 +531,23 @@ private boolean isRequestBodyWithMapType(MethodParameter parameter) { return Map.class.isAssignableFrom(parameterType); } + /** + * Is request part with map type + * + * @param parameter the parameter + * @return the boolean + */ + private boolean isRequestPartWithMapType(MethodParameter parameter) { + // Check for @RequestPart annotation + org.springframework.web.bind.annotation.RequestPart requestPart = parameter.getParameterAnnotation(org.springframework.web.bind.annotation.RequestPart.class); + if (requestPart == null) { + return false; + } + // Check if the parameter type is assignable to Map + Class parameterType = parameter.getParameterType(); + return Map.class.isAssignableFrom(parameterType); + } + /** * Sets params. * @@ -617,19 +653,43 @@ public Parameter buildParam(ParameterInfo parameterInfo, Components components, /** * Apply bean validator annotations. * + * @param methodParameter the method parameter * @param parameter the parameter * @param annotations the annotations * @param isParameterObject the is parameter object + * @param openapiVersion the openapi version */ - public void applyBeanValidatorAnnotations(final Parameter parameter, final List annotations, final boolean isParameterObject) { - Map annos = new HashMap<>(); - if (annotations != null) - annotations.forEach(annotation -> annos.put(annotation.annotationType().getSimpleName(), annotation)); - boolean annotationExists = hasNotNullAnnotation(annos.keySet()); - if (annotationExists && !isParameterObject) + public void applyBeanValidatorAnnotations(final MethodParameter methodParameter, final Parameter parameter, final List annotations, final boolean isParameterObject, String openapiVersion) { + boolean annotatedNotNull = annotations != null && SchemaUtils.annotatedNotNull(annotations); + if (annotatedNotNull && !isParameterObject) { parameter.setRequired(true); - Schema schema = parameter.getSchema(); - applyValidationsToSchema(annos, schema); + } + if (annotations != null) { + Schema schema = parameter.getSchema(); + SchemaUtils.applyValidationsToSchema(schema, annotations, openapiVersion); + if (schema instanceof ArraySchema && methodParameter instanceof DelegatingMethodParameter mp) { + java.lang.reflect.AnnotatedType annotatedType = null; + if (isParameterObject) { + Field field = mp.getField(); + if (field != null) { + annotatedType = field.getAnnotatedType(); + } + } + else { + java.lang.reflect.Parameter param = mp.getParameter(); + annotatedType = param.getAnnotatedType(); + } + if (annotatedType instanceof AnnotatedParameterizedType paramType) { + java.lang.reflect.AnnotatedType[] typeArgs = paramType.getAnnotatedActualTypeArguments(); + for (java.lang.reflect.AnnotatedType typeArg : typeArgs) { + List genericAnnotations = Arrays.stream(typeArg.getAnnotations()).toList(); + Schema schemaItemsClone = cloneViaJson(schema.getItems(), Schema.class, ObjectMapperProvider.createJson(parameterBuilder.getPropertyResolverUtils().getSpringDocConfigProperties())); + schema.items(schemaItemsClone); + SchemaUtils.applyValidationsToSchema(schemaItemsClone, genericAnnotations, openapiVersion); + } + } + } + } } /** @@ -652,7 +712,7 @@ public void applyBeanValidatorAnnotations(final RequestBody requestBody, final L .filter(annotation -> io.swagger.v3.oas.annotations.parameters.RequestBody.class.equals(annotation.annotationType())) .anyMatch(annotation -> ((io.swagger.v3.oas.annotations.parameters.RequestBody) annotation).required()); } - boolean validationExists = hasNotNullAnnotation(annos.keySet()); + boolean validationExists = SchemaUtils.annotatedNotNull(annos.values().stream().toList()); if (validationExists || (!isOptional && (springRequestBodyRequired || swaggerRequestBodyRequired))) requestBody.setRequired(true); @@ -685,26 +745,6 @@ public GenericParameterService getParameterBuilder() { return parameterBuilder; } - /** - * Calculate size. - * - * @param annos the annos - * @param schema the schema - */ - private void calculateSize(Map annos, Schema schema) { - if (annos.containsKey(Size.class.getSimpleName())) { - Size size = (Size) annos.get(Size.class.getSimpleName()); - if (OPENAPI_ARRAY_TYPE.equals(schema.getType())) { - schema.setMinItems(size.min()); - schema.setMaxItems(size.max()); - } - else if (OPENAPI_STRING_TYPE.equals(schema.getType())) { - schema.setMinLength(size.min()); - schema.setMaxLength(size.max()); - } - } - } - /** * Gets api parameters. * @@ -732,46 +772,6 @@ private Map getApiParamete return apiParametersMap; } - /** - * Apply validations to schema. - * - * @param annos the annos - * @param schema the schema - */ - private void applyValidationsToSchema(Map annos, Schema schema) { - if (annos.containsKey(Min.class.getSimpleName())) { - Min min = (Min) annos.get(Min.class.getSimpleName()); - schema.setMinimum(BigDecimal.valueOf(min.value())); - } - if (annos.containsKey(Max.class.getSimpleName())) { - Max max = (Max) annos.get(Max.class.getSimpleName()); - schema.setMaximum(BigDecimal.valueOf(max.value())); - } - calculateSize(annos, schema); - if (annos.containsKey(DecimalMin.class.getSimpleName())) { - DecimalMin min = (DecimalMin) annos.get(DecimalMin.class.getSimpleName()); - if (min.inclusive()) - schema.setMinimum(BigDecimal.valueOf(Double.parseDouble(min.value()))); - else - schema.setExclusiveMinimum(true); - } - if (annos.containsKey(DecimalMax.class.getSimpleName())) { - DecimalMax max = (DecimalMax) annos.get(DecimalMax.class.getSimpleName()); - if (max.inclusive()) - schema.setMaximum(BigDecimal.valueOf(Double.parseDouble(max.value()))); - else - schema.setExclusiveMaximum(true); - } - if (annos.containsKey(POSITIVE_OR_ZERO)) - schema.setMinimum(BigDecimal.ZERO); - if (annos.containsKey(NEGATIVE_OR_ZERO)) - schema.setMaximum(BigDecimal.ZERO); - if (annos.containsKey(Pattern.class.getSimpleName())) { - Pattern pattern = (Pattern) annos.get(Pattern.class.getSimpleName()); - schema.setPattern(pattern.regexp()); - } - } - /** * Is RequestBody param boolean. * @@ -851,13 +851,20 @@ else if (requestBody.content().length > 0) } /** - * Check if the parameter has any of the annotations that make it non-optional + * Gets optional delegating method parameter customizers. * - * @param annotationSimpleNames the annotation simple class named, e.g. NotNull - * @return whether any of the known NotNull annotations are present + * @return the optional delegating method parameter customizers */ - public static boolean hasNotNullAnnotation(Collection annotationSimpleNames) { - return Arrays.stream(ANNOTATIONS_FOR_REQUIRED).anyMatch(annotationSimpleNames::contains); + public Optional> getOptionalDelegatingMethodParameterCustomizers() { + return optionalDelegatingMethodParameterCustomizers; } + /** + * Gets method parameter pojo extractor. + * + * @return the method parameter pojo extractor + */ + public MethodParameterPojoExtractor getMethodParameterPojoExtractor() { + return methodParameterPojoExtractor; + } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericParameterService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericParameterService.java index f29c91198..fb2ed821a 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericParameterService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericParameterService.java @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -62,7 +62,6 @@ import org.apache.commons.lang3.reflect.FieldUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer; import org.springdoc.core.extractor.DelegatingMethodParameter; import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.models.ParameterInfo; @@ -115,11 +114,6 @@ public class GenericParameterService { FILE_TYPES.add(MultipartRequest.class); } - /** - * The Optional delegating method parameter customizer. - */ - private final Optional> optionalDelegatingMethodParameterCustomizers; - /** * The Web conversion service. */ @@ -154,15 +148,13 @@ public class GenericParameterService { * Instantiates a new Generic parameter builder. * * @param propertyResolverUtils the property resolver utils - * @param optionalDelegatingMethodParameterCustomizers the optional list delegating method parameter customizer * @param optionalWebConversionServiceProvider the optional web conversion service provider * @param objectMapperProvider the object mapper provider * @param javadocProviderOptional the javadoc provider */ - public GenericParameterService(PropertyResolverUtils propertyResolverUtils, Optional> optionalDelegatingMethodParameterCustomizers, + public GenericParameterService(PropertyResolverUtils propertyResolverUtils, Optional optionalWebConversionServiceProvider, ObjectMapperProvider objectMapperProvider, Optional javadocProviderOptional) { this.propertyResolverUtils = propertyResolverUtils; - this.optionalDelegatingMethodParameterCustomizers = optionalDelegatingMethodParameterCustomizers; this.optionalWebConversionServiceProvider = optionalWebConversionServiceProvider; this.configurableBeanFactory = propertyResolverUtils.getFactory(); this.expressionContext = (configurableBeanFactory != null ? new BeanExpressionContext(configurableBeanFactory, new RequestScope()) : null); @@ -329,7 +321,7 @@ private void setSchema(io.swagger.v3.oas.annotations.Parameter parameterDoc, Com else { Schema schema = null; try { - if(StringUtils.isNotEmpty(parameterDoc.schema().type()) || !Void.class.equals(parameterDoc.schema().implementation())){ + if (StringUtils.isNotEmpty(parameterDoc.schema().type()) || !Void.class.equals(parameterDoc.schema().implementation())) { schema = AnnotationsUtils.getSchema(parameterDoc.schema(), null, false, parameterDoc.schema().implementation(), components, jsonView, propertyResolverUtils.isOpenapi31()).orElse(null); } // Cast default value @@ -374,7 +366,7 @@ Schema calculateSchema(Components components, ParameterInfo parameterInfo, Reque MethodParameter methodParameter = parameterInfo.getMethodParameter(); if (parameterInfo.getParameterModel() == null || parameterInfo.getParameterModel().getSchema() == null) { - Type type = GenericTypeResolver.resolveType( methodParameter.getGenericParameterType(), methodParameter.getContainingClass()); + Type type = GenericTypeResolver.resolveType(methodParameter.getGenericParameterType(), methodParameter.getContainingClass()); if (type instanceof Class && !((Class) type).isEnum() && optionalWebConversionServiceProvider.isPresent()) { WebConversionServiceProvider webConversionServiceProvider = optionalWebConversionServiceProvider.get(); if (!MethodParameterPojoExtractor.isSwaggerPrimitiveType((Class) type) && methodParameter.getParameterType().getAnnotation(io.swagger.v3.oas.annotations.media.Schema.class) == null) { @@ -432,7 +424,7 @@ private Schema calculateRequestBodySchema(Components components, ParameterInfo p requestBodyInfo.getMergedSchema().addProperty(paramName, schemaN); schemaN = requestBodyInfo.getMergedSchema(); } - else if (parameterInfo.isRequestPart() || schemaN instanceof FileSchema || (schemaN!=null && schemaN.getItems() instanceof FileSchema)) { + else if (parameterInfo.isRequestPart() || ParameterIn.QUERY.toString().equals(parameterInfo.getParamType()) || schemaN instanceof FileSchema || (schemaN != null && schemaN.getItems() instanceof FileSchema)) { schemaN = new ObjectSchema().addProperty(paramName, schemaN); requestBodyInfo.setMergedSchema(schemaN); } @@ -452,7 +444,7 @@ else if (parameterInfo.isRequestPart() || schemaN instanceof FileSchema || (sche * @param parameter the parameter */ private void setExamples(io.swagger.v3.oas.annotations.Parameter parameterDoc, Parameter parameter) { - Map exampleMap = new HashMap<>(); + Map exampleMap = new LinkedHashMap<>(); if (parameterDoc.examples().length == 1 && StringUtils.isBlank(parameterDoc.examples()[0].name())) { Optional exampleOptional = AnnotationsUtils.getExample(parameterDoc.examples()[0]); exampleOptional.ifPresent(parameter::setExample); @@ -552,15 +544,6 @@ public boolean isFile(MethodParameter methodParameter) { } } - /** - * Gets optional delegating method parameter customizers. - * - * @return the optional delegating method parameter customizers - */ - public Optional> getOptionalDelegatingMethodParameterCustomizers() { - return optionalDelegatingMethodParameterCustomizers; - } - /** * Is file boolean. * @@ -715,6 +698,11 @@ public Extension[] extensions() { public String ref() { return schema.ref(); } + + @Override + public Class[] validationGroups() { + return new Class[0]; + } }; } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericResponseService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericResponseService.java index f26f4a90b..2a0542872 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericResponseService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericResponseService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.service; @@ -40,6 +40,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -50,8 +51,6 @@ import java.util.stream.Stream; import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.core.util.AnnotationsUtils; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Operation; @@ -72,6 +71,7 @@ import org.springdoc.core.utils.PropertyResolverUtils; import org.springdoc.core.utils.SpringDocAnnotationsUtils; +import org.springframework.aop.support.AopUtils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -80,6 +80,8 @@ import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ProblemDetail; import org.springframework.util.CollectionUtils; import org.springframework.util.ReflectionUtils; import org.springframework.web.bind.annotation.ControllerAdvice; @@ -95,6 +97,7 @@ import static org.springdoc.core.utils.SpringDocAnnotationsUtils.extractSchema; import static org.springdoc.core.utils.SpringDocAnnotationsUtils.getContent; import static org.springdoc.core.utils.SpringDocAnnotationsUtils.mergeSchema; +import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson; import static org.springdoc.core.utils.SpringDocUtils.getParameterAnnotations; /** @@ -110,6 +113,11 @@ public class GenericResponseService implements ApplicationContextAware { */ private static final String EXTENSION_EXCEPTION_CLASSES = "x-exception-class"; + /** + * The constant LOGGER. + */ + private static final Logger LOGGER = LoggerFactory.getLogger(GenericResponseService.class); + /** * The Response entity exception handler class. */ @@ -145,11 +153,6 @@ public class GenericResponseService implements ApplicationContextAware { */ private final Lock reentrantLock = new ReentrantLock(); - /** - * The constant LOGGER. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(GenericResponseService.class); - /** * A list of all beans annotated with {@code @ControllerAdvice} */ @@ -261,7 +264,7 @@ public ApiResponses build(Components components, HandlerMethod handlerMethod, Op apiResponsesFromDoc.forEach(apiResponses::addApiResponse); // for each one build ApiResponse and add it to existing responses // Fill api Responses - computeResponseFromDoc(components, handlerMethod.getReturnType(), apiResponses, methodAttributes, springDocConfigProperties.isOpenapi31(),methodAttributes.getLocale() ); + computeResponseFromDoc(components, handlerMethod.getReturnType(), apiResponses, methodAttributes, springDocConfigProperties.isOpenapi31(), methodAttributes.getLocale()); buildApiResponses(components, handlerMethod.getReturnType(), apiResponses, methodAttributes); return apiResponses; } @@ -277,7 +280,7 @@ public ApiResponses build(Components components, HandlerMethod handlerMethod, Op private Map filterAndEnrichGenericMapResponseByDeclarations(HandlerMethod handlerMethod, Map genericMapResponse) { if (operationService.getJavadocProvider() != null) { JavadocProvider javadocProvider = operationService.getJavadocProvider(); - for (Map.Entry genericResponse : genericMapResponse.entrySet()) { + for (Entry genericResponse : genericMapResponse.entrySet()) { Map extensions = genericResponse.getValue().getExtensions(); Collection genericExceptions = (Collection) extensions.get(EXTENSION_EXCEPTION_CLASSES); for (Class declaredException : handlerMethod.getMethod().getExceptionTypes()) { @@ -305,13 +308,13 @@ private Map filterAndEnrichGenericMapResponseByDeclarations */ public void buildGenericResponse(Components components, Map findControllerAdvice, Locale locale) { // ControllerAdvice - for (Map.Entry entry : findControllerAdvice.entrySet()) { + for (Entry entry : findControllerAdvice.entrySet()) { List methods = new ArrayList<>(); Object controllerAdvice = entry.getValue(); // get all methods with annotation @ExceptionHandler Class objClz = controllerAdvice.getClass(); - if (org.springframework.aop.support.AopUtils.isAopProxy(controllerAdvice)) - objClz = org.springframework.aop.support.AopUtils.getTargetClass(controllerAdvice); + if (AopUtils.isAopProxy(controllerAdvice)) + objClz = AopUtils.getTargetClass(controllerAdvice); ControllerAdviceInfo controllerAdviceInfo = new ControllerAdviceInfo(controllerAdvice); Arrays.stream(ReflectionUtils.getAllDeclaredMethods(objClz)) .filter(m -> m.isAnnotationPresent(ExceptionHandler.class) @@ -404,7 +407,7 @@ private Map computeResponseFromDoc(Components components, M apiResponse.extensions(extensions); } } - AnnotationsUtils.getHeaders(apiResponseAnnotations.headers(), components, methodAttributes.getJsonViewAnnotation(), openapi31) + SpringDocAnnotationsUtils.getHeaders(apiResponseAnnotations.headers(), components, methodAttributes.getJsonViewAnnotation(), openapi31) .ifPresent(apiResponse::headers); apiResponsesOp.addApiResponse(httpCode, apiResponse); } @@ -422,11 +425,12 @@ private Map computeResponseFromDoc(Components components, M */ private void buildGenericApiResponses(Components components, MethodParameter methodParameter, ApiResponses apiResponsesOp, MethodAttributes methodAttributes) { + ApiResponse apiResponse = null; if (!CollectionUtils.isEmpty(apiResponsesOp)) { // API Responses at operation and @ApiResponse annotation - for (Map.Entry entry : apiResponsesOp.entrySet()) { + for (Entry entry : apiResponsesOp.entrySet()) { String httpCode = entry.getKey(); - ApiResponse apiResponse = entry.getValue(); + apiResponse = entry.getValue(); buildApiResponses(components, methodParameter, apiResponsesOp, methodAttributes, httpCode, apiResponse, true); } } @@ -435,11 +439,22 @@ private void buildGenericApiResponses(Components components, MethodParameter met // available String httpCode = evaluateResponseStatus(methodParameter.getMethod(), Objects.requireNonNull(methodParameter.getMethod()).getClass(), true); if (Objects.nonNull(httpCode)) { - ApiResponse apiResponse = methodAttributes.getGenericMapResponse().containsKey(httpCode) ? methodAttributes.getGenericMapResponse().get(httpCode) + apiResponse = methodAttributes.getGenericMapResponse().containsKey(httpCode) ? methodAttributes.getGenericMapResponse().get(httpCode) : new ApiResponse(); buildApiResponses(components, methodParameter, apiResponsesOp, methodAttributes, httpCode, apiResponse, true); } } + if (apiResponse != null) { + Content content = apiResponse.getContent(); + if (content != null) { + String defaultProducesMediaType = springDocConfigProperties.getDefaultProducesMediaType(); + io.swagger.v3.oas.models.media.MediaType mediaType = content.get(defaultProducesMediaType); + if (mediaType != null && ProblemDetail.class.isAssignableFrom(methodParameter.getParameterType())) { + content.addMediaType(MediaType.APPLICATION_PROBLEM_JSON_VALUE, mediaType); + content.remove(defaultProducesMediaType); + } + } + } } /** @@ -455,7 +470,7 @@ private void buildApiResponses(Components components, MethodParameter methodPara Map genericMapResponse = methodAttributes.getGenericMapResponse(); if (!CollectionUtils.isEmpty(apiResponsesOp) && apiResponsesOp.size() > genericMapResponse.size()) { // API Responses at operation and @ApiResponse annotation - for (Map.Entry entry : apiResponsesOp.entrySet()) { + for (Entry entry : apiResponsesOp.entrySet()) { String httpCode = entry.getKey(); boolean methodAttributesCondition = !methodAttributes.isMethodOverloaded() || (methodAttributes.isMethodOverloaded() && isValidHttpCode(httpCode, methodParameter)); if (!genericMapResponse.containsKey(httpCode) && methodAttributesCondition) { @@ -608,10 +623,10 @@ else if (CollectionUtils.isEmpty(apiResponse.getContent())) } } if (apiResponse.getContent() != null && (methodAttributes.isUseReturnTypeSchema() || - ((isGeneric || methodAttributes.isMethodOverloaded()) && methodAttributes.isNoApiResponseDoc()))) { + ((isGeneric || methodAttributes.isMethodOverloaded()) && methodAttributes.isNoApiResponseDoc()))) { // Merge with existing schema Content existingContent = apiResponse.getContent(); - Type type = GenericTypeResolver.resolveType( methodParameter.getGenericParameterType(), methodParameter.getContainingClass()); + Type type = GenericTypeResolver.resolveType(methodParameter.getGenericParameterType(), methodParameter.getContainingClass()); Schema schemaN = calculateSchema(components, type, methodAttributes.getJsonViewAnnotation(), getParameterAnnotations(methodParameter)); if (schemaN != null && ArrayUtils.isNotEmpty(methodAttributes.getMethodProduces())) @@ -675,7 +690,7 @@ else if (returnType instanceof ParameterizedType parameterizedType) { */ private ControllerAdviceBean getControllerAdviceBean(List controllerAdviceBeans, Object controllerAdvice) { return controllerAdviceBeans.stream() - .filter(controllerAdviceBean -> (controllerAdviceBean.getBeanType()!=null && controllerAdviceBean.getBeanType().isAssignableFrom(controllerAdvice.getClass()))) + .filter(controllerAdviceBean -> (controllerAdviceBean.getBeanType() != null && controllerAdviceBean.getBeanType().isAssignableFrom(controllerAdvice.getClass()))) .findFirst() .orElse(null); } @@ -693,8 +708,8 @@ private Map getGenericMapResponse(HandlerMethod handlerMeth List controllerAdviceInfosInThisBean = localExceptionHandlers.stream() .filter(controllerInfo -> { Class objClz = controllerInfo.getControllerAdvice().getClass(); - if (org.springframework.aop.support.AopUtils.isAopProxy(controllerInfo.getControllerAdvice())) - objClz = org.springframework.aop.support.AopUtils.getTargetClass(controllerInfo.getControllerAdvice()); + if (AopUtils.isAopProxy(controllerInfo.getControllerAdvice())) + objClz = AopUtils.getTargetClass(controllerInfo.getControllerAdvice()); return beanType.equals(objClz); }) .toList(); @@ -704,9 +719,9 @@ private Map getGenericMapResponse(HandlerMethod handlerMeth .collect(LinkedHashMap::new, Map::putAll, Map::putAll); List controllerAdviceInfosNotInThisBean = controllerAdviceInfos.stream() - .filter(controllerAdviceInfo -> + .filter(controllerAdviceInfo -> getControllerAdviceBean(controllerAdviceBeans, controllerAdviceInfo.getControllerAdvice()) - .isApplicableToBeanType(beanType)) + .isApplicableToBeanType(beanType)) .filter(controllerAdviceInfo -> !beanType.equals(controllerAdviceInfo.getControllerAdvice().getClass())) .toList(); @@ -737,17 +752,7 @@ private Map getGenericMapResponse(HandlerMethod handlerMeth } } } - - LinkedHashMap genericApiResponsesClone; - try { - ObjectMapper objectMapper = ObjectMapperProvider.createJson(springDocConfigProperties); - genericApiResponsesClone = objectMapper.readValue(objectMapper.writeValueAsString(genericApiResponseMap), ApiResponses.class); - return genericApiResponsesClone; - } - catch (JsonProcessingException e) { - LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage()); - return genericApiResponseMap; - } + return cloneViaJson(genericApiResponseMap, ApiResponses.class, ObjectMapperProvider.createJson(springDocConfigProperties)); } finally { reentrantLock.unlock(); @@ -772,7 +777,7 @@ private boolean isValidHttpCode(String httpCode, MethodParameter methodParameter final io.swagger.v3.oas.annotations.Operation apiOperation = AnnotatedElementUtils.findMergedAnnotation(method, io.swagger.v3.oas.annotations.Operation.class); if (apiOperation != null) { - responseSet = new HashSet<>(Arrays.asList(apiOperation.responses())); + responseSet = new HashSet<>(asList(apiOperation.responses())); if (isHttpCodePresent(httpCode, responseSet)) result = true; } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java index 1d382c7db..2b7504e69 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java @@ -21,11 +21,13 @@ * * * * * * * * * - * + * */ package org.springdoc.core.service; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -45,12 +47,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.core.jackson.TypeNameResolver; import io.swagger.v3.core.util.AnnotationsUtils; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.Webhook; import io.swagger.v3.oas.annotations.Webhooks; import io.swagger.v3.oas.annotations.security.SecuritySchemes; import io.swagger.v3.oas.annotations.tags.Tag; @@ -95,12 +97,14 @@ import static org.springdoc.core.utils.Constants.DEFAULT_SERVER_DESCRIPTION; import static org.springdoc.core.utils.Constants.DEFAULT_TITLE; import static org.springdoc.core.utils.Constants.DEFAULT_VERSION; +import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson; import static org.springdoc.core.utils.SpringDocUtils.getConfig; /** * The type Open api builder. * * @author bnasslahsen + * @author zdary */ public class OpenAPIService implements ApplicationContextAware { @@ -174,11 +178,6 @@ public class OpenAPIService implements ApplicationContextAware { */ private boolean isServersPresent; - /** - * The Server base url. - */ - private String serverBaseUrl; - /** * Instantiates a new Open api builder. * @@ -247,14 +246,7 @@ public OpenAPI build(Locale locale) { calculatedOpenAPI.setPaths(new Paths()); } else { - try { - ObjectMapper objectMapper = new ObjectMapper(); - calculatedOpenAPI = objectMapper.readValue(objectMapper.writeValueAsString(openAPI), OpenAPI.class); - } - catch (JsonProcessingException e) { - LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage()); - calculatedOpenAPI = openAPI; - } + calculatedOpenAPI = cloneViaJson(openAPI, OpenAPI.class, new ObjectMapper()); } if (apiDef.isPresent()) { @@ -296,9 +288,10 @@ private void initializeHiddenRestController() { /** * Update servers open api. * - * @param openAPI the open api + * @param serverBaseUrl the server base url + * @param openAPI the open api */ - public void updateServers(OpenAPI openAPI) { + public void updateServers(String serverBaseUrl, OpenAPI openAPI) { if (!isServersPresent && serverBaseUrl != null) // default server value { Server server = new Server().url(serverBaseUrl).description(DEFAULT_SERVER_DESCRIPTION); @@ -477,7 +470,7 @@ public Schema resolveProperties(Schema schema, Locale locale) { if (!CollectionUtils.isEmpty(properties)) { LinkedHashMap resolvedSchemas = properties.entrySet().stream().map(es -> { es.setValue(resolveProperties(es.getValue(), locale)); - if (es.getValue().getItems() !=null ) { + if (es.getValue().getItems() != null) { resolveProperties(es.getValue().getItems(), locale); } return es; @@ -493,18 +486,17 @@ public Schema resolveProperties(Schema schema, Locale locale) { * * @param serverBaseUrl the server base url * @param httpRequest the http request + * @return the string */ - public void setServerBaseUrl(String serverBaseUrl, HttpRequest httpRequest) { + public String calculateServerBaseUrl(String serverBaseUrl, HttpRequest httpRequest) { String customServerBaseUrl = serverBaseUrl; - if (serverBaseUrlCustomizers.isPresent()) { for (ServerBaseUrlCustomizer customizer : serverBaseUrlCustomizers.get()) { customServerBaseUrl = customizer.customize(customServerBaseUrl, httpRequest); } } - this.serverBaseUrl = customServerBaseUrl; - + return customServerBaseUrl; } /** @@ -539,64 +531,105 @@ private Optional getOpenAPIDefinition() { return Optional.ofNullable(apiDef); } + /** - * Get webhooks webhooks [ ]. + * Gets webhooks from given classes. * - * @return the webhooks [ ] + * @param classes Array of classes to scan for webhooks. + * @return An array of {@link Webhooks} annotations found in the given classes. */ - public Webhooks[] getWebhooks() { - // List to collect all Webhooks annotations + public Webhooks[] getWebhooks(Class[] classes) { List allWebhooks = new ArrayList<>(); - // Get beans with @Webhooks annotation managed by Spring - Map beansWithWebhooksAnnotation = context.getBeansWithAnnotation(Webhooks.class); + for (Class clazz : classes) { + // Class-level annotations + collectWebhooksFromElement(clazz, allWebhooks); - // Process Spring-managed beans - if (!beansWithWebhooksAnnotation.isEmpty()) { - beansWithWebhooksAnnotation.values().forEach(controller -> { - // Get the @Webhooks annotation(s) from each bean - Webhooks[] webhooksAnnotations = controller.getClass().getAnnotationsByType(Webhooks.class); - allWebhooks.addAll(Arrays.asList(webhooksAnnotations)); - }); + // Method-level annotations + for (Method method : clazz.getDeclaredMethods()) { + collectWebhooksFromElement(method, allWebhooks); + } } - // If no beans with @Webhooks annotation found, perform classpath scanning - if (allWebhooks.isEmpty()) { - ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false); - scanner.addIncludeFilter(new AnnotationTypeFilter(Webhooks.class)); + return allWebhooks.toArray(new Webhooks[0]); + } - // Scan base packages if available - if (AutoConfigurationPackages.has(context)) { - List packagesToScan = AutoConfigurationPackages.get(context); - for (String basePackage : packagesToScan) { - // Perform the scan and get candidate components - Set components = scanner.findCandidateComponents(basePackage); - - // Loop through the components - for (BeanDefinition beanDefinition : components) { - try { - // Get the class name and load the class - String className = beanDefinition.getBeanClassName(); - Class clazz = Class.forName(className); - - // Get @Webhooks annotation from the class - Webhooks[] webhooksAnnotations = clazz.getAnnotationsByType(Webhooks.class); - allWebhooks.addAll(Arrays.asList(webhooksAnnotations)); - - } catch (ClassNotFoundException e) { - // Log the error if the class is not found - LOGGER.error("Class not found in classpath: {}", e.getMessage()); - } + /** + * Retrieves all classes related to webhooks. + * This method scans for classes annotated with {@link Webhooks} or {@link Webhook}, + * first checking Spring-managed beans and then falling back to classpath scanning + * if no annotated beans are found. + * + * @return An array of classes related to webhooks. + */ + public Class[] getWebhooksClasses() { + Set> allWebhookClassesToScan = new HashSet<>(); + + // First: scan Spring-managed beans + Map beans = context.getBeansWithAnnotation(Webhooks.class); + + for (Object bean : beans.values()) { + Class beanClass = bean.getClass(); + allWebhookClassesToScan.add(beanClass); + } + + // Fallback: classpath scanning + ClassPathScanningCandidateComponentProvider scanner = + new ClassPathScanningCandidateComponentProvider(false); + scanner.addIncludeFilter(new AnnotationTypeFilter(Webhooks.class)); + scanner.addIncludeFilter(new AnnotationTypeFilter(Webhook.class)); + + if (AutoConfigurationPackages.has(context)) { + for (String basePackage : AutoConfigurationPackages.get(context)) { + Set candidates = scanner.findCandidateComponents(basePackage); + for (BeanDefinition bd : candidates) { + try { + Class clazz = Class.forName(bd.getBeanClassName()); + allWebhookClassesToScan.add(clazz); + } + catch (ClassNotFoundException e) { + LOGGER.error("Class not found in classpath: {}", e.getMessage()); } } } } - // Convert the list of Webhooks annotations to an array and return - return allWebhooks.toArray(new Webhooks[0]); + return allWebhookClassesToScan.toArray(new Class[0]); + } + + + /** + * Collect webhooks from element. + * + * @param element the element + * @param collector the collector + */ + private void collectWebhooksFromElement(AnnotatedElement element, List collector) { + // If @Webhooks is present (container) + Webhooks container = element.getAnnotation(Webhooks.class); + if (container != null) { + collector.add(container); + } + + // If individual @Webhook annotations are present + Webhook[] individualWebhooks = element.getAnnotationsByType(Webhook.class); + if (individualWebhooks.length > 0) { + collector.add(new Webhooks() { + @Override + public Webhook[] value() { + return individualWebhooks; + } + + @Override + public Class annotationType() { + return Webhooks.class; + } + }); + } } + /** * Build open api with open api definition. * @@ -606,9 +639,11 @@ public Webhooks[] getWebhooks() { */ private void buildOpenAPIWithOpenAPIDefinition(OpenAPI openAPI, OpenAPIDefinition apiDef, Locale locale) { boolean isOpenapi3 = propertyResolverUtils.isOpenapi31(); - Map extensions = AnnotationsUtils.getExtensions(isOpenapi3, apiDef.info().extensions()); // info - AnnotationsUtils.getInfo(apiDef.info(),true).map(info -> resolveProperties(info, extensions, locale)).ifPresent(openAPI::setInfo); + AnnotationsUtils.getInfo(apiDef.info(), true).map(info -> { + Map extensions = AnnotationsUtils.getExtensions(isOpenapi3, apiDef.info().extensions()); + return resolveProperties(info, extensions, locale); + }).ifPresent(openAPI::setInfo); // OpenApiDefinition security requirements securityParser.getSecurityRequirements(apiDef.security()).ifPresent(openAPI::setSecurity); // OpenApiDefinition external docs @@ -672,10 +707,12 @@ private Info resolveProperties(Info info, Map extensions, Locale resolveProperty(contact::getUrl, contact::url, propertyResolverUtils, locale); } - if (propertyResolverUtils.isResolveExtensionsProperties() && extensions != null) { + if (extensions != null) { Map extensionsResolved = propertyResolverUtils.resolveExtensions(locale, extensions); - if(propertyResolverUtils.isOpenapi31()) + if (propertyResolverUtils.isOpenapi31()) { extensionsResolved.forEach(info::addExtension31); + info.setExtensions(extensionsResolved); + } else info.setExtensions(extensionsResolved); } @@ -683,7 +720,6 @@ private Info resolveProperties(Info info, Map extensions, Locale return info; } - /** * Resolve property. * diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OperationService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OperationService.java index f4728a818..ebca547e6 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OperationService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OperationService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.service; @@ -337,7 +337,7 @@ private Optional getApiResponses( buildResponseContent(methodAttributes, components, classProduces, methodProduces, apiResponsesOp, response, apiResponseObject); - AnnotationsUtils.getHeaders(response.headers(), components, null, propertyResolverUtils.isOpenapi31()).ifPresent(apiResponseObject::headers); + SpringDocAnnotationsUtils.getHeaders(response.headers(), components, null, propertyResolverUtils.isOpenapi31()).ifPresent(apiResponseObject::headers); // Make schema as string if empty calculateHeader(apiResponseObject); if (isResponseObject(apiResponseObject)) { @@ -562,7 +562,7 @@ public JavadocProvider getJavadocProvider() { * * @return propertyResolverUtils property resolver utils */ - public PropertyResolverUtils getPropertyResolverUtils(){ + public PropertyResolverUtils getPropertyResolverUtils() { return parameterBuilder.getPropertyResolverUtils(); } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/RequestBodyService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/RequestBodyService.java index ee91bc01b..0f48e5f8e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/RequestBodyService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/RequestBodyService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.service; @@ -35,9 +35,11 @@ import io.swagger.v3.core.util.AnnotationsUtils; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.media.Content; +import io.swagger.v3.oas.models.media.Encoding; import io.swagger.v3.oas.models.media.MediaType; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.RequestBody; +import jakarta.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; import org.springdoc.core.models.MethodAttributes; import org.springdoc.core.models.ParameterInfo; @@ -46,6 +48,7 @@ import org.springdoc.core.utils.SpringDocAnnotationsUtils; import org.springframework.core.MethodParameter; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RequestPart; import static org.springdoc.core.utils.SpringDocAnnotationsUtils.mergeSchema; @@ -113,7 +116,7 @@ public Optional buildRequestBodyFromDoc( } if (requestBody.required()) { - requestBodyObject.setRequired(requestBody.required()); + requestBodyObject.setRequired(true); isEmpty = false; } if (requestBody.extensions().length > 0) { @@ -128,7 +131,7 @@ public Optional buildRequestBodyFromDoc( if (isEmpty) return Optional.empty(); - buildResquestBodyContent(requestBody, requestBodyOp, methodAttributes, components, jsonViewAnnotation, classConsumes, methodConsumes, requestBodyObject); + buildRequestBodyContent(requestBody, requestBodyOp, methodAttributes, components, jsonViewAnnotation, classConsumes, methodConsumes, requestBodyObject); return Optional.of(requestBodyObject); } @@ -145,7 +148,10 @@ public Optional buildRequestBodyFromDoc( * @param methodConsumes the method consumes * @param requestBodyObject the request body object */ - private void buildResquestBodyContent(io.swagger.v3.oas.annotations.parameters.RequestBody requestBody, RequestBody requestBodyOp, MethodAttributes methodAttributes, Components components, JsonView jsonViewAnnotation, String[] classConsumes, String[] methodConsumes, RequestBody requestBodyObject) { + private void buildRequestBodyContent(io.swagger.v3.oas.annotations.parameters.RequestBody requestBody, + RequestBody requestBodyOp, MethodAttributes methodAttributes, + Components components, JsonView jsonViewAnnotation, String[] classConsumes, + String[] methodConsumes, RequestBody requestBodyObject) { Optional optionalContent = SpringDocAnnotationsUtils .getContent(requestBody.content(), getConsumes(classConsumes), getConsumes(methodConsumes), null, components, jsonViewAnnotation, parameterBuilder.isOpenapi31()); @@ -251,11 +257,7 @@ public void calculateRequestBodyInfo(Components components, MethodAttributes met ParameterInfo parameterInfo, RequestBodyInfo requestBodyInfo) { RequestBody requestBody = requestBodyInfo.getRequestBody(); MethodParameter methodParameter = parameterInfo.getMethodParameter(); - // Get it from parameter level, if not present - if (requestBody == null) { - io.swagger.v3.oas.annotations.parameters.RequestBody requestBodyDoc = methodParameter.getParameterAnnotation(io.swagger.v3.oas.annotations.parameters.RequestBody.class); - requestBody = this.buildRequestBodyFromDoc(requestBodyDoc, methodAttributes, components).orElse(null); - } + RequestPart requestPart = methodParameter.getParameterAnnotation(RequestPart.class); String paramName = null; @@ -267,7 +269,8 @@ public void calculateRequestBodyInfo(Components components, MethodAttributes met paramName = StringUtils.defaultIfEmpty(paramName, parameterInfo.getpName()); parameterInfo.setpName(paramName); - requestBody = buildRequestBody(requestBody, components, methodAttributes, parameterInfo, + io.swagger.v3.oas.annotations.parameters.RequestBody requestBodyDoc = methodParameter.getParameterAnnotation(io.swagger.v3.oas.annotations.parameters.RequestBody.class); + requestBody = buildRequestBody(requestBodyDoc, components, methodAttributes, parameterInfo, requestBodyInfo); requestBodyInfo.setRequestBody(requestBody); } @@ -275,31 +278,29 @@ public void calculateRequestBodyInfo(Components components, MethodAttributes met /** * Build request body. * - * @param requestBody the request body + * @param requestBodyDoc the request body doc * @param components the components * @param methodAttributes the method attributes * @param parameterInfo the parameter info * @param requestBodyInfo the request body info * @return the request body */ - private RequestBody buildRequestBody(RequestBody requestBody, Components components, + private RequestBody buildRequestBody(io.swagger.v3.oas.annotations.parameters.RequestBody requestBodyDoc, Components components, MethodAttributes methodAttributes, ParameterInfo parameterInfo, RequestBodyInfo requestBodyInfo) { + RequestBody requestBody = requestBodyInfo.getRequestBody(); if (requestBody == null) { requestBody = new RequestBody(); requestBodyInfo.setRequestBody(requestBody); } - if (requestBody.getContent() == null) { - Schema schema = parameterBuilder.calculateSchema(components, parameterInfo, requestBodyInfo, - methodAttributes.getJsonViewAnnotationForRequestBody()); - buildContent(requestBody, methodAttributes, schema); - } - else if (!methodAttributes.isWithResponseBodySchemaDoc()) { - Schema schema = parameterBuilder.calculateSchema(components, parameterInfo, requestBodyInfo, - methodAttributes.getJsonViewAnnotationForRequestBody()); - mergeContent(requestBody, methodAttributes, schema); - } + if (requestBodyDoc != null) + requestBody = this.buildRequestBodyFromDoc(requestBodyDoc, methodAttributes, components).orElse(requestBody); + + Schema schema = parameterBuilder.calculateSchema(components, parameterInfo, requestBodyInfo, + methodAttributes.getJsonViewAnnotationForRequestBody()); + Map parameterEncoding = getParameterEncoding(parameterInfo); + buildContent(requestBody, methodAttributes, schema, parameterEncoding); // Add requestBody javadoc if (StringUtils.isBlank(requestBody.getDescription()) && parameterBuilder.getJavadocProvider() != null @@ -312,43 +313,27 @@ else if (!methodAttributes.isWithResponseBodySchemaDoc()) { return requestBody; } - /** - * Merge content. - * - * @param requestBody the request body - * @param methodAttributes the method attributes - * @param schema the schema - */ - private void mergeContent(RequestBody requestBody, MethodAttributes methodAttributes, Schema schema) { - Content content = requestBody.getContent(); - buildContent(requestBody, methodAttributes, schema, content); - } - /** * Build content. * - * @param requestBody the request body - * @param methodAttributes the method attributes - * @param schema the schema + * @param requestBody the request body + * @param methodAttributes the method attributes + * @param schema the schema + * @param parameterEncoding the parameter encoding */ - private void buildContent(RequestBody requestBody, MethodAttributes methodAttributes, Schema schema) { - Content content = new Content(); - buildContent(requestBody, methodAttributes, schema, content); - } + private void buildContent(RequestBody requestBody, MethodAttributes methodAttributes, Schema schema, Map parameterEncoding) { + Content content; + if (requestBody.getContent() == null) { + content = new Content(); + } + else { + content = requestBody.getContent(); + } - /** - * Build content. - * - * @param requestBody the request body - * @param methodAttributes the method attributes - * @param schema the schema - * @param content the content - */ - private void buildContent(RequestBody requestBody, MethodAttributes methodAttributes, Schema schema, Content content) { for (String value : methodAttributes.getMethodConsumes()) { - io.swagger.v3.oas.models.media.MediaType mediaTypeObject = new io.swagger.v3.oas.models.media.MediaType(); - mediaTypeObject.setSchema(schema); + MediaType mediaTypeObject = new MediaType(); MediaType mediaType = content.get(value); + mediaTypeObject.setSchema(schema); if (mediaType != null) { if (mediaType.getExample() != null) mediaTypeObject.setExample(mediaType.getExample()); @@ -356,9 +341,40 @@ private void buildContent(RequestBody requestBody, MethodAttributes methodAttrib mediaTypeObject.setExamples(mediaType.getExamples()); if (mediaType.getEncoding() != null) mediaTypeObject.setEncoding(mediaType.getEncoding()); + if (mediaType.getSchema() != null) + mediaTypeObject.setSchema(mediaType.getSchema()); + } + else if (!CollectionUtils.isEmpty(parameterEncoding)) { + mediaTypeObject.setEncoding(parameterEncoding); } content.addMediaType(value, mediaTypeObject); } requestBody.setContent(content); } + + /** + * Gets parameter encoding. + * + * @param parameterInfo the parameter info + * @return the parameter encoding + */ + @NotNull + private Map getParameterEncoding(ParameterInfo parameterInfo) { + if (parameterInfo.getParameterModel() != null) { + Content parameterContent = parameterInfo.getParameterModel().getContent(); + if (parameterContent != null && parameterContent.size() == 1) { + Map encoding = parameterContent.values().iterator().next().getEncoding(); + if (!CollectionUtils.isEmpty(encoding)) { + return encoding; + } + else { + String encodingContentType = parameterContent.keySet().iterator().next(); + if (StringUtils.isNotBlank(encodingContentType)) { + return Map.of(parameterInfo.getpName(), new Encoding().contentType(encodingContentType)); + } + } + } + } + return Map.of(); + } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecuritySchemePair.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecuritySchemePair.java index fa98e480c..7b2928281 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecuritySchemePair.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecuritySchemePair.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.service; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecurityService.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecurityService.java index d664bbfd7..a06260149 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecurityService.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/SecurityService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.service; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/Constants.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/Constants.java index 9453a832d..3e0b065ae 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/Constants.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/Constants.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.utils; @@ -45,8 +45,8 @@ public final class Constants { /** * The constant SPRINGDOC_SWAGGER_PREFIX. */ - public static final String SPRINGDOC_SWAGGER_PREFIX =SPRINGDOC_PREFIX+".swagger-ui"; - + public static final String SPRINGDOC_SWAGGER_PREFIX = SPRINGDOC_PREFIX + ".swagger-ui"; + /** * The constant DEFAULT_API_DOCS_URL. */ @@ -424,6 +424,21 @@ public final class Constants { */ public static final String SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED = "springdoc.nullable-request-parameter-enabled"; + /** + * The constant SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT. + */ + public static final String SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT = "springdoc.default-flat-param-object"; + + /** + * The constant SPRINGDOC_ENABLE_ADDITIONAL_SCHEMAS_RESOLUTION. + */ + public static final String SPRINGDOC_ENABLE_EXTRA_SCHEMAS = "springdoc.enable-extra-schemas"; + + /** + * The constant SPRINGDOC_EXPLICIT_OBJECT_SCHEMA. + */ + public static final String SPRINGDOC_EXPLICIT_OBJECT_SCHEMA = "springdoc.explicit-object-schema"; + /** * Instantiates a new Constants. */ diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/EntityInfo.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/EntityInfo.java index 77b2fb58f..dfdf32622 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/EntityInfo.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/EntityInfo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.utils; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/PropertyResolverUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/PropertyResolverUtils.java index a98d7a5e3..d8f3149d7 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/PropertyResolverUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/PropertyResolverUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.utils; @@ -30,10 +30,9 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; - -import io.swagger.v3.oas.models.SpecVersion; import java.util.stream.Collectors; +import io.swagger.v3.oas.models.SpecVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springdoc.core.properties.SpringDocConfigProperties; @@ -117,9 +116,9 @@ public String resolve(String parameterProperty, Locale locale) { * and removes it. * If the input text is {@code null}, the method returns {@code null}. * - * @param text The original string with possible leading indentation. - * @return The string with the smallest common leading indentation removed from each line, - * or {@code null} if the input text is {@code null}. + * @param text The original string with possible leading indentation. + * @return The string with the smallest common leading indentation removed from each line, + * or {@code null} if the input text is {@code null}. */ public String trimIndent(String text) { if (text == null) { @@ -132,7 +131,8 @@ public String trimIndent(String text) { return Arrays.stream(lines) .map(line -> line.substring(Math.min(line.length(), minIndent))) .collect(Collectors.joining(newLine)); - } catch (Exception ex) { + } + catch (Exception ex) { LOGGER.warn(ex.getMessage()); return text; } @@ -146,10 +146,10 @@ public String trimIndent(String text) { */ private int resolveMinIndent(String[] lines) { return Arrays.stream(lines) - .filter(line -> !line.trim().isEmpty()) - .mapToInt(this::countLeadingSpaces) - .min() - .orElse(0); + .filter(line -> !line.trim().isEmpty()) + .mapToInt(this::countLeadingSpaces) + .min() + .orElse(0); } /** @@ -159,13 +159,13 @@ private int resolveMinIndent(String[] lines) { * @return the int */ private int countLeadingSpaces(String line) { - int count = 0; - for (char ch : line.toCharArray()) { - if (ch != ' ' && ch != '\t') break; - count++; - } - return count; - } + int count = 0; + for (char ch : line.toCharArray()) { + if (ch != ' ' && ch != '\t') break; + count++; + } + return count; + } /** * Gets factory. @@ -224,21 +224,27 @@ public Map resolveExtensions(Locale locale, Map Map extensionsResolved = new HashMap<>(); extensions.forEach((key, value) -> { String keyResolved = resolve(key, locale); - if (value instanceof HashMap) { + if (value instanceof HashMap valueAsMap) { Map valueResolved = new HashMap<>(); - ((HashMap) value).forEach((key1, value1) -> { + valueAsMap.forEach((key1, value1) -> { String key1Resolved = resolve(key1.toString(), locale); String value1Resolved = resolve(value1.toString(), locale); valueResolved.put(key1Resolved, value1Resolved); }); extensionsResolved.put(keyResolved, valueResolved); } - else + else if (value instanceof String valueAsString) { + String valueResolved = resolve(valueAsString, locale); + extensionsResolved.put(keyResolved, valueResolved); + } + else { extensionsResolved.put(keyResolved, value); + } }); return extensionsResolved; } - else + else { return extensions; + } } } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SchemaUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SchemaUtils.java new file mode 100644 index 000000000..70f641e32 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SchemaUtils.java @@ -0,0 +1,501 @@ +package org.springdoc.core.utils; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.Set; +import java.util.stream.Collectors; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; +import io.swagger.v3.oas.models.media.Schema; +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Negative; +import jakarta.validation.constraints.NegativeOrZero; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; +import jakarta.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.Size; +import org.springdoc.core.properties.SpringDocConfigProperties.ApiDocs.OpenApiVersion; + +import org.springframework.lang.Nullable; + +import static org.springdoc.core.utils.Constants.OPENAPI_ARRAY_TYPE; +import static org.springdoc.core.utils.Constants.OPENAPI_STRING_TYPE; +import static org.springdoc.core.utils.SpringDocKotlinUtils.isKotlinDeclaringClass; +import static org.springdoc.core.utils.SpringDocKotlinUtils.kotlinConstructorParamIsOptional; +import static org.springdoc.core.utils.SpringDocKotlinUtils.kotlinNullability; + +/** + * The type Validation utils. + * + * @author dyun + */ +public class SchemaUtils { + + /** + * The constant JAVA_FIELD_NULLABLE_DEFAULT. + */ + public static final Boolean JAVA_FIELD_NULLABLE_DEFAULT = true; + + /** + * The constant ANNOTATIONS_FOR_REQUIRED. + */ + // using string litterals to support both validation-api v1 and v2 + public static final List ANNOTATIONS_FOR_REQUIRED = Arrays.asList("NotNull", "NonNull", "NotBlank", + "NotEmpty"); + + /** + * The constant ANNOTATIONS_FOR_NULLABLE. + */ + public static final List ANNOTATIONS_FOR_NULLABLE = + Arrays.asList("Nullable"); + /** + * The constant OPTIONAL_TYPES. + */ + private static final Set> OPTIONAL_TYPES = new HashSet<>(); + + static { + OPTIONAL_TYPES.add(Optional.class); + OPTIONAL_TYPES.add(OptionalInt.class); + OPTIONAL_TYPES.add(OptionalLong.class); + OPTIONAL_TYPES.add(OptionalDouble.class); + } + + /** + * The Kotlin utils optional. + */ + private final Optional kotlinUtilsOptional; + + /** + * The constructor. + * + * @param kotlinUtilsOptional the kotlin utils optional + */ + public SchemaUtils(Optional kotlinUtilsOptional) { + this.kotlinUtilsOptional = kotlinUtilsOptional; + } + + /** + * Is swagger visible. + * + * @param schema the schema + * @param parameter the parameter + * @return the boolean + */ + public static boolean swaggerVisible(@Nullable io.swagger.v3.oas.annotations.media.Schema schema, + @Nullable Parameter parameter) { + if (parameter != null) { + return !parameter.hidden(); + } + if (schema != null) { + return !schema.hidden(); + } + return true; + } + + /** + * Is swagger required. it may return {@code null} if not specified require value or + * mode + * + * @param schema the schema + * @param parameter the parameter + * @return the boolean or {@code null} + * @see Parameter#required() + * @see io.swagger.v3.oas.annotations.media.Schema#required() + * @see io.swagger.v3.oas.annotations.media.Schema#requiredMode() + */ + @Nullable + public static Boolean swaggerRequired(@Nullable io.swagger.v3.oas.annotations.media.Schema schema, + @Nullable Parameter parameter) { + if (parameter != null && parameter.required()) { + return true; + } + if (schema != null) { + if (schema.required() + || schema.requiredMode() == RequiredMode.REQUIRED) { + return true; + } + if (schema.requiredMode() == RequiredMode.NOT_REQUIRED) { + return false; + } + } + return null; + } + + /** + * Is annotated notnull. + * + * @param annotations the field annotations + * @return the boolean + */ + public static boolean annotatedNotNull(List annotations) { + Collection annotationSimpleNames = annotations.stream() + .map(annotation -> annotation.annotationType().getSimpleName()) + .collect(Collectors.toSet()); + return ANNOTATIONS_FOR_REQUIRED.stream().anyMatch(annotationSimpleNames::contains); + } + + /** + * Is field nullable. java default is nullable + * {@link SchemaUtils#JAVA_FIELD_NULLABLE_DEFAULT} + * + * @param field the field + * @return the boolean + */ + public boolean fieldNullable(Field field) { + // primitives cannot be null + if (field.getType().isPrimitive()) return false; + + // Optional-like wrappers + if (OPTIONAL_TYPES.stream().anyMatch(c -> c.isAssignableFrom(field.getType()))) { + return true; + } + + // @Nullable/@NotNull + Boolean ann = nullableFromAnnotations(field); + if (ann != null) return ann; + + // Kotlin nullability + if (kotlinUtilsOptional.isPresent() && isKotlinDeclaringClass(field)) { + Boolean kotlin = kotlinNullability(field); + if (kotlin != null) return kotlin; + } + + return JAVA_FIELD_NULLABLE_DEFAULT; + } + + /** + * Is field required. + * + * @param field the field + * @param schema the schema + * @param parameter the parameter + * @return the boolean + * @see Parameter#required() + * @see io.swagger.v3.oas.annotations.media.Schema#required() + * @see io.swagger.v3.oas.annotations.media.Schema#requiredMode() + */ + public boolean fieldRequired(Field field, io.swagger.v3.oas.annotations.media.Schema schema, Parameter parameter) { + Boolean swagger = swaggerRequired(schema, parameter); + if (swagger != null) return swagger; + + // Optional-like wrapper → not required + if (OPTIONAL_TYPES.stream().anyMatch(c -> c.isAssignableFrom(field.getType()))) return false; + + // @Nullable/@NotNull + if (hasNullableAnnotation(field) || hasNullableOnGetter(field) || hasNullableOnCtorParam(field)) { + return false; + } + if (hasNotNullAnnotation(field) || hasNotNullOnGetter(field) || hasNotNullOnCtorParam(field)) { + return true; + } + + // Kotlin logic + if (kotlinUtilsOptional.isPresent() && isKotlinDeclaringClass(field)) { + if (fieldNullable(field)) return false; + Boolean hasDefault = kotlinConstructorParamIsOptional(field); + if (Boolean.TRUE.equals(hasDefault)) return false; + return true; + } + + // Jackson @JsonProperty(required = true) + JsonProperty jp = getJsonProperty(field); + if (jp != null && jp.required()) return true; + + return false; + } + + /** + * Apply validations to schema. the annotation order effects the result of the + * validation. + * + * @param schema the schema + * @param annotations the annotations + * @param openapiVersion the openapi version + */ + public static void applyValidationsToSchema(Schema schema, List annotations, String openapiVersion) { + annotations.forEach(anno -> { + String annotationName = anno.annotationType().getSimpleName(); + if (annotationName.equals(Positive.class.getSimpleName())) { + if (OpenApiVersion.OPENAPI_3_1.getVersion().equals(openapiVersion)) { + schema.setExclusiveMinimumValue(BigDecimal.ZERO); + } + else { + schema.setMinimum(BigDecimal.ZERO); + schema.setExclusiveMinimum(true); + } + } + if (annotationName.equals(PositiveOrZero.class.getSimpleName())) { + schema.setMinimum(BigDecimal.ZERO); + } + if (annotationName.equals(NegativeOrZero.class.getSimpleName())) { + schema.setMaximum(BigDecimal.ZERO); + } + if (annotationName.equals(Negative.class.getSimpleName())) { + if (OpenApiVersion.OPENAPI_3_1.getVersion().equals(openapiVersion)) { + schema.setExclusiveMaximumValue(BigDecimal.ZERO); + } + else { + schema.setMaximum(BigDecimal.ZERO); + schema.setExclusiveMaximum(true); + } + } + if (annotationName.equals(Min.class.getSimpleName())) { + schema.setMinimum(BigDecimal.valueOf(((Min) anno).value())); + } + if (annotationName.equals(Max.class.getSimpleName())) { + schema.setMaximum(BigDecimal.valueOf(((Max) anno).value())); + } + if (annotationName.equals(DecimalMin.class.getSimpleName())) { + DecimalMin min = (DecimalMin) anno; + if (min.inclusive()) { + schema.setMinimum(BigDecimal.valueOf(Double.parseDouble(min.value()))); + } + else { + schema.setExclusiveMinimum(true); + } + } + if (annotationName.equals(DecimalMax.class.getSimpleName())) { + DecimalMax max = (DecimalMax) anno; + if (max.inclusive()) { + schema.setMaximum(BigDecimal.valueOf(Double.parseDouble(max.value()))); + } + else { + schema.setExclusiveMaximum(true); + } + } + if (annotationName.equals(Size.class.getSimpleName())) { + String type = schema.getType(); + if (type == null && schema.getTypes() != null && schema.getTypes().size() == 1) + type = schema.getTypes().iterator().next(); + if (OPENAPI_ARRAY_TYPE.equals(type)) { + schema.setMinItems(((Size) anno).min()); + schema.setMaxItems(((Size) anno).max()); + } + else if (OPENAPI_STRING_TYPE.equals(type)) { + schema.setMinLength(((Size) anno).min()); + schema.setMaxLength(((Size) anno).max()); + } + } + if (annotationName.equals(Pattern.class.getSimpleName())) { + schema.setPattern(((Pattern) anno).regexp()); + } + }); + if (schema!=null && annotatedNotNull(annotations)) { + String specVersion = schema.getSpecVersion().name(); + if (!"V30".equals(specVersion)) { + schema.setNullable(false); + } + } + } + + /** + * Nullable from annotations boolean. + * + * @param field the field + * @return the boolean + */ + private static Boolean nullableFromAnnotations(Field field) { + if (hasNullableAnnotation(field)) return true; + if (hasNotNullAnnotation(field)) return false; + Method getter = findGetter(field); + if (getter != null) { + if (hasNullableAnnotation(getter)) return true; + if (hasNotNullAnnotation(getter)) return false; + } + return null; + } + + /** + * Has nullable annotation boolean. + * + * @param el the el + * @return the boolean + */ + private static boolean hasNullableAnnotation(AnnotatedElement el) { + if (el == null) return false; + for (Annotation ann : el.getAnnotations()) { + if (ANNOTATIONS_FOR_NULLABLE.contains(ann.annotationType().getSimpleName())) { + return true; + } + } + return false; + } + + + /** + * Has not null annotation boolean. + * + * @param el the el + * @return the boolean + */ + private static boolean hasNotNullAnnotation(AnnotatedElement el) { + if (el == null) { + return false; + } + for (Annotation ann : el.getAnnotations()) { + String simpleName = ann.annotationType().getSimpleName(); + if (ANNOTATIONS_FOR_REQUIRED.contains(simpleName)) { + return true; + } + } + return false; + } + + /** + * Has nullable on getter boolean. + * + * @param f the f + * @return the boolean + */ + private static boolean hasNullableOnGetter(Field f) { + Method g = findGetter(f); + return g != null && hasNullableAnnotation(g); + } + + /** + * Has not null on getter boolean. + * + * @param f the f + * @return the boolean + */ + private static boolean hasNotNullOnGetter(Field f) { + Method g = findGetter(f); + return g != null && hasNotNullAnnotation(g); + } + + /** + * Has nullable on ctor param boolean. + * + * @param f the f + * @return the boolean + */ + private static boolean hasNullableOnCtorParam(Field f) { + return ctorParamHasAnyAnnotationSimpleName(f, ANNOTATIONS_FOR_NULLABLE); + } + + /** + * Has not null on ctor param boolean. + * + * @param f the f + * @return the boolean + */ + private static boolean hasNotNullOnCtorParam(Field f) { + return ctorParamHasAnyAnnotationSimpleName(f, ANNOTATIONS_FOR_REQUIRED); + } + + /** + * Ctor param has any annotation simple name boolean. + * + * @param f the f + * @param simpleNames the simple names + * @return the boolean + */ + private static boolean ctorParamHasAnyAnnotationSimpleName(Field f, Collection simpleNames) { + if (f == null || simpleNames == null || simpleNames.isEmpty()) return false; + + final String fieldName = f.getName(); + final Class declaring = f.getDeclaringClass(); + + try { + for (Constructor ctor : declaring.getDeclaredConstructors()) { + java.lang.reflect.Parameter[] params = ctor.getParameters(); + for (java.lang.reflect.Parameter p : params) { + // A) compiled with -parameters + if (fieldName.equals(p.getName()) && paramHasAnyAnnotationSimpleName(p, simpleNames)) { + return true; + } + // B) fallback: @JsonProperty("fieldName") on the parameter + if (hasJsonPropertyName(p, fieldName) && paramHasAnyAnnotationSimpleName(p, simpleNames)) { + return true; + } + } + } + } catch (Throwable ignored) { + // best-effort only + } + return false; + } + + /** + * Param has any annotation simple name boolean. + * + * @param p the p + * @param simpleNames the simple names + * @return the boolean + */ + private static boolean paramHasAnyAnnotationSimpleName(java.lang.reflect.Parameter p, Collection simpleNames) { + for (Annotation ann : p.getAnnotations()) { + if (simpleNames.contains(ann.annotationType().getSimpleName())) { + return true; + } + } + return false; + } + + /** + * Has json property name boolean. + * + * @param p the p + * @param expected the expected + * @return the boolean + */ + private static boolean hasJsonPropertyName(java.lang.reflect.Parameter p, String expected) { + try { + JsonProperty jp = p.getAnnotation(JsonProperty.class); + return jp != null && expected.equals(jp.value()); + } catch (Throwable ignored) { + return false; + } + } + + /** + * Find getter method. + * + * @param f the f + * @return the method + */ + private static Method findGetter(Field f) { + String n = f.getName(); + String cap = Character.toUpperCase(n.charAt(0)) + n.substring(1); + String[] names = (f.getType() == boolean.class || f.getType() == Boolean.class) + ? new String[] { "is" + cap, "get" + cap } + : new String[] { "get" + cap }; + for (String m : names) { + try { + return f.getDeclaringClass().getMethod(m); + } catch (NoSuchMethodException ignored) {} + } + return null; + } + + /** + * Gets json property. + * + * @param f the f + * @return the json property + */ + private static JsonProperty getJsonProperty(Field f) { + JsonProperty jp = f.getAnnotation(JsonProperty.class); + if (jp != null) return jp; + Method g = findGetter(f); + if (g != null) return g.getAnnotation(JsonProperty.class); + return null; + } +} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java index 0fe880c91..7aeeceb93 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java @@ -32,6 +32,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -44,6 +45,8 @@ import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.core.converter.AnnotatedType; +import io.swagger.v3.core.converter.ModelConverterContext; +import io.swagger.v3.core.converter.ModelConverterContextImpl; import io.swagger.v3.core.converter.ModelConverters; import io.swagger.v3.core.converter.ResolvedSchema; import io.swagger.v3.core.util.AnnotationsUtils; @@ -53,6 +56,7 @@ import io.swagger.v3.oas.annotations.media.SchemaProperty; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.SpecVersion; +import io.swagger.v3.oas.models.headers.Header; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Content; @@ -64,6 +68,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springdoc.core.providers.JavadocProvider; import org.springframework.core.MethodParameter; import org.springframework.core.annotation.AnnotationUtils; @@ -90,6 +95,11 @@ public class SpringDocAnnotationsUtils extends AnnotationsUtils { */ private static final List ANNOTATIONS_TO_IGNORE = Collections.synchronizedList(new ArrayList<>()); + /** + * The reusable context + */ + private static final ThreadLocal> MODEL_CONVERTER_CONTEXT_MAP = ThreadLocal.withInitial(HashMap::new); + static { ANNOTATIONS_TO_IGNORE.add(Hidden.class); ANNOTATIONS_TO_IGNORE.add(JsonIgnore.class); @@ -130,18 +140,16 @@ public static Schema resolveSchemaFromType(Class schemaImplementation, Compon public static Schema extractSchema(Components components, Type returnType, JsonView jsonView, Annotation[] annotations, SpecVersion specVersion) { if (returnType == null) return null; Schema schemaN = null; - ResolvedSchema resolvedSchema; boolean openapi31 = SpecVersion.V31 == specVersion; - try { - resolvedSchema = ModelConverters.getInstance(openapi31) - .resolveAsResolvedSchema( - new AnnotatedType(returnType) - .resolveAsRef(true).jsonViewAnnotation(jsonView).ctxAnnotations(annotations)); - } - catch (Exception e) { - LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e); - return null; - } + if (jsonView != null) + annotations = ArrayUtils.addAll(annotations, jsonView); + + AnnotatedType annotatedType = new AnnotatedType(returnType) + .resolveAsRef(true) + .jsonViewAnnotation(jsonView) + .ctxAnnotations(annotations); + ResolvedSchema resolvedSchema = resolveAsResolvedSchema(openapi31, annotatedType); + if (resolvedSchema != null) { Map schemaMap = resolvedSchema.referencedSchemas; if (!CollectionUtils.isEmpty(schemaMap) && components != null) { @@ -481,4 +489,72 @@ public static Object resolveDefaultValue(String defaultValueStr, ObjectMapper ob } return defaultValue; } + + /** + * Gets headers. + * + * @param annotationHeaders the annotation headers + * @param components the components + * @param jsonViewAnnotation the json view annotation + * @param openapi31 the openapi 31 + * @return the headers + */ + public static Optional> getHeaders(io.swagger.v3.oas.annotations.headers.Header[] annotationHeaders, Components components, JsonView jsonViewAnnotation, boolean openapi31) { + Optional> headerMap = AnnotationsUtils.getHeaders(annotationHeaders, components, jsonViewAnnotation, openapi31); + if (openapi31) { + headerMap.ifPresent(map -> { + for (Entry entry : map.entrySet()) { + Header header = entry.getValue(); + Schema schema = header.getSchema(); + handleSchemaTypes(schema); + } + }); + } + return headerMap; + } + + /** + * Clear cache. + * + * @param javadocProvider the javadoc provider + */ + public static void clearCache(JavadocProvider javadocProvider) { + if (javadocProvider != null) + javadocProvider.clearCache(); + MODEL_CONVERTER_CONTEXT_MAP.remove();; + } + + /** + * Resolve as resolved schema resolved schema. + * + * @param openapi31 the openapi 31 + * @param type the type + * @return the resolved schema + */ + private static ResolvedSchema resolveAsResolvedSchema(boolean openapi31, AnnotatedType type) { + try { + ModelConverterContext modelConverterContext = getModelConverterContext(openapi31); + ResolvedSchema resolvedSchema = new ResolvedSchema(); + resolvedSchema.schema = modelConverterContext.resolve(type); + resolvedSchema.referencedSchemas = modelConverterContext.getDefinedModels(); + return resolvedSchema; + } + catch (Exception e) { + LOGGER.warn(Constants.GRACEFUL_EXCEPTION_OCCURRED, e); + return null; + } + } + + /** + * Gets model converter context. + * + * @param openapi31 the openapi 31 + * @return the model converter context + */ + private static ModelConverterContext getModelConverterContext(boolean openapi31) { + Map perThread = MODEL_CONVERTER_CONTEXT_MAP.get(); + return perThread.computeIfAbsent(openapi31, key -> + new ModelConverterContextImpl(ModelConverters.getInstance(openapi31).getConverters())); + } + } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocDataRestUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocDataRestUtils.java index 281fd4eda..6ffef2802 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocDataRestUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocDataRestUtils.java @@ -138,7 +138,7 @@ public void customise(OpenAPI openAPI, ResourceMappings mappings, PersistentEnti entityInfo.setAssociationsFields(associationsFields); entityInoMap.put(domainType.getSimpleName(), entityInfo); } - + openAPI.getPaths().entrySet().stream() .forEach(stringPathItemEntry -> { PathItem pathItem = stringPathItemEntry.getValue(); @@ -246,7 +246,7 @@ private void updateRequestBodySchemaProperties(String key, Schema referencedSche Entry entry = it.next(); String propId = entry.getKey(); if (entityInoMap.containsKey(key) && entityInoMap.get(key).getAssociationsFields().contains(propId)) { - if (entry.getValue().getItems()!=null) + if (entry.getValue().getItems() != null) referencedSchema.addProperty(propId, new ArraySchema().items(new StringSchema())); else referencedSchema.addProperty(propId, new StringSchema()); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocKotlinUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocKotlinUtils.java new file mode 100644 index 000000000..19496bb56 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocKotlinUtils.java @@ -0,0 +1,117 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.core.utils; + +import java.lang.reflect.Field; + +import kotlin.jvm.JvmClassMappingKt; +import kotlin.reflect.KClass; +import kotlin.reflect.KFunction; +import kotlin.reflect.KParameter; +import kotlin.reflect.KProperty; +import kotlin.reflect.KProperty1; +import kotlin.reflect.full.KClasses; +import kotlin.reflect.jvm.ReflectJvmMapping; + +import org.springframework.core.KotlinDetector; + +/** + * The type Spring doc kotlin utils. + * + * @author bnasslahsen + */ +public class SpringDocKotlinUtils { + + /** + * Is kotlin declaring class boolean. + * + * @param f the f + * @return the boolean + */ + static boolean isKotlinDeclaringClass(Field f) { + return KotlinDetector.isKotlinPresent() + && KotlinDetector.isKotlinReflectPresent() + && KotlinDetector.isKotlinType(f.getDeclaringClass()); + } + + /** + * Kotlin marked nullable fallback boolean. + * + * @param f the f + * @return the boolean + */ + private static Boolean kotlinMarkedNullableFallback(Field f) { + try { + KClass kClass = JvmClassMappingKt.getKotlinClass(f.getDeclaringClass()); + for (Object pObj : KClasses.getMemberProperties((KClass) kClass)) { + KProperty1 p = (KProperty1) pObj; + if (p.getName().equals(f.getName())) { + return p.getReturnType().isMarkedNullable(); + } + } + } catch (Throwable ignored) {} + return null; + } + + /** + * Kotlin constructor param is optional boolean. + * + * @param f the f + * @return the boolean + */ + static Boolean kotlinConstructorParamIsOptional(Field f) { + try { + KClass kClass = JvmClassMappingKt.getKotlinClass(f.getDeclaringClass()); + KFunction primary = KClasses.getPrimaryConstructor(kClass); + if (primary != null) { + for (KParameter p : primary.getParameters()) { + if (f.getName().equals(p.getName())) { + return p.isOptional(); + } + } + } + } catch (Throwable ignored) {} + return null; + } + + /** + * Kotlin nullability boolean. + * + * @param field the field + * @return the boolean + */ + static Boolean kotlinNullability(Field field) { + if (!isKotlinDeclaringClass(field)) return null; + + KProperty prop = ReflectJvmMapping.getKotlinProperty(field); + if (prop != null) { + return prop.getReturnType().isMarkedNullable(); + } + + return kotlinMarkedNullableFallback(field); + } +} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocPropertiesUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocPropertiesUtils.java index a1b4a40c3..abc526063 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocPropertiesUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocPropertiesUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.core.utils; @@ -48,7 +48,7 @@ public interface SpringDocPropertiesUtils { * @param params the params */ static void put(String name, List value, Map params) { - params.put(name, value); + params.put(name, value); } /** diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java index 7b6a8f718..c92bb0a51 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java @@ -21,22 +21,29 @@ * * * * * * * * * - * + * */ package org.springdoc.core.utils; +import java.io.IOException; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.core.converter.AnnotatedType; +import io.swagger.v3.core.util.PrimitiveType; +import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Content; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springdoc.api.AbstractOpenApiResource; import org.springdoc.core.converters.AdditionalModelsConverter; import org.springdoc.core.converters.ConverterUtils; @@ -50,6 +57,8 @@ import org.springframework.core.MethodParameter; import org.springframework.util.CollectionUtils; +import static io.swagger.v3.core.util.PrimitiveType.customClasses; + /** * The type Spring doc utils. * @@ -62,6 +71,11 @@ public class SpringDocUtils { */ private static final SpringDocUtils springDocConfig = new SpringDocUtils(); + /** + * The constant LOGGER. + */ + private static final Logger LOGGER = LoggerFactory.getLogger(SpringDocUtils.class); + /** * Instantiates a new Spring doc utils. */ @@ -77,6 +91,112 @@ public static SpringDocUtils getConfig() { return springDocConfig; } + /** + * Is valid path boolean. + * + * @param path the path + * @return the boolean + */ + public static boolean isValidPath(String path) { + if (StringUtils.isNotBlank(path) && !path.equals("/")) + return true; + return false; + } + + /** + * Gets parameter annotations. + * + * @param methodParameter the method parameter + * @return the parameter annotations + */ + @NotNull + public static Annotation[] getParameterAnnotations(MethodParameter methodParameter) { + // Get the parameter annotations directly as an array + Annotation[] annotations = methodParameter.getParameterAnnotations(); + // Return early if no annotations are found, avoiding unnecessary processing + if (ArrayUtils.isEmpty(annotations)) { + return new Annotation[0]; + } + // Create a list that can contain both parameter and meta-annotations + List resultAnnotations = new ArrayList<>(annotations.length); + + // Add all direct annotations + resultAnnotations.addAll(List.of(annotations)); + + // Process each direct annotation to collect its meta-annotations + for (Annotation annotation : annotations) { + // Fetch meta-annotations + Annotation[] metaAnnotations = annotation.annotationType().getAnnotations(); + + // Only add meta-annotations if they exist + if (ArrayUtils.isNotEmpty(metaAnnotations)) { + resultAnnotations.addAll(List.of(metaAnnotations)); + } + } + // Convert the list to an array and return + return resultAnnotations.toArray(new Annotation[0]); + } + + /** + * Gets parent type name. + * + * @param type the type + * @param cls the cls + * @return the parent type name + */ + @NotNull + public static String getParentTypeName(AnnotatedType type, Class cls) { + return cls.getSimpleName() + StringUtils.capitalize(type.getParent().getType() != null ? type.getParent().getType() : "object"); + } + + /** + * Is composed schema boolean. + * + * @param referencedSchema the referenced schema + * @return the boolean + */ + public static boolean isComposedSchema(Schema referencedSchema) { + return referencedSchema.getOneOf() != null || referencedSchema.getAllOf() != null || referencedSchema.getAnyOf() != null || referencedSchema instanceof ComposedSchema; + } + + /** + * Handle schema types. + * + * @param schema the schema + */ + public static void handleSchemaTypes(Schema schema) { + if (schema != null) { + if (schema.getType() == null && schema.getTypes() == null && schema.get$ref() == null && !isComposedSchema(schema)) { + schema.addType("object"); + } + else if (schema.getType() != null && CollectionUtils.isEmpty(schema.getTypes()) && !isComposedSchema(schema)) { + schema.addType(schema.getType()); + } + else if (schema.getItems() != null && schema.getItems().getType() != null + && CollectionUtils.isEmpty(schema.getItems().getTypes())) { + schema.getItems().addType(schema.getItems().getType()); + } + if (schema.getProperties() != null) { + schema.getProperties().forEach((key, value) -> handleSchemaTypes(value)); + } + } + } + + /** + * Handle schema types. + * + * @param content the content + */ + public static void handleSchemaTypes(Content content) { + if (content != null) { + content.values().forEach(mediaType -> { + if (mediaType.getSchema() != null) { + handleSchemaTypes(mediaType.getSchema()); + } + }); + } + } + /** * Add deprecated type spring doc utils. * @@ -322,7 +442,6 @@ public SpringDocUtils replaceParameterObjectWithClass(Class source, Class target return this; } - /** * Sets response entity exception handler class. * @@ -356,6 +475,19 @@ public SpringDocUtils removeFromSchemaMap(Class clazz) { return this; } + /** + * Remove from schema map spring doc utils. + * + * @param classes the clazz + * @return the spring doc utils + */ + public SpringDocUtils removeFromSchemaMap(Class... classes) { + for (Class aClass : classes) { + AdditionalModelsConverter.removeFromSchemaMap(aClass); + } + return this; + } + /** * Remove from schema class spring doc utils. * @@ -389,118 +521,99 @@ public SpringDocUtils removeJavaTypeToIgnore(Class clazz) { return this; } - /** - * Is valid path boolean. - * - * @param path the path - * @return the boolean - */ - public static boolean isValidPath(String path) { - if (StringUtils.isNotBlank(path) && !path.equals("/")) - return true; - return false; - } - /** * Add parent type spring doc utils. * * @param parentTypes the parent types * @return the spring doc utils */ - public SpringDocUtils addParentType(String ...parentTypes) { + public SpringDocUtils addParentType(String... parentTypes) { PolymorphicModelConverter.addParentType(parentTypes); return this; } /** - * Gets parameter annotations. - * - * @param methodParameter the method parameter - * @return the parameter annotations - */ - @NotNull - public static Annotation[] getParameterAnnotations(MethodParameter methodParameter) { - // Get the parameter annotations directly as an array - Annotation[] annotations = methodParameter.getParameterAnnotations(); - // Return early if no annotations are found, avoiding unnecessary processing - if (ArrayUtils.isEmpty(annotations)) { - return new Annotation[0]; - } - // Create a list that can contain both parameter and meta-annotations - List resultAnnotations = new ArrayList<>(annotations.length); - - // Add all direct annotations - resultAnnotations.addAll(List.of(annotations)); - - // Process each direct annotation to collect its meta-annotations - for (Annotation annotation : annotations) { - // Fetch meta-annotations - Annotation[] metaAnnotations = annotation.annotationType().getAnnotations(); - - // Only add meta-annotations if they exist - if (ArrayUtils.isNotEmpty(metaAnnotations)) { - resultAnnotations.addAll(List.of(metaAnnotations)); - } - } - // Convert the list to an array and return - return resultAnnotations.toArray(new Annotation[0]); - } - - /** - * Gets parent type name. - * - * @param type the type - * @param cls the cls - * @return the parent type name + * Init extra schemas. */ - @NotNull - public static String getParentTypeName(AnnotatedType type, Class cls) { - return cls.getSimpleName() + StringUtils.capitalize(type.getParent().getType() != null ? type.getParent().getType() : "object"); + public SpringDocUtils initExtraSchemas() { + customClasses().put("java.time.Duration", PrimitiveType.STRING); + customClasses().put("java.time.LocalTime", PrimitiveType.STRING); + customClasses().put("java.time.YearMonth", PrimitiveType.STRING); + customClasses().put("java.time.MonthDay", PrimitiveType.STRING); + customClasses().put("java.time.Year", PrimitiveType.STRING); + customClasses().put("java.time.Period", PrimitiveType.STRING); + customClasses().put("java.time.OffsetTime", PrimitiveType.STRING); + customClasses().put("java.time.ZoneId", PrimitiveType.STRING); + customClasses().put("java.time.ZoneOffset", PrimitiveType.STRING); + customClasses().put("java.util.TimeZone", PrimitiveType.STRING); + customClasses().put("java.util.Charset", PrimitiveType.STRING); + customClasses().put("java.util.Locale", PrimitiveType.STRING); + return this; } /** - * Is composed schema boolean. + * Reset extra schemas spring doc utils. * - * @param referencedSchema the referenced schema - * @return the boolean + * @return the spring doc utils */ - public static boolean isComposedSchema(Schema referencedSchema) { - return referencedSchema.getOneOf() != null || referencedSchema.getAllOf() != null || referencedSchema.getAnyOf() != null; + public SpringDocUtils resetExtraSchemas() { + customClasses().remove("java.time.Duration"); + customClasses().remove("java.time.LocalTime"); + customClasses().remove("java.time.YearMonth"); + customClasses().remove("java.time.MonthDay"); + customClasses().remove("java.time.Year"); + customClasses().remove("java.time.Period"); + customClasses().remove("java.time.OffsetTime"); + customClasses().remove("java.time.ZoneId"); + customClasses().remove("java.time.ZoneOffset"); + customClasses().remove("java.util.TimeZone"); + customClasses().remove("java.util.Charset"); + customClasses().remove("java.util.Locale"); + return this; } /** - * Handle schema types. + * Clone via json t. * - * @param schema the schema + * @param the type parameter + * @param source the source + * @param targetType the target type + * @return the t */ - public static void handleSchemaTypes(Schema schema) { - if (schema != null) { - if (schema.getType() != null && CollectionUtils.isEmpty(schema.getTypes())) { - schema.addType(schema.getType()); - } - else if (schema.getItems() != null && schema.getItems().getType() != null - && CollectionUtils.isEmpty(schema.getItems().getTypes())) { - schema.getItems().addType(schema.getItems().getType()); - } - if(schema.getProperties() != null){ - schema.getProperties().forEach((key, value) -> handleSchemaTypes(value)); - } + public static T cloneViaJson(Object source, Class targetType, ObjectMapper mapper) { + if (source == null) return null; + try { + return mapper.readValue(mapper.writeValueAsBytes(source), targetType); + } + catch (IOException e) { + LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage()); + @SuppressWarnings("unchecked") + T fallback = (T) source; + return fallback; } } /** - * Handle schema types. + * Clone via json t. * - * @param content the content + * @param the type parameter + * @param source the source + * @param typeRef the type ref + * @return the t */ - public static void handleSchemaTypes(Content content) { - if(content !=null){ - content.values().forEach(mediaType -> { - if (mediaType.getSchema() != null) { - handleSchemaTypes(mediaType.getSchema()); - } - }); + public static T cloneViaJson(Object source, TypeReference typeRef, ObjectMapper mapper) { + if (source == null) return null; + try { + return mapper.readValue(mapper.writeValueAsBytes(source), typeRef); + } + catch (IOException e) { + LOGGER.warn("Json Processing Exception occurred: {}", e.getMessage()); + @SuppressWarnings("unchecked") + T fallback = (T) source; + return fallback; } } + } + diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/AbstractScalarController.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/AbstractScalarController.java new file mode 100644 index 000000000..0135bdfd4 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/AbstractScalarController.java @@ -0,0 +1,185 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.scalar; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; + +import com.scalar.maven.webjar.ScalarProperties; + +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_URL; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +/** + * The type Abstract scalar controller. + * + * @author bnasslahsen This is a copy of the class ScalarController from the scalar webjar. It has been slightly modified to fit the springdoc-openapi code base. + */ +public abstract class AbstractScalarController { + + /** + * The Scalar properties. + */ + protected final ScalarProperties scalarProperties; + + /** + * The Original scalar url. + */ + protected final String originalScalarUrl; + + /** + * Instantiates a new Abstract scalar controller. + * + * @param scalarProperties the scalar properties + */ + protected AbstractScalarController(ScalarProperties scalarProperties) { + this.scalarProperties = scalarProperties; + this.originalScalarUrl = scalarProperties.getUrl(); + } + + /** + * Serves the main API reference interface. + *

This endpoint returns an HTML page that displays the Scalar API Reference + * interface. The page is configured with the OpenAPI specification URL from + * the properties.

+ * + * @param requestUrl the request url + * @return a ResponseEntity containing the HTML content for the API reference interface + * @throws IOException if the HTML template cannot be loaded + */ + protected ResponseEntity getDocs(String requestUrl) throws IOException { + // Load the template HTML + InputStream inputStream = getClass().getResourceAsStream("/META-INF/resources/webjars/scalar/index.html"); + if (inputStream == null) { + return ResponseEntity.notFound().build(); + } + + String html = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + requestUrl = decode(requestUrl); + // Replace the placeholders with actual values + String cdnUrl = buildJsBundleUrl(requestUrl); + String injectedHtml = html + .replace("__JS_BUNDLE_URL__", cdnUrl) + .replace("__CONFIGURATION__", """ + { + url: "%s" + } + """.formatted(buildApiDocsUrl(requestUrl))); + + return ResponseEntity.ok() + .contentType(MediaType.TEXT_HTML) + .body(injectedHtml); + } + + /** + * Serves the JavaScript bundle for the Scalar API Reference. + *

This endpoint returns the JavaScript file that powers the Scalar API Reference + * interface. The file is served with the appropriate MIME type.

+ * + * @return a ResponseEntity containing the JavaScript bundle + * @throws IOException if the JavaScript file cannot be loaded + */ + protected ResponseEntity getScalarJs() throws IOException { + // Load the scalar.js file + InputStream inputStream = getClass().getResourceAsStream("/META-INF/resources/webjars/scalar/" + SCALAR_JS_FILENAME); + if (inputStream == null) { + return ResponseEntity.notFound().build(); + } + + byte[] jsContent = inputStream.readAllBytes(); + + return ResponseEntity.ok() + .contentType(MediaType.valueOf("application/javascript")) + .body(jsContent); + } + + /** + * Decode string. + * + * @param requestURI the request uri + * @return the string + */ + protected String decode(String requestURI) { + return URLDecoder.decode(requestURI, StandardCharsets.UTF_8); + } + + /** + * Gets api docs url. + * + * @param requestUrl the request url + * @param apiDocsPath the api docs path + * @return the api docs url + */ + protected String buildApiDocsUrl(String requestUrl, String apiDocsPath) { + String apiDocsUrl = scalarProperties.getUrl(); + if (SCALAR_DEFAULT_URL.equals(originalScalarUrl)) { + String serverUrl = requestUrl.substring(0, requestUrl.length() - scalarProperties.getPath().length()); + apiDocsUrl = serverUrl + apiDocsPath; + } + return apiDocsUrl; + } + + /** + * Build js bundle url string. + * + * @param requestUrl the request url + * @param scalarPath the scalar path + * @return the string + */ + protected String buildJsBundleUrl(String requestUrl, String scalarPath) { + if (SCALAR_DEFAULT_URL.equals(originalScalarUrl)) { + int firstPathSlash = requestUrl.indexOf('/', requestUrl.indexOf("://") + 3); + String path = firstPathSlash >= 0 ? requestUrl.substring(firstPathSlash) : "/"; + if( path.endsWith("/")) + path = path.substring(0, path.length() - 1); + return path + DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME; + } + return scalarPath + DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME; + } + + /** + * Gets api docs url. + * + * @param requestUrl the request url + * @return the api docs url + */ + protected abstract String buildApiDocsUrl(String requestUrl); + + /** + * Build js bundle url string. + * + * @param requestUrl the request url + * @return the string + */ + protected abstract String buildJsBundleUrl(String requestUrl); +} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/ScalarConstants.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/ScalarConstants.java new file mode 100644 index 000000000..d63ce15e8 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/ScalarConstants.java @@ -0,0 +1,55 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.scalar; + +/** + * The type ScalarConstants. + * + * @author bnasslahsen + */ +public class ScalarConstants { + + /** + * The constant SCALAR_DEFAULT_PATH. + */ + public static final String SCALAR_DEFAULT_PATH = "/scalar"; + + /** + * The constant SCALAR_JS_FILENAME. + */ + public static final String SCALAR_JS_FILENAME = "scalar.js"; + + /** + * The constant SCALAR_DEFAULT_URL. + */ + public static final String SCALAR_DEFAULT_URL = "https://cdn.jsdelivr.net/npm/@scalar/galaxy/dist/latest.json"; + + /** + * The constant DEFAULT_SCALAR_ACTUATOR_PATH. + */ + public static final String DEFAULT_SCALAR_ACTUATOR_PATH = "scalar"; +} diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/ScalarDisableAutoConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/ScalarDisableAutoConfiguration.java new file mode 100644 index 000000000..525856dc7 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/scalar/ScalarDisableAutoConfiguration.java @@ -0,0 +1,56 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.scalar; + +/** + * @author bnasslahsen + */ + +import org.springframework.boot.autoconfigure.AutoConfigurationImportFilter; +import org.springframework.boot.autoconfigure.AutoConfigurationMetadata; + +/** + * Disable Scalar WebJar AutoConfiguration. + */ +public class ScalarDisableAutoConfiguration implements AutoConfigurationImportFilter { + + /** + * The constant TARGET. + */ + private static final String TARGET = "com.scalar.maven.webjar.ScalarAutoConfiguration"; + + @Override + public boolean[] match(String[] candidates, AutoConfigurationMetadata metadata) { + boolean[] matches = new boolean[candidates.length]; + for (int i = 0; i < candidates.length; i++) { + String candidate = candidates[i]; + // keep everything except the target + matches[i] = !TARGET.equals(candidate); + } + return matches; + } +} \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerIndexTransformer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerIndexTransformer.java index 62a346ef3..1f48e038e 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerIndexTransformer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerIndexTransformer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.ui; @@ -137,7 +137,7 @@ protected String overwriteSwaggerDefaultUrl(String html) { * @param html the html * @return modifed html */ - protected String setConfiguredApiDocsUrl(String html){ + protected String setConfiguredApiDocsUrl(String html) { return html.replace(Constants.SWAGGER_UI_DEFAULT_URL, swaggerUiConfig.getUrl()); } @@ -174,7 +174,7 @@ else if (swaggerUiConfig.getCsrf().isUseSessionStorage()) if (swaggerUiConfig.isDisableSwaggerDefaultUrl()) html = overwriteSwaggerDefaultUrl(html); - if(StringUtils.isNotEmpty(swaggerUiConfig.getUrl()) && StringUtils.isEmpty(swaggerUiConfig.getConfigUrl())){ + if (StringUtils.isNotEmpty(swaggerUiConfig.getUrl()) && StringUtils.isEmpty(swaggerUiConfig.getConfigUrl())) { html = setConfiguredApiDocsUrl(html); } diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerWelcome.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerWelcome.java index 4a4ff15bc..e121fb113 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerWelcome.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/AbstractSwaggerWelcome.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.ui; @@ -180,7 +180,7 @@ protected UriComponentsBuilder getUriComponentsBuilder(SwaggerUiConfigParameters * @param swaggerUiConfigParameters the swagger ui config parameters * @param sbUrls the sb urls */ - protected abstract void calculateUiRootPath(SwaggerUiConfigParameters swaggerUiConfigParameters,StringBuilder... sbUrls); + protected abstract void calculateUiRootPath(SwaggerUiConfigParameters swaggerUiConfigParameters, StringBuilder... sbUrls); /** * Calculate ui root common. diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SpringDocUIException.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SpringDocUIException.java index 78c5ec3c1..b0565bf3f 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SpringDocUIException.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SpringDocUIException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.ui; diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SwaggerResourceResolverUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SwaggerResourceResolverUtils.java index 92dab2d81..459911426 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SwaggerResourceResolverUtils.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/ui/SwaggerResourceResolverUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.ui; @@ -51,5 +51,5 @@ static String findSwaggerResourcePath(String pathStr, String version) { Path rest = path.subpath(1, path.getNameCount()); return first.resolve(version).resolve(rest).toString(); } - + } diff --git a/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..0b1ebd119 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.AutoConfigurationImportFilter=\ +org.springdoc.scalar.ScalarDisableAutoConfiguration \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java b/springdoc-openapi-starter-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java index 202711f48..501701f7f 100644 --- a/springdoc-openapi-starter-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java +++ b/springdoc-openapi-starter-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java @@ -125,7 +125,8 @@ public void setUp() { when(openAPIService.build(any())).thenReturn(openAPI); when(openAPIService.getContext()).thenReturn(context); - doAnswer(new CallsRealMethods()).when(openAPIService).setServersPresent(false); + when(openAPIService.getWebhooksClasses()).thenReturn(new Class[0]); + doAnswer(new CallsRealMethods()).when(openAPIService).setServersPresent(false); when(openAPIBuilderObjectFactory.getObject()).thenReturn(openAPIService); when(springDocProviders.jsonMapper()).thenReturn(Json.mapper()); @@ -140,7 +141,7 @@ void calculatePathFromRouterOperation() { responseBuilder, operationParser, new SpringDocConfigProperties(), - springDocProviders,new SpringDocCustomizers(Optional.empty(),Optional.empty(),Optional.empty(),Optional.empty()) + springDocProviders, new SpringDocCustomizers(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()) ); final Parameter refParameter = new Parameter().$ref(PARAMETER_REFERENCE); @@ -163,11 +164,11 @@ springDocProviders,new SpringDocCustomizers(Optional.empty(),Optional.empty(),Op final RouterOperation routerOperation = new RouterOperation(); routerOperation.setMethods(new RequestMethod[] { GET }); routerOperation.setOperationModel(operation); - routerOperation.setPath(PATH+"/{"+PARAMETER_WITH_NUMBER_SCHEMA_NAME+"}"); + routerOperation.setPath(PATH + "/{" + PARAMETER_WITH_NUMBER_SCHEMA_NAME + "}"); resource.calculatePath(routerOperation, Locale.getDefault(), this.openAPI); - final List parameters = resource.getOpenApi(Locale.getDefault()).getPaths().get(PATH+"/{"+PARAMETER_WITH_NUMBER_SCHEMA_NAME+"}").getGet().getParameters(); + final List parameters = resource.getOpenApi(null, Locale.getDefault()).getPaths().get(PATH + "/{" + PARAMETER_WITH_NUMBER_SCHEMA_NAME + "}").getGet().getParameters(); assertThat(parameters.size(), is(3)); assertThat(parameters, containsInAnyOrder(refParameter, numberParameterInPath, parameterWithoutSchema)); @@ -189,10 +190,10 @@ springDocProviders,new SpringDocCustomizers(Optional.empty(),Optional.empty(),Op @Test void preLoadingModeShouldNotOverwriteServers() throws InterruptedException { - doCallRealMethod().when(openAPIService).updateServers(any()); + doCallRealMethod().when(openAPIService).updateServers(any(), any()); when(openAPIService.getCachedOpenAPI(any())).thenCallRealMethod(); doAnswer(new CallsRealMethods()).when(openAPIService).setServersPresent(true); - doAnswer(new CallsRealMethods()).when(openAPIService).setServerBaseUrl(any(), any()); + doAnswer(new CallsRealMethods()).when(openAPIService).calculateServerBaseUrl(any(), any()); doAnswer(new CallsRealMethods()).when(openAPIService).setCachedOpenAPI(any(), any()); String customUrl = "https://custom.com"; @@ -207,26 +208,26 @@ void preLoadingModeShouldNotOverwriteServers() throws InterruptedException { requestBuilder, responseBuilder, operationParser, - properties, springDocProviders, new SpringDocCustomizers(Optional.of(singleton(openApiCustomizer)),Optional.empty(),Optional.empty(),Optional.empty()) + properties, springDocProviders, new SpringDocCustomizers(Optional.of(singleton(openApiCustomizer)), Optional.empty(), Optional.empty(), Optional.empty(),Optional.empty(),Optional.empty()) ); // wait for executor to be done Thread.sleep(1_000); // emulate generating base url - openAPIService.setServerBaseUrl(generatedUrl, new MockClientHttpRequest()); - openAPIService.updateServers(openAPI); + String serverBaseUrl = openAPIService.calculateServerBaseUrl(generatedUrl, new MockClientHttpRequest()); + openAPIService.updateServers(serverBaseUrl, openAPI); Locale locale = Locale.US; - OpenAPI after = resource.getOpenApi(locale); + OpenAPI after = resource.getOpenApi(serverBaseUrl, locale); assertThat(after.getServers().get(0).getUrl(), is(customUrl)); } @Test void serverBaseUrlCustomisersTest() throws InterruptedException { - doCallRealMethod().when(openAPIService).updateServers(any()); + doCallRealMethod().when(openAPIService).updateServers(any(), any()); when(openAPIService.getCachedOpenAPI(any())).thenCallRealMethod(); - doAnswer(new CallsRealMethods()).when(openAPIService).setServerBaseUrl(any(), any()); + doAnswer(new CallsRealMethods()).when(openAPIService).calculateServerBaseUrl(any(), any()); doAnswer(new CallsRealMethods()).when(openAPIService).setCachedOpenAPI(any(), any()); SpringDocConfigProperties properties = new SpringDocConfigProperties(); @@ -239,7 +240,7 @@ void serverBaseUrlCustomisersTest() throws InterruptedException { responseBuilder, operationParser, properties, - springDocProviders, new SpringDocCustomizers(Optional.empty(),Optional.empty(),Optional.empty(),Optional.empty()) + springDocProviders, new SpringDocCustomizers(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(),Optional.empty(),Optional.empty()) ); // wait for executor to be done @@ -249,9 +250,9 @@ springDocProviders, new SpringDocCustomizers(Optional.empty(),Optional.empty(),O // Test that setting generated URL works fine with no customizers present String generatedUrl = "https://generated-url.com/context-path"; - openAPIService.setServerBaseUrl(generatedUrl, new MockClientHttpRequest()); - openAPIService.updateServers(openAPI); - OpenAPI after = resource.getOpenApi(locale); + String serverUrl = openAPIService.calculateServerBaseUrl(generatedUrl, new MockClientHttpRequest()); + openAPIService.updateServers(serverUrl, openAPI); + OpenAPI after = resource.getOpenApi(serverUrl, locale); assertThat(after.getServers().get(0).getUrl(), is(generatedUrl)); // Test that adding a serverBaseUrlCustomizer has the desired effect @@ -260,9 +261,9 @@ springDocProviders, new SpringDocCustomizers(Optional.empty(),Optional.empty(),O serverBaseUrlCustomizerList.add(serverBaseUrlCustomizer); ReflectionTestUtils.setField(openAPIService, "serverBaseUrlCustomizers", Optional.of(serverBaseUrlCustomizerList)); - openAPIService.setServerBaseUrl(generatedUrl, new MockClientHttpRequest()); - openAPIService.updateServers(openAPI); - after = resource.getOpenApi(locale); + serverUrl = openAPIService.calculateServerBaseUrl(generatedUrl, new MockClientHttpRequest()); + openAPIService.updateServers(serverUrl, openAPI); + after = resource.getOpenApi(serverUrl, locale); assertThat(after.getServers().get(0).getUrl(), is("https://generated-url.com")); // Test that serverBaseUrlCustomisers are performed in order @@ -270,18 +271,18 @@ springDocProviders, new SpringDocCustomizers(Optional.empty(),Optional.empty(),O ServerBaseUrlCustomizer serverBaseUrlCustomiser2 = (serverBaseUrl, request) -> serverBaseUrl.replace("/context-path/second-path", ""); serverBaseUrlCustomizerList.add(serverBaseUrlCustomiser2); - openAPIService.setServerBaseUrl(generatedUrl, new MockClientHttpRequest()); - openAPIService.updateServers(openAPI); - after = resource.getOpenApi(locale); + serverUrl = openAPIService.calculateServerBaseUrl(generatedUrl, new MockClientHttpRequest()); + openAPIService.updateServers(serverUrl, openAPI); + after = resource.getOpenApi(serverUrl, locale); assertThat(after.getServers().get(0).getUrl(), is("https://generated-url.com/second-path")); // Test that all serverBaseUrlCustomisers in the List are performed ServerBaseUrlCustomizer serverBaseUrlCustomiser3 = (serverBaseUrl, request) -> serverBaseUrl.replace("/second-path", ""); serverBaseUrlCustomizerList.add(serverBaseUrlCustomiser3); - openAPIService.setServerBaseUrl(generatedUrl, new MockClientHttpRequest()); - openAPIService.updateServers(openAPI); - after = resource.getOpenApi(locale); + serverUrl = openAPIService.calculateServerBaseUrl(generatedUrl, new MockClientHttpRequest()); + openAPIService.updateServers(serverUrl, openAPI); + after = resource.getOpenApi(serverUrl, locale); assertThat(after.getServers().get(0).getUrl(), is("https://generated-url.com")); } @@ -292,6 +293,7 @@ private static class EmptyPathsOpenApiResource extends AbstractOpenApiResource { } @Override - public void getPaths(Map findRestControllers, Locale locale, OpenAPI openAPI) {} + public void getPaths(Map findRestControllers, Locale locale, OpenAPI openAPI) { + } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java index 35bd6c2f3..5664d1fe5 100644 --- a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java +++ b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/configuration/SpringDocHateoasConfigurationTest.java @@ -16,70 +16,70 @@ class SpringDocHateoasConfigurationTest { - @Test - void linksSchemaCustomizerShouldBeRegistered() { - new WebApplicationContextRunner() - .withPropertyValues( - "springdoc.api-docs.enabled=true", - "springdoc.enable-hateoas=true" - ) - .withConfiguration(AutoConfigurations.of( - WebMvcAutoConfiguration.class, - HateoasConfiguration.class, - SpringDocConfiguration.class, - SpringDocConfigProperties.class, - SpringDocHateoasConfiguration.class - )) - .run(context -> { - assertThat(context).getBeanNames(GlobalOpenApiCustomizer.class) - .hasSize(2) - .contains(LINKS_SCHEMA_CUSTOMIZER); - assertThat(context.getBean(LINKS_SCHEMA_CUSTOMIZER)).isExactlyInstanceOf(OpenApiHateoasLinksCustomizer.class); - }); - } + @Test + void linksSchemaCustomizerShouldBeRegistered() { + new WebApplicationContextRunner() + .withPropertyValues( + "springdoc.api-docs.enabled=true", + "springdoc.enable-hateoas=true" + ) + .withConfiguration(AutoConfigurations.of( + WebMvcAutoConfiguration.class, + HateoasConfiguration.class, + SpringDocConfiguration.class, + SpringDocConfigProperties.class, + SpringDocHateoasConfiguration.class + )) + .run(context -> { + assertThat(context).getBeanNames(GlobalOpenApiCustomizer.class) + .hasSize(2) + .contains(LINKS_SCHEMA_CUSTOMIZER); + assertThat(context.getBean(LINKS_SCHEMA_CUSTOMIZER)).isExactlyInstanceOf(OpenApiHateoasLinksCustomizer.class); + }); + } - @Test - void linksSchemaCustomizerShouldBeRegisteredWithMultipleGlobalOpenApiCustomizer() { - new WebApplicationContextRunner() - .withPropertyValues( - "springdoc.api-docs.enabled=true", - "springdoc.enable-hateoas=true" - ) - .withConfiguration(AutoConfigurations.of( - WebMvcAutoConfiguration.class, - HateoasConfiguration.class, - SpringDocConfiguration.class, - SpringDocConfigProperties.class, - SpringDocHateoasConfiguration.class - )) - .withBean("globalOpenApiCustomizer", GlobalOpenApiCustomizer.class, () -> mock(GlobalOpenApiCustomizer.class)) - .run(context -> { - assertThat(context).getBeanNames(GlobalOpenApiCustomizer.class) - .hasSize(2) - .containsExactlyInAnyOrder(LINKS_SCHEMA_CUSTOMIZER, "globalOpenApiCustomizer"); - }); - } + @Test + void linksSchemaCustomizerShouldBeRegisteredWithMultipleGlobalOpenApiCustomizer() { + new WebApplicationContextRunner() + .withPropertyValues( + "springdoc.api-docs.enabled=true", + "springdoc.enable-hateoas=true" + ) + .withConfiguration(AutoConfigurations.of( + WebMvcAutoConfiguration.class, + HateoasConfiguration.class, + SpringDocConfiguration.class, + SpringDocConfigProperties.class, + SpringDocHateoasConfiguration.class + )) + .withBean("globalOpenApiCustomizer", GlobalOpenApiCustomizer.class, () -> mock(GlobalOpenApiCustomizer.class)) + .run(context -> { + assertThat(context).getBeanNames(GlobalOpenApiCustomizer.class) + .hasSize(2) + .containsExactlyInAnyOrder(LINKS_SCHEMA_CUSTOMIZER, "globalOpenApiCustomizer"); + }); + } - @Test - void linksSchemaCustomizerShouldNotBeRegisteredIfBeanWithSameNameAlreadyExists() { - new WebApplicationContextRunner() - .withPropertyValues( - "springdoc.api-docs.enabled=true", - "springdoc.enable-hateoas=true" - ) - .withConfiguration(AutoConfigurations.of( - WebMvcAutoConfiguration.class, - HateoasConfiguration.class, - SpringDocConfiguration.class, - SpringDocConfigProperties.class, - SpringDocHateoasConfiguration.class - )) - .withBean(LINKS_SCHEMA_CUSTOMIZER, GlobalOpenApiCustomizer.class, () -> mock(GlobalOpenApiCustomizer.class)) - .run(context -> { - assertThat(context).getBeanNames(GlobalOpenApiCustomizer.class) - .hasSize(2) + @Test + void linksSchemaCustomizerShouldNotBeRegisteredIfBeanWithSameNameAlreadyExists() { + new WebApplicationContextRunner() + .withPropertyValues( + "springdoc.api-docs.enabled=true", + "springdoc.enable-hateoas=true" + ) + .withConfiguration(AutoConfigurations.of( + WebMvcAutoConfiguration.class, + HateoasConfiguration.class, + SpringDocConfiguration.class, + SpringDocConfigProperties.class, + SpringDocHateoasConfiguration.class + )) + .withBean(LINKS_SCHEMA_CUSTOMIZER, GlobalOpenApiCustomizer.class, () -> mock(GlobalOpenApiCustomizer.class)) + .run(context -> { + assertThat(context).getBeanNames(GlobalOpenApiCustomizer.class) + .hasSize(2) .contains(LINKS_SCHEMA_CUSTOMIZER); - assertThat(context.getBean(LINKS_SCHEMA_CUSTOMIZER)).isNotExactlyInstanceOf(OpenApiHateoasLinksCustomizer.class); - }); - } + assertThat(context.getBean(LINKS_SCHEMA_CUSTOMIZER)).isNotExactlyInstanceOf(OpenApiHateoasLinksCustomizer.class); + }); + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/extractor/MethodParameterPojoExtractorTest.java b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/extractor/MethodParameterPojoExtractorTest.java index 220b2f821..ada49d870 100644 --- a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/extractor/MethodParameterPojoExtractorTest.java +++ b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/extractor/MethodParameterPojoExtractorTest.java @@ -24,10 +24,12 @@ package org.springdoc.core.extractor; import java.lang.reflect.Method; +import java.util.Optional; import java.util.stream.Stream; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.springdoc.core.utils.SchemaUtils; import org.springframework.core.MethodParameter; @@ -37,6 +39,8 @@ * Tests for {@link MethodParameterPojoExtractor}. */ class MethodParameterPojoExtractorTest { + + private MethodParameterPojoExtractor methodParameterPojoExtractor = new MethodParameterPojoExtractor(new SchemaUtils(Optional.empty())); /** * Tests for {@link MethodParameterPojoExtractor#extractFrom(Class)}. */ @@ -47,7 +51,7 @@ class extractFrom { */ @Test void ifRecordObjectShouldGetField() { - Stream actual = MethodParameterPojoExtractor.extractFrom(RecordObject.class); + Stream actual = methodParameterPojoExtractor.extractFrom(RecordObject.class); assertThat(actual) .extracting(MethodParameter::getMethod) .extracting(Method::getName) @@ -59,7 +63,7 @@ void ifRecordObjectShouldGetField() { */ @Test void ifClassObjectShouldGetMethod() { - Stream actual = MethodParameterPojoExtractor.extractFrom(ClassObject.class); + Stream actual = methodParameterPojoExtractor.extractFrom(ClassObject.class); assertThat(actual) .extracting(MethodParameter::getMethod) .extracting(Method::getName) diff --git a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/model/MethodAttributesTest.java b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/model/MethodAttributesTest.java index e65bd7602..8950b35c0 100644 --- a/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/model/MethodAttributesTest.java +++ b/springdoc-openapi-starter-common/src/test/java/org/springdoc/core/model/MethodAttributesTest.java @@ -4,20 +4,30 @@ import java.util.Locale; import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import org.springdoc.core.models.MethodAttributes; +import org.springframework.core.annotation.AnnotatedElementUtils; +import org.springframework.web.bind.annotation.RequestMapping; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.mockito.BDDMockito.given; public class MethodAttributesTest { + private static final String APPLICATION_JSON = "application/json"; + private static final String APPLICATION_XML = "application/xml"; + private static final String APPLICATION_YAML = "application/yaml"; + @Test - public void testMergeArrays() throws Exception { - MethodAttributes methodAttributes = new MethodAttributes("application/json", "application/xml", Locale.ENGLISH); + void testMergeArrays() throws Exception { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); - String[] array1 = {"application/json", "application/xml"}; - String[] array2 = {"application/xml", "application/yaml"}; + String[] array1 = {APPLICATION_JSON, APPLICATION_XML}; + String[] array2 = {APPLICATION_XML, APPLICATION_YAML}; - String[] expected = {"application/json", "application/xml", "application/yaml"}; + String[] expected = {APPLICATION_JSON, APPLICATION_XML, APPLICATION_YAML}; Method mergeArraysMethod = MethodAttributes.class.getDeclaredMethod("mergeArrays", String[].class, String[].class); mergeArraysMethod.setAccessible(true); @@ -27,13 +37,13 @@ public void testMergeArrays() throws Exception { } @Test - public void testMergeArraysWithNullArray1() throws Exception { - MethodAttributes methodAttributes = new MethodAttributes("application/json", "application/xml", Locale.ENGLISH); + void testMergeArraysWithNullArray1() throws Exception { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); String[] array1 = null; - String[] array2 = {"application/xml", "application/yaml"}; + String[] array2 = {APPLICATION_XML, APPLICATION_YAML}; - String[] expected = {"application/xml", "application/yaml"}; + String[] expected = {APPLICATION_XML, APPLICATION_YAML}; Method mergeArraysMethod = MethodAttributes.class.getDeclaredMethod("mergeArrays", String[].class, String[].class); mergeArraysMethod.setAccessible(true); @@ -43,28 +53,177 @@ public void testMergeArraysWithNullArray1() throws Exception { } @Test - public void testDefaultProducesMediaType() { - MethodAttributes methodAttributes = new MethodAttributes("application/json", "application/xml", Locale.ENGLISH); + void testDefaultProducesMediaType() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); Method method = this.getClass().getDeclaredMethods()[0]; methodAttributes.calculateConsumesProduces(method); - String[] expectedProduces = {"application/xml"}; + String[] expectedProduces = {APPLICATION_XML}; String[] resultProduces = methodAttributes.getMethodProduces(); assertArrayEquals(expectedProduces, resultProduces); } @Test - public void testDefaultConsumesMediaType() { - MethodAttributes methodAttributes = new MethodAttributes("application/json", "application/xml", Locale.ENGLISH); + void testDefaultConsumesMediaType() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); Method method = this.getClass().getDeclaredMethods()[0]; methodAttributes.calculateConsumesProduces(method); - String[] expectedConsumes = {"application/json"}; + String[] expectedConsumes = {APPLICATION_JSON}; String[] resultConsumes = methodAttributes.getMethodConsumes(); assertArrayEquals(expectedConsumes, resultConsumes); } + + @Test + void methodConsumesOverridesClassConsumes() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); + RequestMapping requestMapping = givenAnnotationHasMediaTypeAnnotations( + new String[]{APPLICATION_JSON, APPLICATION_XML}, + new String[]{APPLICATION_JSON, APPLICATION_XML} + ); + Method method = this.getClass().getDeclaredMethods()[0]; + try (MockedStatic annotatedElementUtils = Mockito.mockStatic(AnnotatedElementUtils.class)) { + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class)) + .thenReturn(requestMapping); + + methodAttributes.setClassConsumes(new String[]{APPLICATION_YAML}); + methodAttributes.calculateConsumesProduces(method); + + String[] expectedConsumes = {APPLICATION_JSON, APPLICATION_XML}; + String[] resultConsumes = methodAttributes.getMethodConsumes(); + + assertArrayEquals(expectedConsumes, resultConsumes); + } + } + + @Test + void methodProducesOverridesClassProduces() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); + RequestMapping requestMapping = givenAnnotationHasMediaTypeAnnotations( + new String[]{APPLICATION_JSON, APPLICATION_XML}, + new String[]{APPLICATION_JSON, APPLICATION_XML} + ); + Method method = this.getClass().getDeclaredMethods()[0]; + try (MockedStatic annotatedElementUtils = Mockito.mockStatic(AnnotatedElementUtils.class)) { + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class)) + .thenReturn(requestMapping); + + methodAttributes.setClassProduces(new String[]{APPLICATION_YAML}); + methodAttributes.calculateConsumesProduces(method); + + String[] expectedProduces = {APPLICATION_JSON, APPLICATION_XML}; + String[] resultProduces = methodAttributes.getMethodProduces(); + + assertArrayEquals(expectedProduces, resultProduces); + } + } + + @Test + void methodConsumesIsSetToClassConsumesIfNoMethodConsumesIsDefined() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); + RequestMapping requestMapping = givenAnnotationHasMediaTypeAnnotations( + new String[]{APPLICATION_JSON, APPLICATION_XML}, + new String[]{} + ); + Method method = this.getClass().getDeclaredMethods()[0]; + try (MockedStatic annotatedElementUtils = Mockito.mockStatic(AnnotatedElementUtils.class)) { + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class)) + .thenReturn(requestMapping); + + String[] classConsumes = new String[]{APPLICATION_YAML}; + methodAttributes.setClassConsumes(classConsumes); + methodAttributes.calculateConsumesProduces(method); + + String[] resultConsumes = methodAttributes.getMethodConsumes(); + + assertArrayEquals(classConsumes, resultConsumes); + } + } + + @Test + void methodProducesIsSetToClassProducesIfNoMethodProducesIsDefined() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); + RequestMapping requestMapping = givenAnnotationHasMediaTypeAnnotations( + new String[]{}, + new String[]{APPLICATION_JSON, APPLICATION_XML} + ); + Method method = this.getClass().getDeclaredMethods()[0]; + try (MockedStatic annotatedElementUtils = Mockito.mockStatic(AnnotatedElementUtils.class)) { + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class)) + .thenReturn(requestMapping); + + String[] classProduces = new String[]{APPLICATION_YAML}; + methodAttributes.setClassProduces(classProduces); + methodAttributes.calculateConsumesProduces(method); + + String[] resultProduces = methodAttributes.getMethodProduces(); + + assertArrayEquals(classProduces, resultProduces); + } + } + + @Test + void methodConsumesIsSetToClassConsumesIfNoMethodConsumesIsDefinedAndClassConsumesNotSet() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); + String[] classConsumes = new String[]{APPLICATION_YAML}; + RequestMapping requestMapping = givenAnnotationHasMediaTypeAnnotations( + new String[]{APPLICATION_JSON, APPLICATION_XML}, + new String[]{} + ); + RequestMapping classMapping = givenAnnotationHasMediaTypeAnnotations( + new String[]{}, + classConsumes + ); + Method method = this.getClass().getDeclaredMethods()[0]; + try (MockedStatic annotatedElementUtils = Mockito.mockStatic(AnnotatedElementUtils.class)) { + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class)) + .thenReturn(requestMapping); + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method.getDeclaringClass(), RequestMapping.class)) + .thenReturn(classMapping); + + methodAttributes.calculateConsumesProduces(method); + + String[] resultConsumes = methodAttributes.getMethodConsumes(); + + assertArrayEquals(classConsumes, resultConsumes); + } + } + + @Test + void methodProducesIsSetToClassProducesIfNoMethodProducesIsDefinedAndClassProducesNotSet() { + MethodAttributes methodAttributes = new MethodAttributes(APPLICATION_JSON, APPLICATION_XML, Locale.ENGLISH); + String[] classProduces = new String[]{APPLICATION_YAML}; + RequestMapping requestMapping = givenAnnotationHasMediaTypeAnnotations( + new String[]{}, + new String[]{APPLICATION_JSON, APPLICATION_XML} + ); + RequestMapping classMapping = givenAnnotationHasMediaTypeAnnotations( + classProduces, + new String[]{} + ); + Method method = this.getClass().getDeclaredMethods()[0]; + try (MockedStatic annotatedElementUtils = Mockito.mockStatic(AnnotatedElementUtils.class)) { + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class)) + .thenReturn(requestMapping); + annotatedElementUtils.when(() -> AnnotatedElementUtils.findMergedAnnotation(method.getDeclaringClass(), RequestMapping.class)) + .thenReturn(classMapping); + + methodAttributes.calculateConsumesProduces(method); + + String[] resultProduces = methodAttributes.getMethodProduces(); + + assertArrayEquals(classProduces, resultProduces); + } + } + + private RequestMapping givenAnnotationHasMediaTypeAnnotations(String[] produces, String[] consumes) { + RequestMapping requestMapping = Mockito.mock(RequestMapping.class); + given(requestMapping.produces()).willReturn(produces); + given(requestMapping.consumes()).willReturn(consumes); + return requestMapping; + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/AbstractSwaggerIndexTransformerTest.java b/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/AbstractSwaggerIndexTransformerTest.java index d44d6d887..c103a063b 100644 --- a/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/AbstractSwaggerIndexTransformerTest.java +++ b/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/AbstractSwaggerIndexTransformerTest.java @@ -22,47 +22,49 @@ @ExtendWith(MockitoExtension.class) class AbstractSwaggerIndexTransformerTest { - private SwaggerUiConfigProperties swaggerUiConfig; - @Mock - private SwaggerUiOAuthProperties swaggerUiOAuthProperties; + private final String swaggerInitJs = "window.onload = function() {\n" + + "\n" + + " window.ui = SwaggerUIBundle({\n" + + " url: \"https://petstore.swagger.io/v2/swagger.json\",\n" + + " dom_id: '#swagger-ui',\n" + + " deepLinking: true,\n" + + " presets: [\n" + + " SwaggerUIBundle.presets.apis,\n" + + " SwaggerUIStandalonePreset\n" + + " ],\n" + + " plugins: [\n" + + " SwaggerUIBundle.plugins.DownloadUrl\n" + + " ],\n" + + " layout: \"StandaloneLayout\"\n" + + " });\n" + + "\n" + + " //\n" + + "};"; - private ObjectMapperProvider objectMapperProvider; + private final InputStream is = new ByteArrayInputStream(swaggerInitJs.getBytes(StandardCharsets.UTF_8)); - private AbstractSwaggerIndexTransformer underTest; + private final String apiDocUrl = "http://test.springdoc.com/apidoc"; - private final String swaggerInitJs = "window.onload = function() {\n" + - "\n" + - " window.ui = SwaggerUIBundle({\n" + - " url: \"https://petstore.swagger.io/v2/swagger.json\",\n" + - " dom_id: '#swagger-ui',\n" + - " deepLinking: true,\n" + - " presets: [\n" + - " SwaggerUIBundle.presets.apis,\n" + - " SwaggerUIStandalonePreset\n" + - " ],\n" + - " plugins: [\n" + - " SwaggerUIBundle.plugins.DownloadUrl\n" + - " ],\n" + - " layout: \"StandaloneLayout\"\n" + - " });\n" + - "\n" + - " //\n" + - "};"; - private final InputStream is = new ByteArrayInputStream(swaggerInitJs.getBytes(StandardCharsets.UTF_8)); + private SwaggerUiConfigProperties swaggerUiConfig; - private final String apiDocUrl = "http://test.springdoc.com/apidoc"; + @Mock + private SwaggerUiOAuthProperties swaggerUiOAuthProperties; - @BeforeEach - public void setup(){ - swaggerUiConfig = new SwaggerUiConfigProperties(); - swaggerUiConfig.setUrl(apiDocUrl); + private ObjectMapperProvider objectMapperProvider; + + private AbstractSwaggerIndexTransformer underTest; + + @BeforeEach + public void setup() { + swaggerUiConfig = new SwaggerUiConfigProperties(); + swaggerUiConfig.setUrl(apiDocUrl); objectMapperProvider = new ObjectMapperProvider(new SpringDocConfigProperties()); - underTest = new AbstractSwaggerIndexTransformer(swaggerUiConfig, swaggerUiOAuthProperties, objectMapperProvider); - } + underTest = new AbstractSwaggerIndexTransformer(swaggerUiConfig, swaggerUiOAuthProperties, objectMapperProvider); + } - @Test - void setApiDocUrlCorrectly() throws IOException { - var html = underTest.defaultTransformations(new SwaggerUiConfigParameters(swaggerUiConfig), is); - assertThat(html, containsString(apiDocUrl)); - } + @Test + void setApiDocUrlCorrectly() throws IOException { + var html = underTest.defaultTransformations(new SwaggerUiConfigParameters(swaggerUiConfig), is); + assertThat(html, containsString(apiDocUrl)); + } } diff --git a/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/SwaggerResourceResolverUtilsTest.java b/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/SwaggerResourceResolverUtilsTest.java index 04fd1a1f7..a6612ff62 100644 --- a/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/SwaggerResourceResolverUtilsTest.java +++ b/springdoc-openapi-starter-common/src/test/java/org/springdoc/ui/SwaggerResourceResolverUtilsTest.java @@ -16,21 +16,21 @@ class SwaggerResourceResolverUtilsTest { @Test void findWebJarResourcePath() { String path = "swagger-ui/swagger-initializer.js"; - String actual = findSwaggerResourcePath(path,VERSION); + String actual = findSwaggerResourcePath(path, VERSION); assertEquals("swagger-ui" + File.separator + "4.18.2" + File.separator + "swagger-initializer.js", actual); } @Test void returnNullWhenPathIsSameAsWebjar() { String path = "swagger-ui"; - String actual = findSwaggerResourcePath(path,VERSION); + String actual = findSwaggerResourcePath(path, VERSION); assertTrue(Objects.isNull(actual)); } @Test void returnNullWhenVersionIsNull() { String path = "swagger-ui/swagger-initializer.js"; - String actual = findSwaggerResourcePath(path,null); + String actual = findSwaggerResourcePath(path, null); assertTrue(Objects.isNull(actual)); } } diff --git a/springdoc-openapi-starter-webflux-api/pom.xml b/springdoc-openapi-starter-webflux-api/pom.xml index 51ce89e9a..f7dfb371c 100644 --- a/springdoc-openapi-starter-webflux-api/pom.xml +++ b/springdoc-openapi-starter-webflux-api/pom.xml @@ -3,9 +3,10 @@ org.springdoc springdoc-openapi - 2.8.5 + 2.8.13 springdoc-openapi-starter-webflux-api + ${project.artifactId} @@ -20,20 +21,9 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-actuator-autoconfigure true - - org.springframework.boot - spring-boot-starter-reactor-netty - test - - - io.netty - netty-resolver-dns-native-macos - osx-aarch_64 - test - @@ -51,4 +41,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiActuatorResource.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiActuatorResource.java index b7237f0b5..2e7e43623 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiActuatorResource.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiActuatorResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.api; diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiResource.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiResource.java index 6606e1d19..4240e22af 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiResource.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.api; @@ -90,15 +90,14 @@ public abstract class MultipleOpenApiResource implements InitializingBean { private final SpringDocProviders springDocProviders; /** - * The Grouped open api resources. + * The Spring doc customizers. */ - private Map groupedOpenApiResources; - + private final SpringDocCustomizers springDocCustomizers; /** - * The Spring doc customizers. + * The Grouped open api resources. */ - private final SpringDocCustomizers springDocCustomizers; + private Map groupedOpenApiResources; /** * Instantiates a new Multiple open api resource. @@ -143,7 +142,7 @@ public void afterPropertiesSet() { springDocConfigProperties.addGroupConfig(groupConfig); return buildWebFluxOpenApiResource(item); }, - (existingValue, newValue) -> existingValue // choice to keep the existing value + (existingValue, newValue) -> existingValue // choice to keep the existing value )); } @@ -162,7 +161,7 @@ private OpenApiResource buildWebFluxOpenApiResource(GroupedOpenApi item) { operationParser, springDocConfigProperties, springDocProviders, new SpringDocCustomizers(Optional.of(item.getOpenApiCustomizers()), Optional.of(item.getOperationCustomizers()), - Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters())) + Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters()), Optional.empty(), Optional.empty()) ); else return new OpenApiActuatorResource(item.getGroup(), @@ -172,7 +171,7 @@ springDocProviders, new SpringDocCustomizers(Optional.of(item.getOpenApiCustomiz operationParser, springDocConfigProperties, springDocProviders, new SpringDocCustomizers(Optional.of(item.getOpenApiCustomizers()), Optional.of(item.getOperationCustomizers()), - Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters()))); + Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters()), Optional.empty(), Optional.empty())); } /** diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiWebFluxResource.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiWebFluxResource.java index 7723dca71..d5718f1d3 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiWebFluxResource.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/MultipleOpenApiWebFluxResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.api; @@ -76,7 +76,7 @@ public class MultipleOpenApiWebFluxResource extends MultipleOpenApiResource { */ public MultipleOpenApiWebFluxResource(List groupedOpenApis, ObjectFactory defaultOpenAPIBuilder, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, - SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers ) { + SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { super(groupedOpenApis, defaultOpenAPIBuilder, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiActuatorResource.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiActuatorResource.java index 715cb0c90..d380d3b1c 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiActuatorResource.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiActuatorResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.api; @@ -79,7 +79,7 @@ public class OpenApiActuatorResource extends OpenApiResource { public OpenApiActuatorResource(String groupName, ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { - super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); + super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } /** @@ -131,10 +131,10 @@ public Mono openapiYaml(ServerHttpRequest serverHttpRequest, Locale loca } @Override - protected void calculateServerUrl(ServerHttpRequest serverHttpRequest, String apiDocsUrl, Locale locale) { + protected String calculateServerUrl(ServerHttpRequest serverHttpRequest, String apiDocsUrl, Locale locale) { super.initOpenAPIBuilder(locale); URI uri = getActuatorURI(serverHttpRequest.getURI().getScheme(), serverHttpRequest.getURI().getHost()); - openAPIService.setServerBaseUrl(uri.toString(), serverHttpRequest); + return openAPIService.calculateServerBaseUrl(uri.toString(), serverHttpRequest); } @Override diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiResource.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiResource.java index da2e12e21..d0f3eb0b9 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiResource.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.api; @@ -86,7 +86,7 @@ protected OpenApiResource(String groupName, ObjectFactory openAP GenericResponseService responseBuilder, OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { - super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser,springDocConfigProperties, springDocProviders, springDocCustomizers); + super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } /** @@ -103,7 +103,7 @@ protected OpenApiResource(String groupName, ObjectFactory openAP protected OpenApiResource(ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, - SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers ) { + SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { super(DEFAULT_GROUP_NAME, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } @@ -119,8 +119,8 @@ protected OpenApiResource(ObjectFactory openAPIBuilderObjectFact */ protected Mono openapiJson(ServerHttpRequest serverHttpRequest, String apiDocsUrl, Locale locale) throws JsonProcessingException { - calculateServerUrl(serverHttpRequest, apiDocsUrl, locale); - OpenAPI openAPI = this.getOpenApi(locale); + String serverBaseUrl = calculateServerUrl(serverHttpRequest, apiDocsUrl, locale); + OpenAPI openAPI = this.getOpenApi(serverBaseUrl, locale); return Mono.just(writeJsonValue(openAPI)); } @@ -135,8 +135,8 @@ protected Mono openapiJson(ServerHttpRequest serverHttpRequest, String a */ protected Mono openapiYaml(ServerHttpRequest serverHttpRequest, String apiDocsUrl, Locale locale) throws JsonProcessingException { - calculateServerUrl(serverHttpRequest, apiDocsUrl, locale); - OpenAPI openAPI = this.getOpenApi(locale); + String serverBaseUrl = calculateServerUrl(serverHttpRequest, apiDocsUrl, locale); + OpenAPI openAPI = this.getOpenApi(serverBaseUrl, locale); return Mono.just(writeYamlValue(openAPI)); } @@ -144,7 +144,7 @@ protected Mono openapiYaml(ServerHttpRequest serverHttpRequest, String a * Gets paths. * * @param restControllers the rest controllers - * @param locale the locale + * @param locale the locale */ @Override @SuppressWarnings("unchecked") @@ -233,10 +233,10 @@ protected void getWebFluxRouterFunctionPaths(Locale locale, OpenAPI openAPI) { * @param apiDocsUrl the api docs url * @param locale the locale */ - protected void calculateServerUrl(ServerHttpRequest serverHttpRequest, String apiDocsUrl, Locale locale) { + protected String calculateServerUrl(ServerHttpRequest serverHttpRequest, String apiDocsUrl, Locale locale) { initOpenAPIBuilder(locale); String serverUrl = getServerUrl(serverHttpRequest, apiDocsUrl); - openAPIService.setServerBaseUrl(serverUrl, serverHttpRequest); + return openAPIService.calculateServerBaseUrl(serverUrl, serverHttpRequest); } /** diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiWebfluxResource.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiWebfluxResource.java index a25f33ab8..9bf17d157 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiWebfluxResource.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/api/OpenApiWebfluxResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.api; @@ -97,7 +97,7 @@ public OpenApiWebfluxResource(String groupName, ObjectFactory op */ @Autowired public OpenApiWebfluxResource(ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, - OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, + OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } @@ -106,8 +106,8 @@ public OpenApiWebfluxResource(ObjectFactory openAPIBuilderObject * Openapi json mono. * * @param serverHttpRequest the server http request - * @param apiDocsUrl the api docs url - * @param locale the locale + * @param apiDocsUrl the api docs url + * @param locale the locale * @return the mono * @throws JsonProcessingException the json processing exception */ @@ -123,8 +123,8 @@ public Mono openapiJson(ServerHttpRequest serverHttpRequest, @Value(API_ * Openapi yaml mono. * * @param serverHttpRequest the server http request - * @param apiDocsUrl the api docs url - * @param locale the locale + * @param apiDocsUrl the api docs url + * @param locale the locale * @return the mono * @throws JsonProcessingException the json processing exception */ @@ -140,7 +140,7 @@ public Mono openapiYaml(ServerHttpRequest serverHttpRequest, * Gets server url. * * @param serverHttpRequest the server http request - * @param apiDocsUrl the api docs url + * @param apiDocsUrl the api docs url * @return the server url */ @Override diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/MultipleOpenApiSupportConfiguration.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/MultipleOpenApiSupportConfiguration.java index f9331d49d..1f1eea887 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/MultipleOpenApiSupportConfiguration.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/MultipleOpenApiSupportConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.core.configuration; diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/SpringDocWebFluxConfiguration.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/SpringDocWebFluxConfiguration.java index 49bee0990..2ac3e53e9 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/SpringDocWebFluxConfiguration.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/configuration/SpringDocWebFluxConfiguration.java @@ -21,18 +21,17 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.core.configuration; -import java.util.List; import java.util.Optional; import org.springdoc.core.configuration.SpringDocConfiguration; -import org.springdoc.core.customizers.ParameterCustomizer; import org.springdoc.core.customizers.SpringDocCustomizers; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; +import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.properties.SpringDocConfigProperties; import org.springdoc.core.providers.ActuatorProvider; import org.springdoc.core.providers.SpringDocProviders; @@ -110,18 +109,20 @@ OpenApiWebfluxResource openApiResource(ObjectFactory openAPIBuil * * @param parameterBuilder the parameter builder * @param requestBodyService the request body builder - * @param parameterCustomizers the parameter customizers + * @param customizers the customizers * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer + * @param methodParameterPojoExtractor the method parameter pojo extractor * @return the request builder */ @Bean @ConditionalOnMissingBean @Lazy(false) RequestService requestBuilder(GenericParameterService parameterBuilder, RequestBodyService requestBodyService, - Optional> parameterCustomizers, - SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) { - return new RequestService(parameterBuilder, requestBodyService, - parameterCustomizers, localSpringDocParameterNameDiscoverer); + SpringDocCustomizers customizers, + SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, + MethodParameterPojoExtractor methodParameterPojoExtractor) { + return new RequestService(parameterBuilder, requestBodyService, + customizers, localSpringDocParameterNameDiscoverer,methodParameterPojoExtractor); } /** @@ -162,10 +163,10 @@ static class SpringDocWebFluxActuatorConfiguration { /** * Actuator provider actuator provider. * - * @param serverProperties the server properties - * @param springDocConfigProperties the spring doc config properties - * @param managementServerProperties the management server properties - * @param webEndpointProperties the web endpoint properties + * @param serverProperties the server properties + * @param springDocConfigProperties the spring doc config properties + * @param managementServerProperties the management server properties + * @param webEndpointProperties the web endpoint properties * @return the actuator provider */ @Bean diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/fn/SpringdocRouteBuilder.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/fn/SpringdocRouteBuilder.java index 46259db45..4bfa7980d 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/fn/SpringdocRouteBuilder.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/fn/SpringdocRouteBuilder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.core.fn; diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/ActuatorWebFluxProvider.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/ActuatorWebFluxProvider.java index 5e03f9451..b8fbfc26a 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/ActuatorWebFluxProvider.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/ActuatorWebFluxProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.core.providers; @@ -50,14 +50,14 @@ */ public class ActuatorWebFluxProvider extends ActuatorProvider implements ApplicationContextAware { - + /** * Instantiates a new Actuator web flux provider. * - * @param serverProperties the server properties - * @param springDocConfigProperties the spring doc config properties - * @param managementServerProperties the management server properties - * @param webEndpointProperties the web endpoint properties + * @param serverProperties the server properties + * @param springDocConfigProperties the spring doc config properties + * @param managementServerProperties the management server properties + * @param webEndpointProperties the web endpoint properties */ public ActuatorWebFluxProvider(ServerProperties serverProperties, SpringDocConfigProperties springDocConfigProperties, @@ -65,7 +65,7 @@ public ActuatorWebFluxProvider(ServerProperties serverProperties, Optional webEndpointProperties) { super(managementServerProperties, webEndpointProperties, serverProperties, springDocConfigProperties); } - + public Map getMethods() { Map mappingInfoHandlerMethodMap = new HashMap<>(); diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/SpringWebFluxProvider.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/SpringWebFluxProvider.java index 2c5e92cd9..1acca1186 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/SpringWebFluxProvider.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/providers/SpringWebFluxProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.core.providers; diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/service/RequestService.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/service/RequestService.java index 5a293e578..7617aab0d 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/service/RequestService.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/service/RequestService.java @@ -21,16 +21,14 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.core.service; -import java.util.List; -import java.util.Optional; - -import org.springdoc.core.customizers.ParameterCustomizer; +import org.springdoc.core.customizers.SpringDocCustomizers; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; +import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.service.AbstractRequestService; import org.springdoc.core.service.GenericParameterService; import org.springdoc.core.service.RequestBodyService; @@ -62,12 +60,14 @@ public class RequestService extends AbstractRequestService { * * @param parameterBuilder the parameter builder * @param requestBodyService the request body builder - * @param parameterCustomizers the parameter customizers + * @param customizers the parameter customizers * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer + * @param methodParameterPojoExtractor the method parameter pojo extractor */ public RequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService, - Optional> parameterCustomizers, - SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) { - super(parameterBuilder, requestBodyService, parameterCustomizers, localSpringDocParameterNameDiscoverer); + SpringDocCustomizers customizers, + SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, + MethodParameterPojoExtractor methodParameterPojoExtractor) { + super(parameterBuilder, requestBodyService, customizers, localSpringDocParameterNameDiscoverer,methodParameterPojoExtractor); } } diff --git a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/visitor/RouterFunctionVisitor.java b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/visitor/RouterFunctionVisitor.java index 57a417028..25ba6e58b 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/visitor/RouterFunctionVisitor.java +++ b/springdoc-openapi-starter-webflux-api/src/main/java/org/springdoc/webflux/core/visitor/RouterFunctionVisitor.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.core.visitor; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java index a26b7e6f2..d3971928b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -42,7 +42,7 @@ @AutoConfigureWebTestClient(timeout = "3600000") @ActiveProfiles("test") -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractCommonTest { protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class); diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index 3d7c5fef0..4bc88c5b6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java index 834dd9c39..4d990fabb 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java index cc62d7d89..54d5aafb5 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java index 98d216ef1..0fddf52b0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/TestController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/TestController.java index 4ce1f3a02..d91545f67 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/TestController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app102/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java index a8f86a654..57be1023a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java index d9f307ab2..ac53b0ebe 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HiddenHelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HiddenHelloController.java index 344d88387..10e448227 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HiddenHelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/HiddenHelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java index 9df343416..19a101ba6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/HelloRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/HelloRouter.java index f6058f717..b18e7e718 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/HelloRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/HelloRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app150; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java index a7db7997d..060f754fc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app150; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/HelloRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/HelloRouter.java index 45360dd8b..6ac6970a0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/HelloRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/HelloRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app151; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java index 4e9ddee45..731107000 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app151; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java index 8909d3b63..9839edcfa 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app152; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java index 2eff5a905..3b88f45c3 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app152; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultRequestMappingHandlerMapping.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultRequestMappingHandlerMapping.java index 83e6bc286..fca47155d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultRequestMappingHandlerMapping.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultRequestMappingHandlerMapping.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultWebFluxRegistrations.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultWebFluxRegistrations.java index 982354999..35c31293d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultWebFluxRegistrations.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/DefaultWebFluxRegistrations.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java index 24141c747..c8cf8b54c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/TestController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/TestController.java index fd822d8e5..ec0a995f6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/TestController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app153/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/HelloController.java index 7968f97b6..df67ecaf2 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app184; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/SpringDocApp184Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/SpringDocApp184Test.java index 050096df8..aef5d11c2 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/SpringDocApp184Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app184/SpringDocApp184Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app184; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/DuplicatedPathController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/DuplicatedPathController.java index 036ff6c30..b2e18a88a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/DuplicatedPathController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/DuplicatedPathController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app187; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/SpringDocApp187Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/SpringDocApp187Test.java index 9953eac67..9c0d384cf 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/SpringDocApp187Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app187/SpringDocApp187Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app187; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/OrderDemo.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/OrderDemo.java index c99a1b881..cf87ea0c8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/OrderDemo.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/OrderDemo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app188; @@ -48,7 +48,7 @@ public void customise(OpenAPI openApi) { openApi.addTagsItem(new Tag().name("3")); } } - + public static class Customizer1 implements OpenApiCustomizer, GlobalOpenApiCustomizer { public void customise(OpenAPI openApi) { openApi.addTagsItem(new Tag().name("1")); diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/SpringDocApp188Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/SpringDocApp188Test.java index 6d15cd802..944499b01 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/SpringDocApp188Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app188/SpringDocApp188Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app188; @@ -40,7 +40,7 @@ class SpringDocApp188Test extends AbstractSpringDocTest { @Test void testApp1() { - webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL +"/mygroup").exchange() + webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + "/mygroup").exchange() .expectStatus().isOk() .expectBody().json(getContent("results/3.0.1/app188.json"), true); } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/HelloController.java index deb1368ae..30343be0a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app189; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocApp189Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocApp189Test.java index a1a103533..963246ffc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocApp189Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocApp189Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app189; @@ -41,23 +41,24 @@ @WebFluxTest public class SpringDocApp189Test extends AbstractCommonTest { - @Test - public void testWithDifferentLocales() throws Exception { - runTestWithLocale("en-GB"); - runTestWithLocale("de-DE"); - } - private void runTestWithLocale(String locale) throws JSONException { - EntityExchangeResult getResult = webTestClient.mutate().responseTimeout(Duration.ofMinutes(1000)).build() - .get().uri(Constants.DEFAULT_API_DOCS_URL) - .header("Accept-Language", locale) - .exchange() - .expectStatus().isOk().expectBody().returnResult(); - - String result = new String(getResult.getResponseBody()); - String className = getClass().getSimpleName(); - String testNumber = className.replaceAll("[^0-9]", ""); - String expected = getContent("results/3.0.1/app" + testNumber + ".json"); - assertEquals(expected, result, true); - } + @Test + public void testWithDifferentLocales() throws Exception { + runTestWithLocale("en-GB"); + runTestWithLocale("de-DE"); + } + + private void runTestWithLocale(String locale) throws JSONException { + EntityExchangeResult getResult = webTestClient.mutate().responseTimeout(Duration.ofMinutes(1000)).build() + .get().uri(Constants.DEFAULT_API_DOCS_URL) + .header("Accept-Language", locale) + .exchange() + .expectStatus().isOk().expectBody().returnResult(); + + String result = new String(getResult.getResponseBody()); + String className = getClass().getSimpleName(); + String testNumber = className.replaceAll("[^0-9]", ""); + String expected = getContent("results/3.0.1/app" + testNumber + ".json"); + assertEquals(expected, result, true); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocTestApp.java index 5cd3219d1..955082617 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app189/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app189; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190Test.java index 31942d4d2..ffddeaa31 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app190; @@ -36,16 +36,16 @@ import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_DEFAULT_API_DOCS; -@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=false") +@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=false") public class SpringDocApp190Test extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v30.app190" }) - static class SpringDocTestApp {} - @Test void test_disable_default_api_docs() throws Exception { webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL).exchange() .expectStatus().isNotFound(); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v30.app190" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190bisTest.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190bisTest.java index de57544e3..315adf934 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190bisTest.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190bisTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app190; @@ -36,16 +36,16 @@ import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_DEFAULT_API_DOCS; -@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=true") +@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=true") public class SpringDocApp190bisTest extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v30.app190" }) - static class SpringDocTestApp {} - @Test void test_enable_default_api_docs() throws Exception { webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL).exchange() .expectStatus().isOk(); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v30.app190" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/BaseHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/BaseHandler.java index 1c9738ca5..c3ce71921 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/BaseHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/BaseHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191.Handler; @@ -34,9 +34,9 @@ @Component public abstract class BaseHandler { - protected abstract Mono apply (ServerRequest serverRequest); + protected abstract Mono apply(ServerRequest serverRequest); - public Mono handle(ServerRequest serverRequest) { - return this.apply(serverRequest); - } + public Mono handle(ServerRequest serverRequest) { + return this.apply(serverRequest); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/GetNameHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/GetNameHandler.java index 3a77ca5b9..1494f5c11 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/GetNameHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Handler/GetNameHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191.Handler; @@ -34,12 +34,12 @@ import org.springframework.web.reactive.function.server.ServerResponse; @Component -public class GetNameHandler extends BaseHandler{ - @Override - protected Mono apply(ServerRequest serverRequest) { - return ServerResponse.ok() - .contentType(MediaType.APPLICATION_JSON) - .bodyValue("Name API is called"); - } +public class GetNameHandler extends BaseHandler { + @Override + protected Mono apply(ServerRequest serverRequest) { + return ServerResponse.ok() + .contentType(MediaType.APPLICATION_JSON) + .bodyValue("Name API is called"); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Router/GetNameRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Router/GetNameRouter.java index d6769ed1d..2c606ac59 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Router/GetNameRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/Router/GetNameRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191.Router; @@ -47,17 +47,17 @@ @Configuration public class GetNameRouter { - @Bean - @RouterOperations( - value = { - @RouterOperation(path = "/v1/name", produces = {MediaType.APPLICATION_JSON_VALUE}, method = RequestMethod.GET, - beanClass = GetNameHandler.class, beanMethod = "handle", operation = @Operation(operationId = "getName", - description = "get name", responses = {@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = String.class)))}) - ) - }) - - public RouterFunction routerFunction(GetNameHandler getNameHandler) { - return RouterFunctions.route(RequestPredicates.GET("/v1/name"), getNameHandler::handle); - } + @Bean + @RouterOperations( + value = { + @RouterOperation(path = "/v1/name", produces = { MediaType.APPLICATION_JSON_VALUE }, method = RequestMethod.GET, + beanClass = GetNameHandler.class, beanMethod = "handle", operation = @Operation(operationId = "getName", + description = "get name", responses = { @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = String.class))) }) + ) + }) + + public RouterFunction routerFunction(GetNameHandler getNameHandler) { + return RouterFunctions.route(RequestPredicates.GET("/v1/name"), getNameHandler::handle); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java index 825274e17..597c44c97 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java index 43ef06a06..2735ac46f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java index 1108f7841..c1b3f89d7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/ExceptionTranslator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/ExceptionTranslator.java index bc3ae394e..86f991105 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/ExceptionTranslator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/TweetController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/TweetController.java index 279315459..eef8f6c0c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/TweetController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/controller/TweetController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/dto/TweetDTO.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/dto/TweetDTO.java index ccd5ec868..9eaa975bf 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/dto/TweetDTO.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/dto/TweetDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3.dto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetConflictException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetConflictException.java index e6f6ff350..35d7425db 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetConflictException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetConflictException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetNotFoundException.java index 185499956..3e9e489d4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/exception/TweetNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/payload/ErrorResponse.java index c2a6b5c0a..4cca4555a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app3/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java index 94b645bfd..244a47cc0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app39; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java index b7f0a9933..8c91e11f6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app39; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java index 8cbab5977..933164e36 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app39; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java index 9cd25deeb..0a9f12a87 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java index d7d58c2b3..c9777de9b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java index 71565d4e6..cc94b87a8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java index 70b15c62b..98eeeef38 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java index f81f72341..95ab7b11d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocTestApp.java index 22427a0c6..624e89735 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/Tweet.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/Tweet.java index f5450644a..ef0893b09 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/Tweet.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app5/Tweet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java index ae6e5ee59..9297c1f20 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app63; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java index 7140f693b..1dcfdbd9a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app63; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/toto/HelloController2.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/toto/HelloController2.java index 4c2554ef0..e5b62af47 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/toto/HelloController2.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app63/toto/HelloController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app63.toto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java index 2da2ac5ef..4f7922a8e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app64; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java index 4300db82b..58e94aa38 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app64; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java index 6091dc9fe..f6ad0842c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app65; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java index c25015780..a76a9898b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app65; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java index b77e542a7..757dce20e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocTestApp.java index 5277292f8..be4070af1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/ExceptionTranslator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/ExceptionTranslator.java index c76f7da36..7287e8cc1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/ExceptionTranslator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/TweetController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/TweetController.java index b1c2e4dcb..18a505d51 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/TweetController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/controller/TweetController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/dto/TweetDTO.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/dto/TweetDTO.java index 111f7a6b4..a9a14fe60 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/dto/TweetDTO.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/dto/TweetDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66.dto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetConflictException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetConflictException.java index cea82f9bc..21b8b6db6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetConflictException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetConflictException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetNotFoundException.java index 279a0caa1..5bda1680e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/exception/TweetNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/payload/ErrorResponse.java index 4cd3408e5..9b0066dc3 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app66/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java index 61016b603..eaedd6715 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app67; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java index 5b24e7d1e..3e7115ea9 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app67; @@ -36,7 +36,7 @@ public class SpringDocApp67Test extends AbstractSpringDocTest { @Test - void testApp() { + void testApp() { webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + groupName).exchange().expectStatus().isOk().expectBody() .jsonPath("$.openapi").isEqualTo("3.0.1") .jsonPath("$.paths./api.get.tags[0]").isEqualTo("hello-controller") diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java index 5cbfc84f9..357a37350 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/ExceptionTranslator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/ExceptionTranslator.java index 96b395e06..cd7fd5e10 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/ExceptionTranslator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/TweetController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/TweetController.java index 37ea7b5e4..f8a94ac29 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/TweetController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/controller/TweetController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/dto/TweetDTO.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/dto/TweetDTO.java index 24b7f4aa5..b6147e56b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/dto/TweetDTO.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/dto/TweetDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.dto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetConflictException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetConflictException.java index 740d92163..cb49dc582 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetConflictException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetConflictException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetNotFoundException.java index 1cc0d8fae..d6385ebb8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/exception/TweetNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/payload/ErrorResponse.java index d52834bab..0b41ff091 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app68/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/RoutingConfiguration.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/RoutingConfiguration.java index b3f18e1a2..22f8bea13 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/RoutingConfiguration.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/RoutingConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java index 9025c3564..b1807114f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/User.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/User.java index 79ed3d4be..96271483c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/User.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserHandler.java index f77f6e480..772161873 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepository.java index caf6e26a2..f9cb24234 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepositoryImpl.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepositoryImpl.java index b94fc6cf5..b28e7bd6d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepositoryImpl.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app69/UserRepositoryImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/Coffee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/Coffee.java index b41fd1c8b..a61d4d2d5 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/Coffee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/Coffee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeOrder.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeOrder.java index bb886f679..9b9fbd91b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeOrder.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeOrder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeRepository.java index 246507904..1fa457853 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeService.java index 2a8d90faa..1d4a7478d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/CoffeeService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/RouteConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/RouteConfig.java index 967752aab..e2f8b739b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/RouteConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/RouteConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java index 86f9863ba..a4db06cf1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/Employee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/Employee.java index 94f6fdf4c..c7c590da8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/Employee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/Employee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeFunctionalConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeFunctionalConfig.java index 012c9ee0a..e33e689ad 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeFunctionalConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeFunctionalConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeRepository.java index 37794c834..6cbe017c9 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java index 8472bf4e6..b6c8f9714 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/SpringDocApp72Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/SpringDocApp72Test.java index fbb07bf80..ae27961e2 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/SpringDocApp72Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/SpringDocApp72Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PersonRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PersonRouter.java index 07141a60d..11d1dd65a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PersonRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PersonRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PositionRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PositionRouter.java index 3fc4a10ca..b12564e96 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PositionRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/controller/PositionRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Person.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Person.java index 9432f84a7..846e0af3a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Person.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Position.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Position.java index 06cea5c94..86c8e0451 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Position.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Position.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Sex.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Sex.java index d2361ae1d..4b383d28b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Sex.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/entity/Sex.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/exception/PositionNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/exception/PositionNotFoundException.java index 9a63bb3d3..6de85f7d8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/exception/PositionNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/exception/PositionNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PersonHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PersonHandler.java index da05a3575..b25e1374b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PersonHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PersonHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PositionHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PositionHandler.java index 96f389b2f..8d053cc4d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PositionHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/handler/PositionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/payload/ErrorResponse.java index c6c467852..600cda7b8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/service/PersonService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/service/PersonService.java index b0b0595cf..aa53c6593 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/service/PersonService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app72/service/PersonService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72.service; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/Quote.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/Quote.java index b7c761c0b..a9f71fb29 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/Quote.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/Quote.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteGenerator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteGenerator.java index e42386616..1ca7382c8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteGenerator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteGenerator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteHandler.java index a4b9cd91b..349e9ddda 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteRouter.java index c7a08b747..286b55880 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/QuoteRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java index 9a3af3463..6b6838c8e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/Book.java index b70349944..df069b987 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRepository.java index 1e832101b..f2c2968df 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRouter.java index 40776a7a5..7a4dab036 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java index 685b2a9af..446eacba7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/Post.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/Post.java index b94b392df..a38d1bc66 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/Post.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/Post.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostHandler.java index 57d03263a..30a87b97f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRepository.java index 80d6bf261..dda71871d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRouter.java index a748b4419..39e6125a3 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/PostRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java index 949d572af..2d34e48fd 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java index 5d8939aad..fc6aba608 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app78; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java index 979cd2a83..4a3121767 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app78; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseClientModel.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseClientModel.java index ed6ecddd5..3836c5037 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseClientModel.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseController.java index 8c365769a..233ad0031 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificClientModel.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificClientModel.java index 915cd7fb1..15d897ce7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificClientModel.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificController.java index e4ebcc15c..e733c8fe0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpecificController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java index 2121c333f..6a99c77da 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/Book.java index a88884953..ec18ec0f6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRepository.java index b9ff1e510..1c0e29cdc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRouter.java index 1bc5cece7..660339bd6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java index 438a706ad..123fa2d04 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/OperationIdController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/OperationIdController.java index d3cb04bdf..bb8d4ebfd 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/OperationIdController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/OperationIdController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app81; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java index bf7969153..e94029c81 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app81; @@ -73,7 +73,7 @@ public void shouldGenerateOperationIdsDeterministically() throws Exception { when(request.getURI()).thenReturn(URI.create("http://localhost")); String expected = getContent("results/3.0.1/app81.json"); - byte[] openApiBytes =resource.openapiJson(request, "", Locale.US).block(); + byte[] openApiBytes = resource.openapiJson(request, "", Locale.US).block(); String openApi = new String(openApiBytes, StandardCharsets.UTF_8); // for UTF-8 encoding String openApi = resource.openapiJson(request, "", Locale.US).block(); assertEquals(expected, openApi, true); } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/RoutingConfiguration.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/RoutingConfiguration.java index 0fc04f75f..15ff02e6f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/RoutingConfiguration.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/RoutingConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java index 9886a28b9..e364f9118 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/User.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/User.java index aaf36bb74..a921ea1ac 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/User.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserHandler.java index f12c82944..6622d3d7b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepository.java index 497d298e9..e847e54a9 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepositoryImpl.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepositoryImpl.java index 356831926..53b095522 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepositoryImpl.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app82/UserRepositoryImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/Coffee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/Coffee.java index e9b7bc829..3ae2e6658 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/Coffee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/Coffee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeOrder.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeOrder.java index 764b98a22..04aac61d3 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeOrder.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeOrder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeRepository.java index c3ed2e077..6fc9dd23f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeService.java index a355a1e82..3160d986a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/CoffeeService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/RouteConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/RouteConfig.java index 442697e9e..1d683a800 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/RouteConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/RouteConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java index 37d91fa96..fe3927f5e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/Employee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/Employee.java index 1f44e346d..8d0479ebf 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/Employee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/Employee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeFunctionalConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeFunctionalConfig.java index 536e16769..1a2ac1b32 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeFunctionalConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeFunctionalConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeRepository.java index dcd40506e..048566846 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java index e77f4f055..1695ddb19 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java index 980c78a60..b98076917 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PersonRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PersonRouter.java index 885847b06..3545582ac 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PersonRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PersonRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PositionRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PositionRouter.java index c8109ed48..dbe10abf1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PositionRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/controller/PositionRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Person.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Person.java index 4e1b8d515..7bf63f4d6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Person.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Position.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Position.java index 0276e08de..91ae9a990 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Position.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Position.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Sex.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Sex.java index 557232491..b939fec53 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Sex.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/entity/Sex.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/exception/PositionNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/exception/PositionNotFoundException.java index acc067a6a..91596f780 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/exception/PositionNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/exception/PositionNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PersonHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PersonHandler.java index d93bb28bf..598504f7e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PersonHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PersonHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PositionHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PositionHandler.java index fe619ac24..dc5e362ba 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PositionHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/handler/PositionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/payload/ErrorResponse.java index 5627b175f..c818b8165 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/service/PersonService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/service/PersonService.java index 43128c7a2..79f56ec94 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/service/PersonService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app85/service/PersonService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85.service; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/Quote.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/Quote.java index 8094b5b6e..6b5ab3e2e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/Quote.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/Quote.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteGenerator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteGenerator.java index 5238ccaa7..f691256b7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteGenerator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteGenerator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteHandler.java index 73478b09d..9069a7769 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteRouter.java index bcaaf61bf..8ff7cc830 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/QuoteRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java index 07ef2e96d..85dcf4303 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/Book.java index a092666db..253e16154 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRepository.java index 4203eaf7d..73bf0bffa 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRouter.java index 9468ab6ce..77297577b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java index 16e2190f5..0ff0fa0b0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/Post.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/Post.java index f4a356ebb..75bdd239f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/Post.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/Post.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostHandler.java index a88c70129..2ef5334cb 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRepository.java index 91559d109..c24cb2d96 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRouter.java index 1cbb475ab..334a0be93 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/PostRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java index 6d4362639..55e97be52 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/Book.java index b7ae26b03..5df7d6901 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRepository.java index f6a90043c..45aaa2d77 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRouter.java index a61aa59fe..a3dcf56b1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java index 817e4fbf2..2cc16c197 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/HelloRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/HelloRouter.java index 8c600dca7..1cd2a7ec4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/HelloRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/HelloRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java index 41b3ce03a..c88f8978f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/book/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/book/BookRouter.java index e5bda3d5a..1e982835f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/book/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/book/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90.book; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/Employee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/Employee.java index 9e1f09071..d5f44537b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/Employee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/Employee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90.employee; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRepository.java index 9fc792d0b..40af6d237 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90.employee; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRouter.java index 5b156b17c..87c3e06e4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/employee/EmployeeRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90.employee; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/position/PositionRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/position/PositionRouter.java index 624202706..b25fcf8b4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/position/PositionRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/position/PositionRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90.position; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/quotes/QuotesRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/quotes/QuotesRouter.java index 540573836..a633d71ab 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/quotes/QuotesRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v30/app90/quotes/QuotesRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90.quotes; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java index 4dedd2868..02935cfae 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index ccbc9f1aa..46c464754 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java index 88b425548..e11333b85 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java index b61503109..b70a76997 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java index 76f9d6881..70c98308e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/TestController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/TestController.java index c17cdc175..e8c9fc21b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/TestController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app102/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java index 70ac492cd..f591fae0b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java index 53af43a16..0c288a2da 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HiddenHelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HiddenHelloController.java index fd57a0465..1367b6c4f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HiddenHelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/HiddenHelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java index f560c4379..f4b0dff91 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app149; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/HelloRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/HelloRouter.java index 089a2beaa..2d113bcdc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/HelloRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/HelloRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app150; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java index ad6d6429d..d53211069 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app150; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/HelloRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/HelloRouter.java index e5205f610..ec9ca82f7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/HelloRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/HelloRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app151; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java index 9ce852f90..3990469c7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app151; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java index 2d1165465..3d000986b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app152; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java index f028a5e63..12a523c9a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app152; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultRequestMappingHandlerMapping.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultRequestMappingHandlerMapping.java index 263c27b00..db8b7174b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultRequestMappingHandlerMapping.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultRequestMappingHandlerMapping.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultWebFluxRegistrations.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultWebFluxRegistrations.java index 951011841..cb2d856f6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultWebFluxRegistrations.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/DefaultWebFluxRegistrations.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java index 657bb1d0f..2ba71bfd4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/TestController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/TestController.java index 1a52abcca..a523cfee0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/TestController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app153/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/HelloController.java index 3c6739705..b0def8d3c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app184; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/SpringDocApp184Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/SpringDocApp184Test.java index 0da571075..13d21d593 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/SpringDocApp184Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app184/SpringDocApp184Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app184; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/DuplicatedPathController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/DuplicatedPathController.java index 82f0b0abd..e98a7a1b9 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/DuplicatedPathController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/DuplicatedPathController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app187; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/SpringDocApp187Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/SpringDocApp187Test.java index f8134dbfc..c1792eaf8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/SpringDocApp187Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app187/SpringDocApp187Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app187; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/OrderDemo.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/OrderDemo.java index ff9cac779..daa3b059a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/OrderDemo.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/OrderDemo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app188; @@ -48,7 +48,7 @@ public void customise(OpenAPI openApi) { openApi.addTagsItem(new Tag().name("3")); } } - + public static class Customizer1 implements OpenApiCustomizer, GlobalOpenApiCustomizer { public void customise(OpenAPI openApi) { openApi.addTagsItem(new Tag().name("1")); diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/SpringDocApp188Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/SpringDocApp188Test.java index 21f9ccb97..329271b94 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/SpringDocApp188Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app188/SpringDocApp188Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app188; @@ -40,7 +40,7 @@ class SpringDocApp188Test extends AbstractSpringDocTest { @Test void testApp1() { - webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL +"/mygroup").exchange() + webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + "/mygroup").exchange() .expectStatus().isOk() .expectBody().json(getContent("results/3.1.0/app188.json"), true); } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/HelloController.java index 34aa72d3d..a6fdee2d2 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app189; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocApp189Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocApp189Test.java index 336fdf706..157a05810 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocApp189Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocApp189Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app189; @@ -41,23 +41,24 @@ @WebFluxTest public class SpringDocApp189Test extends AbstractCommonTest { - @Test - public void testWithDifferentLocales() throws Exception { - runTestWithLocale("en-GB"); - runTestWithLocale("de-DE"); - } - private void runTestWithLocale(String locale) throws JSONException { - EntityExchangeResult getResult = webTestClient.mutate().responseTimeout(Duration.ofMinutes(1000)).build() - .get().uri(Constants.DEFAULT_API_DOCS_URL) - .header("Accept-Language", locale) - .exchange() - .expectStatus().isOk().expectBody().returnResult(); - - String result = new String(getResult.getResponseBody()); - String className = getClass().getSimpleName(); - String testNumber = className.replaceAll("[^0-9]", ""); - String expected = getContent("results/3.1.0/app" + testNumber + ".json"); - assertEquals(expected, result, true); - } + @Test + public void testWithDifferentLocales() throws Exception { + runTestWithLocale("en-GB"); + runTestWithLocale("de-DE"); + } + + private void runTestWithLocale(String locale) throws JSONException { + EntityExchangeResult getResult = webTestClient.mutate().responseTimeout(Duration.ofMinutes(1000)).build() + .get().uri(Constants.DEFAULT_API_DOCS_URL) + .header("Accept-Language", locale) + .exchange() + .expectStatus().isOk().expectBody().returnResult(); + + String result = new String(getResult.getResponseBody()); + String className = getClass().getSimpleName(); + String testNumber = className.replaceAll("[^0-9]", ""); + String expected = getContent("results/3.1.0/app" + testNumber + ".json"); + assertEquals(expected, result, true); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocTestApp.java index 87bf1adb0..aa30ce654 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app189/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app189; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190Test.java index 8993213cc..72a37f2fa 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app190; @@ -36,16 +36,16 @@ import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_DEFAULT_API_DOCS; -@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=false") +@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=false") public class SpringDocApp190Test extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v31.app190" }) - static class SpringDocTestApp {} - @Test void test_disable_default_api_docs() throws Exception { webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL).exchange() .expectStatus().isNotFound(); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v31.app190" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190bisTest.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190bisTest.java index 2a36670ea..1d423a52f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190bisTest.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app190/SpringDocApp190bisTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app190; @@ -36,16 +36,16 @@ import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_DEFAULT_API_DOCS; -@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=true") +@WebFluxTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=true") public class SpringDocApp190bisTest extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v31.app190" }) - static class SpringDocTestApp {} - @Test void test_enable_default_api_docs() throws Exception { webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL).exchange() .expectStatus().isOk(); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v31.app190" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/BaseHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/BaseHandler.java index 7f268fe74..ea8dc6bb9 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/BaseHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/BaseHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191.Handler; @@ -34,9 +34,9 @@ @Component public abstract class BaseHandler { - protected abstract Mono apply (ServerRequest serverRequest); + protected abstract Mono apply(ServerRequest serverRequest); - public Mono handle(ServerRequest serverRequest) { - return this.apply(serverRequest); - } + public Mono handle(ServerRequest serverRequest) { + return this.apply(serverRequest); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/GetNameHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/GetNameHandler.java index 0c7800d96..2adcc4272 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/GetNameHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Handler/GetNameHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191.Handler; @@ -35,11 +35,11 @@ @Component public class GetNameHandler extends BaseHandler { - @Override - protected Mono apply(ServerRequest serverRequest) { - return ServerResponse.ok() - .contentType(MediaType.APPLICATION_JSON) - .bodyValue("Name API is called"); - } + @Override + protected Mono apply(ServerRequest serverRequest) { + return ServerResponse.ok() + .contentType(MediaType.APPLICATION_JSON) + .bodyValue("Name API is called"); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Router/GetNameRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Router/GetNameRouter.java index aea9a759d..fd091c2b6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Router/GetNameRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/Router/GetNameRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191.Router; @@ -47,17 +47,17 @@ @Configuration public class GetNameRouter { - @Bean - @RouterOperations( - value = { - @RouterOperation(path = "/v1/name", produces = {MediaType.APPLICATION_JSON_VALUE}, method = RequestMethod.GET, - beanClass = GetNameHandler.class, beanMethod = "handle", operation = @Operation(operationId = "getName", - description = "get name", responses = {@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = String.class)))}) - ) - }) - - public RouterFunction routerFunction(GetNameHandler getNameHandler) { - return RouterFunctions.route(RequestPredicates.GET("/v1/name"), getNameHandler::handle); - } + @Bean + @RouterOperations( + value = { + @RouterOperation(path = "/v1/name", produces = { MediaType.APPLICATION_JSON_VALUE }, method = RequestMethod.GET, + beanClass = GetNameHandler.class, beanMethod = "handle", operation = @Operation(operationId = "getName", + description = "get name", responses = { @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = String.class))) }) + ) + }) + + public RouterFunction routerFunction(GetNameHandler getNameHandler) { + return RouterFunctions.route(RequestPredicates.GET("/v1/name"), getNameHandler::handle); + } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java index c0fab9bc1..25529406d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/Feature.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/Feature.java new file mode 100644 index 000000000..b4d0fd017 --- /dev/null +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/Feature.java @@ -0,0 +1,40 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app192; + +public class Feature { + + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/HelloController.java new file mode 100644 index 000000000..3fe06bf31 --- /dev/null +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/HelloController.java @@ -0,0 +1,67 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app192; + +import java.util.List; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import reactor.core.publisher.Flux; + +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author bnasslahsen + */ +@RestController +@RequestMapping +public class HelloController { + + @Operation(operationId = "getFeaturesJson", + parameters = + @Parameter(name = "organizationId" , description = "toto", in = ParameterIn.PATH)) + @GetMapping(value = "/{organizationId}/features", produces = MediaType.APPLICATION_JSON_VALUE) + public List getFeaturesAsJson( + @PathVariable String organizationId) { + return List.of(/* ... */); + } + + @Operation(operationId = "getFeaturesNdjson", + parameters = @Parameter(name = "organizationId", description = "titi", in = ParameterIn.PATH + )) + @GetMapping(value = "/{organizationId}/features", produces = "application/x-ndjson") + public List getFeaturesAsNdjson( + @PathVariable String organizationId) { + return null; + } + +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/SpringDocApp192Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/SpringDocApp192Test.java new file mode 100644 index 000000000..40514a3d4 --- /dev/null +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app192/SpringDocApp192Test.java @@ -0,0 +1,39 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app192; + +import test.org.springdoc.api.v31.AbstractSpringDocTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +public class SpringDocApp192Test extends AbstractSpringDocTest { + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v31.app192" }) + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java index f25576fc3..605e1b591 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java index 1b4b32a40..d0bba1d59 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/ExceptionTranslator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/ExceptionTranslator.java index 6cc23a4ed..61ea671de 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/ExceptionTranslator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/TweetController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/TweetController.java index 13183418b..1721af9c1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/TweetController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/controller/TweetController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/dto/TweetDTO.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/dto/TweetDTO.java index 42e8d1b44..36ba93b93 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/dto/TweetDTO.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/dto/TweetDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3.dto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetConflictException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetConflictException.java index dc15ac266..f3fe802b6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetConflictException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetConflictException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetNotFoundException.java index 03fc75d75..29c01af70 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/exception/TweetNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/payload/ErrorResponse.java index 81ad86fc2..910cdd368 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app3/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java index 3e78d20a7..d7e5401d6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app39; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java index 5e698e493..3a40ed5cb 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app39; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java index 4103f7c00..15712a9f0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app39; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java index a4a32610f..41231d796 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java index 8fb628b21..b0402c1c1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java index 5b3a6e03e..46a0ac81a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java index 844888235..90ce9afe6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java index b6b390e6e..e022fe674 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocTestApp.java index a5fb689ae..cceb9b82e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/Tweet.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/Tweet.java index b81c56339..d4ca4f293 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/Tweet.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app5/Tweet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java index 2fe0962de..d850097ec 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app63; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java index 4bdcc8732..aad0a47f4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app63; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/toto/HelloController2.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/toto/HelloController2.java index 9b8c3ee0b..def86abea 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/toto/HelloController2.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app63/toto/HelloController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app63.toto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java index 8f280bafb..3b4dc181d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app64; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java index a40756d95..c66293d84 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app64; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java index 67a705d26..120e6958c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app65; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java index 22e127867..3e55fc681 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app65; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java index 1da8f5f23..7649df331 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocTestApp.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocTestApp.java index 88ccee7c7..e2725fa99 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocTestApp.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/ExceptionTranslator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/ExceptionTranslator.java index 3ff39c52f..90e184bb2 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/ExceptionTranslator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/TweetController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/TweetController.java index 545e9b8b7..8efe3c83d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/TweetController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/controller/TweetController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/dto/TweetDTO.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/dto/TweetDTO.java index 1b2647fbe..67d351d69 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/dto/TweetDTO.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/dto/TweetDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66.dto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetConflictException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetConflictException.java index 20215d668..9824c6cce 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetConflictException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetConflictException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetNotFoundException.java index be6085474..adb79d134 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/exception/TweetNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/payload/ErrorResponse.java index bdcc3212f..38c98c17b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app66/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java index 5fac5246b..93d76ed4d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app67; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java index e1e853125..8e8ae3476 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app67; @@ -36,7 +36,7 @@ public class SpringDocApp67Test extends AbstractSpringDocTest { @Test - void testApp() { + void testApp() { webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + groupName).exchange().expectStatus().isOk().expectBody() .jsonPath("$.openapi").isEqualTo("3.1.0") .jsonPath("$.paths./api.get.tags[0]").isEqualTo("hello-controller") diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java index 5f373000c..fbdeace37 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/ExceptionTranslator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/ExceptionTranslator.java index f4cf8792c..d963358c0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/ExceptionTranslator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/TweetController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/TweetController.java index 9b2aa9765..948694857 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/TweetController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/controller/TweetController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/dto/TweetDTO.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/dto/TweetDTO.java index 34e4a2721..a1fa03d6f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/dto/TweetDTO.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/dto/TweetDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.dto; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetConflictException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetConflictException.java index bd07eb40f..32779e269 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetConflictException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetConflictException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetNotFoundException.java index c22a909bd..45844fa10 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/exception/TweetNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/payload/ErrorResponse.java index 8ca3b42f9..d8100194b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app68/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/RoutingConfiguration.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/RoutingConfiguration.java index e8be3704f..a137defdc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/RoutingConfiguration.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/RoutingConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java index a67a07077..11fda51d7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/User.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/User.java index 5fc8425fe..da258da80 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/User.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserHandler.java index bf3798557..ca4588339 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepository.java index 9aca62c39..bb4fdc923 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepositoryImpl.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepositoryImpl.java index cda571b61..b480b9e41 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepositoryImpl.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app69/UserRepositoryImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/Coffee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/Coffee.java index 91528daec..4a8776527 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/Coffee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/Coffee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeOrder.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeOrder.java index f11aa8d4a..f1e6c496b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeOrder.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeOrder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeRepository.java index 8a8da0ea7..eac6c175b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeService.java index 634622c20..b5d6bb64b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/CoffeeService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/RouteConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/RouteConfig.java index a444b8144..9f78d615c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/RouteConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/RouteConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java index 9490d82a1..c00ccacce 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/Employee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/Employee.java index 44f0e2c81..cbaa54f79 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/Employee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/Employee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeFunctionalConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeFunctionalConfig.java index f07d94e1a..587975f38 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeFunctionalConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeFunctionalConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeRepository.java index 0a9cbfbf4..c1d025117 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java index 14e5f47c9..71a621ecc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app71; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/SpringDocApp72Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/SpringDocApp72Test.java index b38f5e05b..9d95ceb10 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/SpringDocApp72Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/SpringDocApp72Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PersonRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PersonRouter.java index a316dfb3e..7b8d407e0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PersonRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PersonRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PositionRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PositionRouter.java index 3392f7da5..939029d8d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PositionRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/controller/PositionRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Person.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Person.java index 56312cdca..2fc49cefa 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Person.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Position.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Position.java index f0352f835..6707594c0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Position.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Position.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Sex.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Sex.java index 7012f44ff..21f0dd876 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Sex.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/entity/Sex.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/exception/PositionNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/exception/PositionNotFoundException.java index 34ed831f7..da01ef225 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/exception/PositionNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/exception/PositionNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PersonHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PersonHandler.java index aa692d001..f46ea905d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PersonHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PersonHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PositionHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PositionHandler.java index 71e4f584a..2e5e85a03 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PositionHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/handler/PositionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/payload/ErrorResponse.java index 7c6b5ab47..259aa48ab 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/service/PersonService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/service/PersonService.java index 774467db8..d6ff49473 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/service/PersonService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app72/service/PersonService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72.service; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/Quote.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/Quote.java index 6f2f76ed4..aefda7953 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/Quote.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/Quote.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteGenerator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteGenerator.java index 02b9ae3b4..17d8b927e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteGenerator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteGenerator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteHandler.java index a1ed9bda2..d410a9cb2 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteRouter.java index cb5d1075c..de9beed44 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/QuoteRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java index e9b1091f6..b4e66a2b9 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app73; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/Book.java index f34b933e3..dbba7322c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRepository.java index 28ed1dae5..25ab43e31 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRouter.java index 3972dbf20..0a752fbc3 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java index c552b6b7b..8ad5f25fb 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app74; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/Post.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/Post.java index 57a855854..7a57fb74a 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/Post.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/Post.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostHandler.java index 025d6855f..5fe15bcde 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRepository.java index dffdcf460..c1f7ddb08 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRouter.java index 5d44ba674..466193f7c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/PostRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java index b6aec57b2..3dee836d4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java index 1e1d4b94e..4e986b693 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app78; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java index 00d8254cb..4447297f6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app78; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseClientModel.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseClientModel.java index 13689311f..46fdb5b60 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseClientModel.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseController.java index 0983898c8..686a1977d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificClientModel.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificClientModel.java index 4ba0312a2..bacd2106c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificClientModel.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificController.java index 93a576e65..fa2596c6e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpecificController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java index 0bddb87b4..663f1215e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app79; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/Book.java index 1f94a1bf8..778ae6951 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRepository.java index d131758a7..a2ed1d57e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRouter.java index 20b47ae98..ec92b32de 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java index 83913761f..d0d50bec1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app80; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/OperationIdController.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/OperationIdController.java index 970a3c675..358c82298 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/OperationIdController.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/OperationIdController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app81; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java index a43f23f47..d65ec8cbf 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app81; @@ -73,7 +73,7 @@ public void shouldGenerateOperationIdsDeterministically() throws Exception { when(request.getURI()).thenReturn(URI.create("http://localhost")); String expected = getContent("results/3.1.0/app81.json"); - byte[] openApiBytes =resource.openapiJson(request, "", Locale.US).block(); + byte[] openApiBytes = resource.openapiJson(request, "", Locale.US).block(); String openApi = new String(openApiBytes, StandardCharsets.UTF_8); // for UTF-8 encoding String openApi = resource.openapiJson(request, "", Locale.US).block(); assertEquals(expected, openApi, true); } diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/RoutingConfiguration.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/RoutingConfiguration.java index 18ae01da5..9e963648c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/RoutingConfiguration.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/RoutingConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java index 3b50d1577..34f207b35 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/User.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/User.java index 21e5f1030..7951ee451 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/User.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserHandler.java index a7bf08de9..96bf5b6e4 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepository.java index 1458d3587..c79f14bbf 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepositoryImpl.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepositoryImpl.java index c3fd23499..25554a1c8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepositoryImpl.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app82/UserRepositoryImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/Coffee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/Coffee.java index d4f1c29f4..f79a47ba3 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/Coffee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/Coffee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeOrder.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeOrder.java index b7b8b3a2b..f1361ce00 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeOrder.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeOrder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeRepository.java index ac84cff75..f51062e00 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeService.java index bd03c970b..b6335b837 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/CoffeeService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/RouteConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/RouteConfig.java index 17456d03e..308685faf 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/RouteConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/RouteConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java index b04caeadc..20d26c4ae 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/Employee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/Employee.java index 361429fd4..dacb3f5da 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/Employee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/Employee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeFunctionalConfig.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeFunctionalConfig.java index e088107ae..f6fcb518b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeFunctionalConfig.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeFunctionalConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeRepository.java index e5df0b3bf..87b9997b8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java index 83992cf71..50e621b8b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app84; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java index fdcd07744..ba3f4af78 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PersonRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PersonRouter.java index e082b3030..b5a84e11f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PersonRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PersonRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PositionRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PositionRouter.java index 94bacc458..e8a89d3c5 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PositionRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/controller/PositionRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.controller; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Person.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Person.java index 8db511b33..16fcd318e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Person.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Position.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Position.java index 97cef62db..22e5ad89b 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Position.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Position.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Sex.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Sex.java index aaeb1c76d..ae0bf41b0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Sex.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/entity/Sex.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.entity; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/exception/PositionNotFoundException.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/exception/PositionNotFoundException.java index 2cc56aadb..ffcd031d7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/exception/PositionNotFoundException.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/exception/PositionNotFoundException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.exception; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PersonHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PersonHandler.java index 70d331b0f..90a4b33fc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PersonHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PersonHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PositionHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PositionHandler.java index 4dc35e2f0..3aa685e23 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PositionHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/handler/PositionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.handler; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/payload/ErrorResponse.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/payload/ErrorResponse.java index 6fd7db683..7f7b77b44 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/payload/ErrorResponse.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/payload/ErrorResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.payload; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/service/PersonService.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/service/PersonService.java index 0e503e317..3208c4a51 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/service/PersonService.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app85/service/PersonService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85.service; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/Quote.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/Quote.java index 263b995af..ff2efaa38 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/Quote.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/Quote.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteGenerator.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteGenerator.java index 9470bdf8c..9b9165e90 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteGenerator.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteGenerator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteHandler.java index 16d3ba359..0a7c2103f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteRouter.java index 116edfdba..39f9e2da9 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/QuoteRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java index 7007f91e3..35ef6edb5 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/Book.java index 7fe79ced7..cb6c16d9d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRepository.java index 470d1ad77..57296742c 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRouter.java index 39b52a67d..629c531e0 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java index 8153c36cb..55328618d 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app87; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/Post.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/Post.java index f2d617097..5c9b72efc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/Post.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/Post.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostHandler.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostHandler.java index 18378a7aa..3474a4d15 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostHandler.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRepository.java index 797897835..4f4cb32d6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRouter.java index c873b386c..87e578deb 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/PostRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java index d0a2f5027..ec613b1db 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app88; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/Book.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/Book.java index 5e70d22a5..6ce524ebc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/Book.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRepository.java index ddb344e01..c303bd7bb 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRouter.java index eaaff7589..a2a5e6e5e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java index 36e2d3e2c..f86ea7168 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app89; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/HelloRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/HelloRouter.java index 4773ecf55..8261fab4e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/HelloRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/HelloRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java index ed87d3672..419526f45 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/book/BookRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/book/BookRouter.java index db3f06800..880ee1200 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/book/BookRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/book/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90.book; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/Employee.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/Employee.java index ed20e4c2a..bc378116f 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/Employee.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/Employee.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90.employee; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRepository.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRepository.java index f8674eb84..e2f0334ed 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRepository.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90.employee; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRouter.java index 875888928..c81f87ffa 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/employee/EmployeeRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90.employee; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/position/PositionRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/position/PositionRouter.java index 28c07422b..07661eabc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/position/PositionRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/position/PositionRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90.position; diff --git a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/quotes/QuotesRouter.java b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/quotes/QuotesRouter.java index 8cecd8435..63f0b37b1 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/quotes/QuotesRouter.java +++ b/springdoc-openapi-starter-webflux-api/src/test/java/test/org/springdoc/api/v31/app90/quotes/QuotesRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90.quotes; diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app102.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app102.json index d7479b41b..e77bbf251 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app102.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app102.json @@ -32,6 +32,7 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { + "minLength": 1, "type": "string" } }, diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app189.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app189.json index 99a636d30..e9c8c49d6 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app189.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app189.json @@ -37,6 +37,11 @@ "format": "binary" } } + }, + "encoding": { + "resumeFile": { + "contentType": "application/octet-stream" + } } } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app3.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app3.json index 18bfb0e31..a6147a466 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app3.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app3.json @@ -15,15 +15,25 @@ } ], "paths": { - "/tweets": { + "/tweets/{id}": { "get": { "tags": [ "tweet-controller" ], - "operationId": "getAllTweets", + "operationId": "getTweetById", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -32,8 +42,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "tweet not found", "content": { "*/*": { "schema": { @@ -43,25 +53,32 @@ } }, "200": { - "description": "get All Tweets", + "description": "get Tweet By Id", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TweetDTO" - } + "$ref": "#/components/schemas/TweetDTO" } } } } } }, - "post": { + "put": { "tags": [ "tweet-controller" ], - "operationId": "createTweets", + "operationId": "updateTweet", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], "requestBody": { "content": { "application/json": { @@ -73,8 +90,8 @@ "required": true }, "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -83,8 +100,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "tweet not found", "content": { "*/*": { "schema": { @@ -94,7 +111,7 @@ } }, "200": { - "description": "create Tweets", + "description": "update Tweet", "content": { "*/*": { "schema": { @@ -104,14 +121,12 @@ } } } - } - }, - "/tweets/{id}": { - "get": { + }, + "delete": { "tags": [ "tweet-controller" ], - "operationId": "getTweetById", + "operationId": "deleteTweet", "parameters": [ { "name": "id", @@ -123,8 +138,8 @@ } ], "responses": { - "404": { - "description": "tweet not found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -133,8 +148,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "tweet not found", "content": { "*/*": { "schema": { @@ -144,45 +159,20 @@ } }, "200": { - "description": "get Tweet By Id", - "content": { - "*/*": { - "schema": { - "$ref": "#/components/schemas/TweetDTO" - } - } - } + "description": "delete Tweet" } } - }, - "put": { + } + }, + "/tweets": { + "get": { "tags": [ "tweet-controller" ], - "operationId": "updateTweet", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TweetDTO" - } - } - }, - "required": true - }, + "operationId": "getAllTweets", "responses": { - "404": { - "description": "tweet not found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -191,8 +181,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { @@ -202,35 +192,38 @@ } }, "200": { - "description": "update Tweet", + "description": "get All Tweets", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/TweetDTO" + "type": "array", + "items": { + "$ref": "#/components/schemas/TweetDTO" + } } } } } } }, - "delete": { + "post": { "tags": [ "tweet-controller" ], - "operationId": "deleteTweet", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" + "operationId": "createTweets", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TweetDTO" + } } - } - ], + }, + "required": true + }, "responses": { - "404": { - "description": "tweet not found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -239,8 +232,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { @@ -250,7 +243,14 @@ } }, "200": { - "description": "delete Tweet" + "description": "create Tweets", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/TweetDTO" + } + } + } } } } @@ -263,8 +263,8 @@ "description": "Tweets are Sent to the client as Server Sent Events", "operationId": "streamAllTweets", "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -273,8 +273,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app4.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app4.json index 4815f0956..ec04777fa 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app4.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app4.json @@ -37,6 +37,11 @@ "format": "binary" } } + }, + "encoding": { + "resumeFile": { + "contentType": "application/octet-stream" + } } } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app5.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app5.json index 5e2b55c07..e01667889 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app5.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app5.json @@ -15,19 +15,29 @@ } ], "paths": { - "/test": { - "get": { + "/tweets/does-not-work": { + "post": { "tags": [ "hello-controller" ], - "operationId": "demo2", + "operationId": "postNotWorks", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Tweet" + } + } + }, + "required": true + }, "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "type": "string" + "$ref": "#/components/schemas/Tweet" } } } @@ -35,29 +45,19 @@ } } }, - "/tweets/does-not-work": { - "post": { + "/test": { + "get": { "tags": [ "hello-controller" ], - "operationId": "postNotWorks", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Tweet" - } - } - }, - "required": true - }, + "operationId": "demo2", "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Tweet" + "type": "string" } } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app66.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app66.json index 8f59a64b5..1ffecdf98 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app66.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app66.json @@ -23,15 +23,12 @@ "description": "Tweets are Sent to the client as Server Sent Events", "operationId": "streamAllTweets", "responses": { - "200": { - "description": "stream All Tweets", + "409": { + "description": "Conflict", "content": { - "text/event-stream": { + "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TweetDTO" - } + "type": "string" } } } @@ -46,12 +43,15 @@ } } }, - "409": { - "description": "Conflict", + "200": { + "description": "stream All Tweets", "content": { - "*/*": { + "text/event-stream": { "schema": { - "type": "string" + "type": "array", + "items": { + "$ref": "#/components/schemas/TweetDTO" + } } } } @@ -91,4 +91,4 @@ } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app68.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app68.json index 67e1dadca..1ffecdf98 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app68.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app68.json @@ -23,8 +23,8 @@ "description": "Tweets are Sent to the client as Server Sent Events", "operationId": "streamAllTweets", "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -33,8 +33,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app78.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app78.json index 0b44ea09e..c9da555fe 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app78.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.0.1/app78.json @@ -36,6 +36,11 @@ } } } + }, + "encoding": { + "files": { + "contentType": "application/octet-stream" + } } } } @@ -49,4 +54,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app102.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app102.json index f43ac6133..2a6c70e57 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app102.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app102.json @@ -32,7 +32,8 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } }, { diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app189.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app189.json index fbfed5874..fc27523ca 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app189.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app189.json @@ -26,16 +26,21 @@ "content": { "multipart/form-data": { "schema": { - "required": [ - "resumeFile" - ], "type": "object", "properties": { "resumeFile": { "type": "string", - "description": "Resume file to be parsed", - "format": "binary" + "format": "binary", + "description": "Resume file to be parsed" } + }, + "required": [ + "resumeFile" + ] + }, + "encoding": { + "resumeFile": { + "contentType": "application/octet-stream" } } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app192.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app192.json new file mode 100644 index 000000000..9e9a01cf1 --- /dev/null +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app192.json @@ -0,0 +1,69 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "", + "description": "Generated server url" + } + ], + "paths": { + "/{organizationId}/features": { + "get": { + "tags": [ + "hello-controller" + ], + "operationId": "getFeaturesJson", + "parameters": [ + { + "name": "organizationId", + "in": "path", + "description": "titi", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/x-ndjson": { + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Feature" + } + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "Feature": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + } + } + } + } +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app3.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app3.json index af92076cd..51b10f101 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app3.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app3.json @@ -15,15 +15,25 @@ } ], "paths": { - "/tweets": { + "/tweets/{id}": { "get": { "tags": [ "tweet-controller" ], - "operationId": "getAllTweets", + "operationId": "getTweetById", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -32,8 +42,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "tweet not found", "content": { "*/*": { "schema": { @@ -43,25 +53,32 @@ } }, "200": { - "description": "get All Tweets", + "description": "get Tweet By Id", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TweetDTO" - } + "$ref": "#/components/schemas/TweetDTO" } } } } } }, - "post": { + "put": { "tags": [ "tweet-controller" ], - "operationId": "createTweets", + "operationId": "updateTweet", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], "requestBody": { "content": { "application/json": { @@ -73,8 +90,8 @@ "required": true }, "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -83,8 +100,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "tweet not found", "content": { "*/*": { "schema": { @@ -94,7 +111,7 @@ } }, "200": { - "description": "create Tweets", + "description": "update Tweet", "content": { "*/*": { "schema": { @@ -104,14 +121,12 @@ } } } - } - }, - "/tweets/{id}": { - "get": { + }, + "delete": { "tags": [ "tweet-controller" ], - "operationId": "getTweetById", + "operationId": "deleteTweet", "parameters": [ { "name": "id", @@ -123,8 +138,8 @@ } ], "responses": { - "404": { - "description": "tweet not found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -133,8 +148,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "tweet not found", "content": { "*/*": { "schema": { @@ -144,45 +159,20 @@ } }, "200": { - "description": "get Tweet By Id", - "content": { - "*/*": { - "schema": { - "$ref": "#/components/schemas/TweetDTO" - } - } - } + "description": "delete Tweet" } } - }, - "put": { + } + }, + "/tweets": { + "get": { "tags": [ "tweet-controller" ], - "operationId": "updateTweet", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TweetDTO" - } - } - }, - "required": true - }, + "operationId": "getAllTweets", "responses": { - "404": { - "description": "tweet not found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -191,8 +181,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { @@ -202,35 +192,38 @@ } }, "200": { - "description": "update Tweet", + "description": "get All Tweets", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/TweetDTO" + "type": "array", + "items": { + "$ref": "#/components/schemas/TweetDTO" + } } } } } } }, - "delete": { + "post": { "tags": [ "tweet-controller" ], - "operationId": "deleteTweet", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "string" + "operationId": "createTweets", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TweetDTO" + } } - } - ], + }, + "required": true + }, "responses": { - "404": { - "description": "tweet not found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -239,8 +232,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { @@ -250,7 +243,14 @@ } }, "200": { - "description": "delete Tweet" + "description": "create Tweets", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/TweetDTO" + } + } + } } } } @@ -263,8 +263,8 @@ "description": "Tweets are Sent to the client as Server Sent Events", "operationId": "streamAllTweets", "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -273,8 +273,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { @@ -303,25 +303,25 @@ "components": { "schemas": { "TweetDTO": { - "required": [ - "createdAt", - "text" - ], "type": "object", "properties": { "id": { "type": "string" }, "text": { + "type": "string", "maxLength": 140, - "minLength": 0, - "type": "string" + "minLength": 0 }, "createdAt": { "type": "string", "format": "date-time" } - } + }, + "required": [ + "createdAt", + "text" + ] } }, "securitySchemes": { diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app4.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app4.json index d3aaa555e..8156a0afc 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app4.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app4.json @@ -26,16 +26,21 @@ "content": { "multipart/form-data": { "schema": { - "required": [ - "resumeFile" - ], "type": "object", "properties": { "resumeFile": { "type": "string", - "description": "Resume file to be parsed", - "format": "binary" + "format": "binary", + "description": "Resume file to be parsed" } + }, + "required": [ + "resumeFile" + ] + }, + "encoding": { + "resumeFile": { + "contentType": "application/octet-stream" } } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app5.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app5.json index 8981c818b..c8f88866e 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app5.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app5.json @@ -15,19 +15,29 @@ } ], "paths": { - "/test": { - "get": { + "/tweets/does-not-work": { + "post": { "tags": [ "hello-controller" ], - "operationId": "demo2", + "operationId": "postNotWorks", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Tweet" + } + } + }, + "required": true + }, "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "type": "string" + "$ref": "#/components/schemas/Tweet" } } } @@ -35,29 +45,19 @@ } } }, - "/tweets/does-not-work": { - "post": { + "/test": { + "get": { "tags": [ "hello-controller" ], - "operationId": "postNotWorks", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Tweet" - } - } - }, - "required": true - }, + "operationId": "demo2", "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Tweet" + "type": "string" } } } @@ -69,25 +69,25 @@ "components": { "schemas": { "Tweet": { - "required": [ - "createdAt", - "text" - ], "type": "object", "properties": { "id": { "type": "string" }, "text": { + "type": "string", "maxLength": 140, - "minLength": 0, - "type": "string" + "minLength": 0 }, "createdAt": { "type": "string", "format": "date-time" } - } + }, + "required": [ + "createdAt", + "text" + ] } }, "securitySchemes": { diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app66.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app66.json index afd650cbe..56a73acc7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app66.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app66.json @@ -23,15 +23,12 @@ "description": "Tweets are Sent to the client as Server Sent Events", "operationId": "streamAllTweets", "responses": { - "200": { - "description": "stream All Tweets", + "409": { + "description": "Conflict", "content": { - "text/event-stream": { + "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TweetDTO" - } + "type": "string" } } } @@ -46,12 +43,15 @@ } } }, - "409": { - "description": "Conflict", + "200": { + "description": "stream All Tweets", "content": { - "*/*": { + "text/event-stream": { "schema": { - "type": "string" + "type": "array", + "items": { + "$ref": "#/components/schemas/TweetDTO" + } } } } @@ -63,25 +63,25 @@ "components": { "schemas": { "TweetDTO": { - "required": [ - "createdAt", - "text" - ], "type": "object", "properties": { "id": { "type": "string" }, "text": { + "type": "string", "maxLength": 140, - "minLength": 0, - "type": "string" + "minLength": 0 }, "createdAt": { "type": "string", "format": "date-time" } - } + }, + "required": [ + "createdAt", + "text" + ] } }, "securitySchemes": { @@ -91,4 +91,4 @@ } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app68.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app68.json index cba35f247..56a73acc7 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app68.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app68.json @@ -23,8 +23,8 @@ "description": "Tweets are Sent to the client as Server Sent Events", "operationId": "streamAllTweets", "responses": { - "404": { - "description": "Not Found", + "409": { + "description": "Conflict", "content": { "*/*": { "schema": { @@ -33,8 +33,8 @@ } } }, - "409": { - "description": "Conflict", + "404": { + "description": "Not Found", "content": { "*/*": { "schema": { @@ -63,25 +63,25 @@ "components": { "schemas": { "TweetDTO": { - "required": [ - "createdAt", - "text" - ], "type": "object", "properties": { "id": { "type": "string" }, "text": { + "type": "string", "maxLength": 140, - "minLength": 0, - "type": "string" + "minLength": 0 }, "createdAt": { "type": "string", "format": "date-time" } - } + }, + "required": [ + "createdAt", + "text" + ] } }, "securitySchemes": { diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app72.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app72.json index 0d6ca8afb..72f831696 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app72.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app72.json @@ -268,19 +268,15 @@ } }, "Position": { - "required": [ - "createdAt", - "positionName" - ], "type": "object", "properties": { "id": { "type": "string" }, "positionName": { + "type": "string", "maxLength": 140, - "minLength": 0, - "type": "string" + "minLength": 0 }, "description": { "type": "string" @@ -289,7 +285,11 @@ "type": "string", "format": "date-time" } - } + }, + "required": [ + "createdAt", + "positionName" + ] } } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app78.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app78.json index 251c9cc88..71a1422e8 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app78.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app78.json @@ -22,9 +22,6 @@ "content": { "multipart/form-data": { "schema": { - "required": [ - "files" - ], "type": "object", "properties": { "files": { @@ -35,6 +32,14 @@ "format": "binary" } } + }, + "required": [ + "files" + ] + }, + "encoding": { + "files": { + "contentType": "application/octet-stream" } } } @@ -49,4 +54,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app85.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app85.json index 0d6ca8afb..72f831696 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app85.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app85.json @@ -268,19 +268,15 @@ } }, "Position": { - "required": [ - "createdAt", - "positionName" - ], "type": "object", "properties": { "id": { "type": "string" }, "positionName": { + "type": "string", "maxLength": 140, - "minLength": 0, - "type": "string" + "minLength": 0 }, "description": { "type": "string" @@ -289,7 +285,11 @@ "type": "string", "format": "date-time" } - } + }, + "required": [ + "createdAt", + "positionName" + ] } } } diff --git a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app90.json b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app90.json index 1197cd09e..7716dca85 100644 --- a/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app90.json +++ b/springdoc-openapi-starter-webflux-api/src/test/resources/results/3.1.0/app90.json @@ -548,19 +548,15 @@ } }, "Position": { - "required": [ - "createdAt", - "positionName" - ], "type": "object", "properties": { "id": { "type": "string" }, "positionName": { + "type": "string", "maxLength": 140, - "minLength": 0, - "type": "string" + "minLength": 0 }, "description": { "type": "string" @@ -569,7 +565,11 @@ "type": "string", "format": "date-time" } - } + }, + "required": [ + "createdAt", + "positionName" + ] }, "Quote": { "type": "object", diff --git a/springdoc-openapi-starter-webflux-scalar/.gitignore b/springdoc-openapi-starter-webflux-scalar/.gitignore new file mode 100644 index 000000000..ab21548c1 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/.gitignore @@ -0,0 +1,144 @@ +###################### +# Project Specific +###################### +/target/www/** +/src/test/javascript/coverage/ + +###################### +# Node +###################### +/node/ +node_tmp/ +node_modules/ +npm-debug.log.* +/.awcache/* +/.cache-loader/* + +###################### +# SASS +###################### +.sass-cache/ + +###################### +# Eclipse +###################### +*.pydevproject +.project +.metadata +tmp/ +tmp/**/* +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath +.factorypath +/src/main/resources/rebel.xml + +# External tool builders +.externalToolBuilders/** + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + +###################### +# Intellij +###################### +.idea/ +*.iml +*.iws +*.ipr +*.ids +*.orig +classes/ +out/ + +###################### +# Visual Studio Code +###################### +.vscode/ + +###################### +# Maven +###################### +/log/ +/target/ + +###################### +# Gradle +###################### +.gradle/ +/build/ + +###################### +# Package Files +###################### +*.jar +*.war +*.ear +*.db + +###################### +# Windows +###################### +# Windows image file caches +Thumbs.db + +# Folder config file +Desktop.ini + +###################### +# Mac OSX +###################### +.DS_Store +.svn + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +###################### +# Directories +###################### +/bin/ +/deploy/ + +###################### +# Logs +###################### +*.log* + +###################### +# Others +###################### +*.class +*.*~ +*~ +.merge_file* + +###################### +# Gradle Wrapper +###################### +!gradle/wrapper/gradle-wrapper.jar + +###################### +# Maven Wrapper +###################### +!.mvn/wrapper/maven-wrapper.jar + +###################### +# ESLint +###################### +.eslintcache \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/pom.xml b/springdoc-openapi-starter-webflux-scalar/pom.xml new file mode 100644 index 000000000..9ddc3a2db --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/pom.xml @@ -0,0 +1,48 @@ + + 4.0.0 + + org.springdoc + springdoc-openapi + 2.8.13 + + springdoc-openapi-starter-webflux-scalar + ${project.artifactId} + + + org.springdoc + springdoc-openapi-starter-webflux-api + ${project.version} + + + com.scalar.maven + scalar + + + + org.springframework.boot + spring-boot-actuator-autoconfigure + true + + + io.projectreactor.netty + reactor-netty-http + test + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.springdoc.openapi.webflux.scalar + + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarActuatorController.java b/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarActuatorController.java new file mode 100644 index 000000000..bb045c3b0 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarActuatorController.java @@ -0,0 +1,88 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.webflux.scalar; + +import java.io.IOException; + +import com.scalar.maven.webjar.ScalarProperties; +import io.swagger.v3.oas.annotations.Operation; +import org.springdoc.scalar.AbstractScalarController; + +import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpoint; +import org.springframework.http.ResponseEntity; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.web.bind.annotation.GetMapping; + +import static org.springdoc.core.utils.Constants.DEFAULT_API_DOCS_ACTUATOR_URL; +import static org.springdoc.scalar.ScalarConstants.DEFAULT_SCALAR_ACTUATOR_PATH; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +/** + * The type Swagger actuator welcome. + */ +@ControllerEndpoint(id = DEFAULT_SCALAR_ACTUATOR_PATH) +public class ScalarActuatorController extends AbstractScalarController { + + /** + * The Web endpoint properties. + */ + private final WebEndpointProperties webEndpointProperties; + + /** + * Instantiates a new Scalar actuator controller. + * + * @param scalarProperties the scalar properties + * @param webEndpointProperties the web endpoint properties + */ + protected ScalarActuatorController(ScalarProperties scalarProperties, WebEndpointProperties webEndpointProperties) { + super(scalarProperties); + this.webEndpointProperties = webEndpointProperties; + } + + @Operation(hidden = true) + @GetMapping(DEFAULT_PATH_SEPARATOR) + public ResponseEntity getDocs(ServerHttpRequest serverHttpRequest) throws IOException { + return super.getDocs(serverHttpRequest.getURI().toString()); + } + + @Operation(hidden = true) + @GetMapping(DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME) + public ResponseEntity getScalarJs() throws IOException { + return super.getScalarJs(); + } + + public String buildApiDocsUrl(String requestUrl) { + return buildApiDocsUrl(requestUrl, DEFAULT_PATH_SEPARATOR + DEFAULT_API_DOCS_ACTUATOR_URL); + } + + public String buildJsBundleUrl(String requestUrl) { + String scalarPath = webEndpointProperties.getBasePath() + scalarProperties.getPath(); + return buildJsBundleUrl(requestUrl, scalarPath); + } +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarConfiguration.java b/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarConfiguration.java new file mode 100644 index 000000000..95b1f0264 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarConfiguration.java @@ -0,0 +1,116 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.webflux.scalar; + +import com.scalar.maven.webjar.ScalarProperties; +import org.springdoc.core.configuration.SpringDocConfiguration; +import org.springdoc.core.properties.SpringDocConfigProperties; + +import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort; +import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType; +import org.springframework.boot.actuate.endpoint.web.reactive.WebFluxEndpointHandlerMapping; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.server.adapter.ForwardedHeaderTransformer; + +import static org.springdoc.core.utils.Constants.SPRINGDOC_SWAGGER_UI_ENABLED; +import static org.springdoc.core.utils.Constants.SPRINGDOC_USE_MANAGEMENT_PORT; + +/** + * The type Scalar configuration. + * + * @author bnasslahsen + */ +@Lazy(false) +@Configuration(proxyBeanMethods = false) +@ConditionalOnProperty(name = SPRINGDOC_SWAGGER_UI_ENABLED, matchIfMissing = true) +@ConditionalOnWebApplication(type = Type.REACTIVE) +@ConditionalOnBean(SpringDocConfiguration.class) +@EnableConfigurationProperties(ScalarProperties.class) +@ConditionalOnProperty(prefix = "scalar", name = "enabled", havingValue = "true", matchIfMissing = true) +public class ScalarConfiguration { + + /** + * Scalar web mvc controller scalar web mvc controller. + * + * @param scalarProperties the scalar properties + * @param springDocConfigProperties the spring doc config properties + * @return the scalar web mvc controller + */ + @Bean + @ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true) + @ConditionalOnMissingBean + @Lazy(false) + ScalarWebFluxController scalarWebMvcController(ScalarProperties scalarProperties, SpringDocConfigProperties springDocConfigProperties) { + return new ScalarWebFluxController(scalarProperties,springDocConfigProperties); + } + + /** + * Forwarded header transformer forwarded header transformer. + * + * @return the forwarded header transformer + */ + @Bean + @ConditionalOnMissingBean + @Lazy(false) + ForwardedHeaderTransformer forwardedHeaderTransformer() { + return new ForwardedHeaderTransformer(); + } + + /** + * The type Swagger actuator welcome configuration. + */ + @ConditionalOnProperty(SPRINGDOC_USE_MANAGEMENT_PORT) + @ConditionalOnClass(WebFluxEndpointHandlerMapping.class) + @ConditionalOnManagementPort(ManagementPortType.DIFFERENT) + static class SwaggerActuatorWelcomeConfiguration { + + /** + * Scalar actuator controller scalar actuator controller. + * + * @param properties the properties + * @param webEndpointProperties the web endpoint properties + * @return the scalar actuator controller + */ + @Bean + @ConditionalOnMissingBean + @Lazy(false) + ScalarActuatorController scalarActuatorController(ScalarProperties properties, WebEndpointProperties webEndpointProperties) { + return new ScalarActuatorController(properties,webEndpointProperties); + } + } + +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarWebFluxController.java b/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarWebFluxController.java new file mode 100644 index 000000000..ba4149df7 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/main/java/org/springdoc/webflux/scalar/ScalarWebFluxController.java @@ -0,0 +1,89 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.webflux.scalar; + +import java.io.IOException; + +import com.scalar.maven.webjar.ScalarProperties; +import org.springdoc.core.properties.SpringDocConfigProperties; +import org.springdoc.scalar.AbstractScalarController; + +import org.springframework.http.ResponseEntity; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +/** + * The type Scalar web mvc controller. + * + * @author bnasslahsen + */ +@Controller +@RequestMapping("${scalar.path:" + SCALAR_DEFAULT_PATH + "}") +public class ScalarWebFluxController extends AbstractScalarController { + + /** + * The Spring doc config properties. + */ + private final SpringDocConfigProperties springDocConfigProperties; + + /** + * Instantiates a new Scalar web mvc controller. + * + * @param scalarProperties the scalar properties + * @param springDocConfigProperties the spring doc config properties + */ + protected ScalarWebFluxController(ScalarProperties scalarProperties, SpringDocConfigProperties springDocConfigProperties) { + super(scalarProperties); + this.springDocConfigProperties = springDocConfigProperties; + } + + @GetMapping + public ResponseEntity getDocs(ServerHttpRequest serverHttpRequest) throws IOException { + return super.getDocs(serverHttpRequest.getURI().toString()); + } + + @GetMapping({DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME, SCALAR_JS_FILENAME}) + public ResponseEntity getScalarJs() throws IOException { + return super.getScalarJs(); + } + + public String buildApiDocsUrl(String requestUrl) { + String apiDocsPath = springDocConfigProperties.getApiDocs().getPath(); + return buildApiDocsUrl(requestUrl, apiDocsPath); + } + + public String buildJsBundleUrl(String requestUrl) { + String scalarPath = scalarProperties.getPath(); + return buildJsBundleUrl(requestUrl, scalarPath); + } +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-webflux-scalar/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..b2e7a4a88 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springdoc.webflux.scalar.ScalarConfiguration \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/AbstractCommonTest.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/AbstractCommonTest.java new file mode 100644 index 000000000..cb3bb9daf --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/AbstractCommonTest.java @@ -0,0 +1,114 @@ +package test.org.springdoc.webflux.scalar; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; + +import jakarta.annotation.PostConstruct; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.reactive.server.WebTestClient; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.startsWith; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +@AutoConfigureWebTestClient(timeout = "3600000") +@ActiveProfiles("test") +@SpringBootTest +public abstract class AbstractCommonTest { + + @Autowired + protected WebTestClient webTestClient; + + protected String className = getClass().getSimpleName(); + + @PostConstruct + public void init() { + this.webTestClient = webTestClient.mutate() + .baseUrl("http://localhost") + .build(); + } + + protected void checkContent(String requestPath, Map headers, String resultFile) { + String expected = getContent(resultFile); + String scalarJsPath = getScalarJsPath(requestPath); + webTestClient.get() + .uri(requestPath) + .headers(applyHeaders(headers)) + .exchange() + .expectStatus().isOk() + .expectHeader().value(HttpHeaders.CONTENT_TYPE, startsWith(MediaType.TEXT_HTML_VALUE)) + .expectBody(String.class) + .value(containsString(scalarJsPath)) + .value(equalTo(expected)); + webTestClient.get() + .uri(scalarJsPath) + .headers(applyHeaders(headers)) + .exchange() + .expectStatus().isOk(); + } + + protected void checkContent(String requestPath) { + String expected = getResultFile(); + String scalarJsPath = getScalarJsPath(requestPath); + webTestClient.get().uri(requestPath) + .exchange() + .expectStatus().isOk() + .expectHeader().value(HttpHeaders.CONTENT_TYPE, startsWith(MediaType.TEXT_HTML_VALUE)) + .expectBody(String.class) + .value(containsString(scalarJsPath)) + .value(equalTo(expected)); + webTestClient.get().uri(scalarJsPath) + .exchange() + .expectStatus().isOk(); + } + + protected String getResultFile() { + String testNumber = className.replaceAll("[^0-9]", ""); + return getContent("results/app" + testNumber); + } + + protected String getContent(String fileName) { + try { + Path path = Paths.get(AbstractCommonTest.class.getClassLoader().getResource(fileName).toURI()); + List lines = Files.readAllLines(path, StandardCharsets.UTF_8); + StringBuilder sb = new StringBuilder(); + for (String line : lines) { + sb.append(line).append("\n"); + } + return sb.toString(); + } + catch (Exception e) { + throw new RuntimeException("Failed to read file: " + fileName, e); + } + } + + protected static String getScalarJsPath(String requestPath) { + String scalarJsPath; + if(!requestPath.endsWith(DEFAULT_PATH_SEPARATOR)) + scalarJsPath = requestPath + DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME; + else + scalarJsPath = requestPath + SCALAR_JS_FILENAME; + return scalarJsPath; + } + + private Consumer applyHeaders(Map headers) { + return httpHeaders -> { + if (headers != null) { + headers.forEach(httpHeaders::set); + } + }; + } +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/AbstractSpringDocActuatorTest.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/AbstractSpringDocActuatorTest.java new file mode 100644 index 000000000..3c9318fda --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/AbstractSpringDocActuatorTest.java @@ -0,0 +1,89 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar; + +import jakarta.annotation.PostConstruct; + +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.MediaType; +import org.springframework.web.reactive.function.client.WebClient; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public abstract class AbstractSpringDocActuatorTest extends AbstractCommonTest { + + protected WebClient webClient; + + @LocalManagementPort + private int managementPort; + + @PostConstruct + public void init() { + webClient = WebClient.builder().baseUrl("http://localhost:" + this.managementPort) + .build(); + webTestClient = webTestClient.mutate().baseUrl("http://localhost") + .build(); + } + + protected void checkContent(String requestPath) { + String scalarJsPath = getScalarJsPath(requestPath); + String contentAsString = webClient.get() + .uri(requestPath) + .accept(MediaType.TEXT_HTML) + .retrieve() + .bodyToMono(String.class) + .block(); + + assert contentAsString != null; + assertTrue(contentAsString.contains(scalarJsPath)); + checkHtmlResult(contentAsString); + + HttpStatusCode status = webClient.get() + .uri(scalarJsPath) + .exchangeToMono(resp -> resp.releaseBody().thenReturn(resp.statusCode())) + .block(); + + assertThat(status).isEqualTo(HttpStatus.OK); + } + + protected void checkContentWithWebTestClient(String requestPath) { + super.checkContent(requestPath); + } + + protected void checkHtmlResult(String htmlResult) { + String testNumber = className.replaceAll("[^0-9]", ""); + String fileName = "results/app" + testNumber; + checkHtmlResult(fileName, htmlResult); + } + + protected void checkHtmlResult(String fileName, String htmlResult) { + assertTrue(htmlResult.contains("Scalar API Reference")); + assertEquals(this.getContent(fileName), htmlResult.replace("\r", "")); + } +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/HelloController.java new file mode 100644 index 000000000..2322fe41e --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/HelloController.java @@ -0,0 +1,36 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app1; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/SpringDocApp1Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/SpringDocApp1Test.java new file mode 100644 index 000000000..9f5099b7b --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/SpringDocApp1Test.java @@ -0,0 +1,38 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app1; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + +public class SpringDocApp1Test extends AbstractCommonTest { + + @Test + void checkContent() { + checkContent(SCALAR_DEFAULT_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/SpringDocAppScalarDisabledTest.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/SpringDocAppScalarDisabledTest.java new file mode 100644 index 000000000..6e96b0db4 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app1/SpringDocAppScalarDisabledTest.java @@ -0,0 +1,41 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app1; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + +@TestPropertySource(properties = "scalar.enabled=false") +public class SpringDocAppScalarDisabledTest extends AbstractCommonTest { + + @Test + void checkNotFound() { + webTestClient.get().uri(SCALAR_DEFAULT_PATH).exchange() + .expectStatus().isNotFound(); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app10/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app10/HelloController.java new file mode 100644 index 000000000..fef650086 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app10/HelloController.java @@ -0,0 +1,36 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app10; + + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RequestMapping("/foo/bar") +@RestController +public class HelloController { + + @GetMapping("/test") + public String doSomethingInteresting() { + return "OK"; + } + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app10/SpringDocApp10Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app10/SpringDocApp10Test.java new file mode 100644 index 000000000..7fb195708 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app10/SpringDocApp10Test.java @@ -0,0 +1,54 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app10; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import test.org.springdoc.webflux.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; + + +@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT, + properties = { "spring.webflux.base-path=/test", + "scalar.path=/", + "server.port=9529" }) +class SpringDocApp10Test extends AbstractSpringDocActuatorTest { + + @Test + void checkContent() { + HttpStatusCode httpStatusRoot = webClient.get().uri("/test/") + .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); + Assertions.assertThat(httpStatusRoot).isEqualTo(HttpStatus.OK); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app11/SpringDocApp11Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app11/SpringDocApp11Test.java new file mode 100644 index 000000000..f6d8fe3ab --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app11/SpringDocApp11Test.java @@ -0,0 +1,89 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app11; + +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.stream.IntStream; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.hamcrest.Matchers.containsString; +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +@TestPropertySource(properties = "server.forward-headers-strategy=framework") +public class SpringDocApp11Test extends AbstractCommonTest { + + private static final String X_FORWARD_PREFIX = "/path/prefix"; + + @Test + void checkContent() { + checkContent(SCALAR_DEFAULT_PATH); + } + + @Test + void checkContentForwardedPrefix() { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX); + checkContent(SCALAR_DEFAULT_PATH, headers, "results/app11-1"); + } + + @Test + void checkContentForwardedPrefixHostProto() throws Exception { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX, + "X-Forwarded-Proto", "https", "X-Forwarded-Host", "proxy-host"); + checkContent(SCALAR_DEFAULT_PATH, headers, "results/app11-2"); + } + + @Test + void concurrentScalarChecks() { + CompletableFuture[] tasks = IntStream.range(0, 10) + .mapToObj(i -> CompletableFuture.runAsync(() -> { + String prefix = X_FORWARD_PREFIX + i; + + webTestClient.get() + .uri(SCALAR_DEFAULT_PATH) + .header("X-Forwarded-Prefix", prefix) + .exchange() + .expectStatus().isOk() + .expectBody(String.class) + .value(containsString(prefix + SCALAR_DEFAULT_PATH)) + .value(containsString(prefix + SCALAR_DEFAULT_PATH + + DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME)); + })) + .toArray(CompletableFuture[]::new); + CompletableFuture.allOf(tasks).join(); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app12/SpringDocApp12Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app12/SpringDocApp12Test.java new file mode 100644 index 000000000..fbb3c0029 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app12/SpringDocApp12Test.java @@ -0,0 +1,48 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app12; + +import java.util.Map; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static test.org.springdoc.webflux.scalar.app12.SpringDocApp12Test.SCALAR_PATH; + +@TestPropertySource(properties = { + "server.forward-headers-strategy=framework", + "scalar.path="+ SCALAR_PATH +}) +public class SpringDocApp12Test extends AbstractCommonTest { + + private static final String X_FORWARD_PREFIX = "/path/prefix"; + static final String SCALAR_PATH = "/foo/documentation/scalar"; + + @Test + void checkContent() { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX); + checkContent(SCALAR_PATH, headers, "results/app12"); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app13/SpringDocApp13Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app13/SpringDocApp13Test.java new file mode 100644 index 000000000..eae8994d1 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app13/SpringDocApp13Test.java @@ -0,0 +1,48 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app13; + +import java.util.Map; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + + +@TestPropertySource(properties = { + "server.forward-headers-strategy=framework", + "scalar.path="+ SpringDocApp13Test.SCALAR_PATH, + "springdoc.api-docs.path=/bar/openapi/v3" +}) +public class SpringDocApp13Test extends AbstractCommonTest { + + private static final String X_FORWARD_PREFIX = "/path/prefix"; + static final String SCALAR_PATH = "/foo/documentation/scalar"; + + @Test + void checkContent() { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX); + checkContent(SCALAR_PATH, headers, "results/app13"); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app2/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app2/HelloController.java new file mode 100644 index 000000000..42db213e4 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app2/HelloController.java @@ -0,0 +1,36 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app2; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app2/SpringDocApp2Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app2/SpringDocApp2Test.java new file mode 100644 index 000000000..4570cd798 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app2/SpringDocApp2Test.java @@ -0,0 +1,40 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app2; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +@TestPropertySource(properties = "scalar.path="+ SpringDocApp2Test.SCALAR_PATH) +public class SpringDocApp2Test extends AbstractCommonTest { + + static final String SCALAR_PATH = "/batz/scalar"; + + @Test + void checkContent() { + checkContent(SCALAR_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app3/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app3/HelloController.java new file mode 100644 index 000000000..e0eccc6d7 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app3/HelloController.java @@ -0,0 +1,36 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app3; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app3/SpringDocApp3Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app3/SpringDocApp3Test.java new file mode 100644 index 000000000..03e7f98b4 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app3/SpringDocApp3Test.java @@ -0,0 +1,43 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app3; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +@TestPropertySource(properties = { + "scalar.path="+ SpringDocApp3Test.SCALAR_PATH, + "springdoc.api-docs.path=/documentation/v3/api-docs" +}) +public class SpringDocApp3Test extends AbstractCommonTest { + + static final String SCALAR_PATH = "/batz/scalar"; + + @Test + void checkContent() { + checkContent(SCALAR_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app4/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app4/HelloController.java new file mode 100644 index 000000000..5b348397c --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app4/HelloController.java @@ -0,0 +1,44 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app4; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app4/SpringDocApp4Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app4/SpringDocApp4Test.java new file mode 100644 index 000000000..fc0ddedd5 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app4/SpringDocApp4Test.java @@ -0,0 +1,71 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app4; + +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import test.org.springdoc.webflux.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", + "springdoc.use-management-port=true", + "management.server.port=9592", + "management.endpoints.web.base-path="+ SpringDocApp4Test.ACTUATOR_BASE_PATH }) +class SpringDocApp4Test extends AbstractSpringDocActuatorTest { + + static final String ACTUATOR_BASE_PATH = "/application"; + + static final String SCALAR_PATH = ACTUATOR_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkNotFound() { + webTestClient.get().uri(SCALAR_DEFAULT_PATH) + .exchange() + .expectStatus().isNotFound(); + } + + @Test + void checkContent() { + HttpStatusCode httpStatusMono = webClient.get().uri("/application/scalar") + .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); + assertThat(httpStatusMono).isEqualTo(HttpStatus.OK); + checkContent(SCALAR_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app5/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app5/HelloController.java new file mode 100644 index 000000000..8f94b0c00 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app5/HelloController.java @@ -0,0 +1,45 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app5; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; +import org.springdoc.core.models.GroupedOpenApi; + +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + + @Bean + public GroupedOpenApi userOpenApi() { + return GroupedOpenApi.builder() + .group("users") + .packagesToScan("test.org.springdoc.api.v30.app145") + .build(); + } +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app5/SpringDocApp5Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app5/SpringDocApp5Test.java new file mode 100644 index 000000000..9b4dc31e5 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app5/SpringDocApp5Test.java @@ -0,0 +1,68 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app5; + +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import test.org.springdoc.webflux.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", "springdoc.use-management-port=true", + "management.server.port=9593", "management.endpoints.web.base-path="+ SpringDocApp5Test.ACTUATOR_BASE_PATH }) +class SpringDocApp5Test extends AbstractSpringDocActuatorTest { + + static final String ACTUATOR_BASE_PATH = "/application"; + + static final String SCALAR_PATH = ACTUATOR_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkNotFound() { + webTestClient.get().uri(SCALAR_DEFAULT_PATH) + .exchange() + .expectStatus().isNotFound(); + } + + @Test + void checkContent() { + HttpStatusCode httpStatusMono = webClient.get().uri("/application/scalar") + .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); + assertThat(httpStatusMono).isEqualTo(HttpStatus.OK); + checkContent(SCALAR_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app6/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app6/HelloController.java new file mode 100644 index 000000000..4b7cfc634 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app6/HelloController.java @@ -0,0 +1,36 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app6; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app6/SpringDocApp6Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app6/SpringDocApp6Test.java new file mode 100644 index 000000000..83bf8797c --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app6/SpringDocApp6Test.java @@ -0,0 +1,63 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app6; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", + "springdoc.use-management-port=true", + "management.server.port=9594", + "management.server.base-path="+ SpringDocApp6Test.ACTUATOR_BASE_PATH, + "management.endpoints.web.base-path="+ SpringDocApp6Test.MANAGEMENT_BASE_PATH }) +class SpringDocApp6Test extends AbstractSpringDocActuatorTest { + + static final String ACTUATOR_BASE_PATH = "/test"; + static final String MANAGEMENT_BASE_PATH = "/application"; + static final String REQUEST_PATH = ACTUATOR_BASE_PATH + MANAGEMENT_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkNotFound() { + webTestClient.get().uri(SCALAR_DEFAULT_PATH) + .exchange() + .expectStatus().isNotFound(); + } + + @Test + void checkContent() { + checkContent(REQUEST_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app7/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app7/HelloController.java new file mode 100644 index 000000000..757e2cd93 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app7/HelloController.java @@ -0,0 +1,36 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app7; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app7/SpringDocApp7Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app7/SpringDocApp7Test.java new file mode 100644 index 000000000..4a266e561 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app7/SpringDocApp7Test.java @@ -0,0 +1,62 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app7; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", + "springdoc.show-actuator=true", + "management.server.port=9596", + "management.server.base-path=/test", + "management.endpoints.web.base-path=/application" }) +class SpringDocApp7Test extends AbstractSpringDocActuatorTest { + + static final String ACTUATOR_BASE_PATH = "/test"; + static final String MANAGEMENT_BASE_PATH = "/application"; + static final String REQUEST_PATH = ACTUATOR_BASE_PATH + MANAGEMENT_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkNotFound() { + HttpStatusCode status = webClient.get() + .uri(REQUEST_PATH) + .exchangeToMono(resp -> resp.releaseBody().thenReturn(resp.statusCode())) + .block(); + assertThat(status).isEqualTo(HttpStatus.NOT_FOUND); + } + + @Test + void checkContent() { + checkContentWithWebTestClient(SCALAR_DEFAULT_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app8/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app8/HelloController.java new file mode 100644 index 000000000..dfb8ef9b0 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app8/HelloController.java @@ -0,0 +1,45 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app8; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; +import org.springdoc.core.models.GroupedOpenApi; + +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + + @Bean + public GroupedOpenApi userOpenApi() { + return GroupedOpenApi.builder() + .group("users") + .packagesToScan("test.org.springdoc.api.v30.app145") + .build(); + } +} diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app8/SpringDocApp8Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app8/SpringDocApp8Test.java new file mode 100644 index 000000000..c8f0afa75 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app8/SpringDocApp8Test.java @@ -0,0 +1,50 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app8; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; + +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + + +@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT, + properties = { "server.port=9519", + "scalar.path="+ DEFAULT_PATH_SEPARATOR }) +class SpringDocApp8Test extends AbstractCommonTest { + + @Test + void checkContent() { + checkContent(DEFAULT_PATH_SEPARATOR); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/HelloController.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/HelloController.java new file mode 100644 index 000000000..90b92b1b5 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/HelloController.java @@ -0,0 +1,36 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webflux.scalar.app9; + + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RequestMapping("/foo/bar") +@RestController +public class HelloController { + + @GetMapping("/test") + public String doSomethingInteresting() { + return "OK"; + } + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/SpringDocApp9Test.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/SpringDocApp9Test.java new file mode 100644 index 000000000..9045395c7 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/SpringDocApp9Test.java @@ -0,0 +1,51 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webflux.scalar.app9; + + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webflux.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static test.org.springdoc.webflux.scalar.app9.WebConfig.BASE_PATH; + + +@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT, + properties = { "server.port=9520" }) +class SpringDocApp9Test extends AbstractCommonTest { + + @Test + void checkContent() { + checkContent(BASE_PATH + SCALAR_DEFAULT_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/WebConfig.java b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/WebConfig.java new file mode 100644 index 000000000..c74c940ed --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/java/test/org/springdoc/webflux/scalar/app9/WebConfig.java @@ -0,0 +1,16 @@ +package test.org.springdoc.webflux.scalar.app9; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.config.PathMatchConfigurer; +import org.springframework.web.reactive.config.WebFluxConfigurer; + +@Configuration +public class WebConfig implements WebFluxConfigurer { + + static final String BASE_PATH = "/test"; + @Override + public void configurePathMatching(PathMatchConfigurer configurer) { + configurer.addPathPrefix(BASE_PATH, t -> true); + } + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/application-test.yml b/springdoc-openapi-starter-webflux-scalar/src/test/resources/application-test.yml new file mode 100644 index 000000000..544f357e4 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/application-test.yml @@ -0,0 +1,9 @@ +spring: + main: + banner-mode: "off" + lazy-initialization: true +logging: + level: + root: ERROR + pattern: + console: '%m%n' \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/logback-test.xml b/springdoc-openapi-starter-webflux-scalar/src/test/resources/logback-test.xml new file mode 100644 index 000000000..a715d5a44 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/logback-test.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app1 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app1 new file mode 100644 index 000000000..19e300d37 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app1 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app10 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app10 new file mode 100644 index 000000000..dfbe8d55c --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app10 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11 new file mode 100644 index 000000000..6b9b9273d --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11-1 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11-1 new file mode 100644 index 000000000..9501a81ca --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11-1 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11-2 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11-2 new file mode 100644 index 000000000..b3de119ee --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app11-2 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app12 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app12 new file mode 100644 index 000000000..008c75abc --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app12 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app13 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app13 new file mode 100644 index 000000000..8a5017e08 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app13 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app2 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app2 new file mode 100644 index 000000000..57691e413 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app2 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app3 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app3 new file mode 100644 index 000000000..bba87d100 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app3 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app4 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app4 new file mode 100644 index 000000000..dc17a8ec8 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app4 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app5 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app5 new file mode 100644 index 000000000..98d5fe303 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app5 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app6 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app6 new file mode 100644 index 000000000..d2c196024 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app6 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app7 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app7 new file mode 100644 index 000000000..6b9b9273d --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app7 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app8 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app8 new file mode 100644 index 000000000..5d3ff1550 --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app8 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app9 b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app9 new file mode 100644 index 000000000..dfbe8d55c --- /dev/null +++ b/springdoc-openapi-starter-webflux-scalar/src/test/resources/results/app9 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webflux-ui/pom.xml b/springdoc-openapi-starter-webflux-ui/pom.xml index 76c31fc67..35be136ec 100644 --- a/springdoc-openapi-starter-webflux-ui/pom.xml +++ b/springdoc-openapi-starter-webflux-ui/pom.xml @@ -3,9 +3,10 @@ org.springdoc springdoc-openapi - 2.8.5 + 2.8.13 springdoc-openapi-starter-webflux-ui + ${project.artifactId} @@ -25,7 +26,7 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-actuator-autoconfigure true @@ -50,4 +51,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java index 8b919af0e..9a1618b3d 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; @@ -83,7 +83,7 @@ public class SwaggerConfig implements WebFluxConfigurer { @ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true) @Lazy(false) SwaggerWelcomeWebFlux swaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, SpringWebProvider springWebProvider) { - return new SwaggerWelcomeWebFlux(swaggerUiConfig, springDocConfigProperties,springWebProvider); + return new SwaggerWelcomeWebFlux(swaggerUiConfig, springDocConfigProperties, springWebProvider); } /** @@ -195,9 +195,9 @@ static class SwaggerActuatorWelcomeConfiguration { /** * Swagger actuator welcome swagger welcome actuator. * - * @param swaggerUiConfig the swagger ui config - * @param springDocConfigProperties the spring doc config properties - * @param webEndpointProperties the web endpoint properties + * @param swaggerUiConfig the swagger ui config + * @param springDocConfigProperties the spring doc config properties + * @param webEndpointProperties the web endpoint properties * @return the swagger welcome actuator */ @Bean diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfigResource.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfigResource.java index 8db596784..cf803ddc5 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfigResource.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerConfigResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexPageTransformer.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexPageTransformer.java index e5776ca32..d68eb838d 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexPageTransformer.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexPageTransformer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; @@ -64,7 +64,7 @@ public class SwaggerIndexPageTransformer extends AbstractSwaggerIndexTransformer * @param swaggerWelcomeCommon the swagger welcome common * @param objectMapperProvider the object mapper provider */ - public SwaggerIndexPageTransformer(SwaggerUiConfigProperties swaggerUiConfig, SwaggerUiOAuthProperties swaggerUiOAuthProperties, + public SwaggerIndexPageTransformer(SwaggerUiConfigProperties swaggerUiConfig, SwaggerUiOAuthProperties swaggerUiOAuthProperties, SwaggerWelcomeCommon swaggerWelcomeCommon, ObjectMapperProvider objectMapperProvider) { super(swaggerUiConfig, swaggerUiOAuthProperties, objectMapperProvider); this.swaggerWelcomeCommon = swaggerWelcomeCommon; @@ -74,7 +74,7 @@ public SwaggerIndexPageTransformer(SwaggerUiConfigProperties swaggerUiConfig, Sw public Mono transform(ServerWebExchange serverWebExchange, Resource resource, ResourceTransformerChain resourceTransformerChain) { SwaggerUiConfigParameters swaggerUiConfigParameters = new SwaggerUiConfigParameters(swaggerUiConfig); swaggerWelcomeCommon.buildFromCurrentContextPath(swaggerUiConfigParameters, serverWebExchange.getRequest()); - + final AntPathMatcher antPathMatcher = new AntPathMatcher(); try { boolean isIndexFound = antPathMatcher.match("**/swagger-ui/**/" + SWAGGER_INITIALIZER_JS, resource.getURL().toString()); diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexTransformer.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexTransformer.java index 25fd1c739..ed6715c46 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexTransformer.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerIndexTransformer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerResourceResolver.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerResourceResolver.java index d5ccc0b34..076f50844 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerResourceResolver.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerResourceResolver.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; @@ -66,7 +66,7 @@ public SwaggerResourceResolver(SwaggerUiConfigProperties swaggerUiConfigProperti @Override protected String findWebJarResourcePath(String pathStr) { String resourcePath = super.findWebJarResourcePath(pathStr); - if(resourcePath == null) + if (resourcePath == null) return findSwaggerResourcePath(pathStr, swaggerUiConfigProperties.getVersion()); return resourcePath; } diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerUiHome.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerUiHome.java index 0c48b2c2b..a8da09466 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerUiHome.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerUiHome.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; @@ -53,15 +53,15 @@ public class SwaggerUiHome { /** - * The Swagger ui path. + * The Optional web flux properties. */ - @Value(SWAGGER_UI_PATH) - private String swaggerUiPath; + private final Optional optionalWebFluxProperties; /** - * The Optional web flux properties. + * The Swagger ui path. */ - private final Optional optionalWebFluxProperties; + @Value(SWAGGER_UI_PATH) + private String swaggerUiPath; /** * Instantiates a new Swagger ui home. diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWebFluxConfigurer.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWebFluxConfigurer.java index 6eae1425d..1be092419 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWebFluxConfigurer.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWebFluxConfigurer.java @@ -103,16 +103,25 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) { uiRootPath.append(actuatorProvider.get().getBasePath()); String webjarsPrefix = springDocConfigProperties.getWebjars().getPrefix(); - String resourcePath,swaggerUiPrefix; + String resourcePath, swaggerUiPrefix, swaggerUiWebjarsPrefix; if (DEFAULT_WEB_JARS_PREFIX_URL.equals(webjarsPrefix)) { swaggerUiPrefix = SWAGGER_UI_PREFIX; - resourcePath = webjarsPrefix + SWAGGER_UI_PREFIX + DEFAULT_PATH_SEPARATOR + swaggerUiConfigProperties.getVersion(); - } else { + resourcePath = webjarsPrefix + SWAGGER_UI_PREFIX + DEFAULT_PATH_SEPARATOR + swaggerUiConfigProperties.getVersion() + DEFAULT_PATH_SEPARATOR; + swaggerUiWebjarsPrefix = webjarsPrefix + swaggerUiPrefix; + } + else { swaggerUiPrefix = webjarsPrefix; resourcePath = DEFAULT_WEB_JARS_PREFIX_URL + DEFAULT_PATH_SEPARATOR; + swaggerUiWebjarsPrefix = swaggerUiPrefix; } + registry.addResourceHandler(uiRootPath + swaggerUiWebjarsPrefix + ALL_PATTERN) + .addResourceLocations(CLASSPATH_RESOURCE_LOCATION + resourcePath) + .resourceChain(false) + .addResolver(swaggerResourceResolver) + .addTransformer(swaggerIndexTransformer); + registry.addResourceHandler(uiRootPath + swaggerUiPrefix + ALL_PATTERN) .addResourceLocations(CLASSPATH_RESOURCE_LOCATION + resourcePath) .resourceChain(false) diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeActuator.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeActuator.java index 7ed11b5f1..e8b2a2c16 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeActuator.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeActuator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; @@ -74,7 +74,7 @@ public class SwaggerWelcomeActuator extends SwaggerWelcomeCommon { */ public SwaggerWelcomeActuator(SwaggerUiConfigProperties swaggerUiConfig , SpringDocConfigProperties springDocConfigProperties, - WebEndpointProperties webEndpointProperties) { + WebEndpointProperties webEndpointProperties) { super(swaggerUiConfig, springDocConfigProperties); this.webEndpointProperties = webEndpointProperties; } @@ -82,7 +82,7 @@ public SwaggerWelcomeActuator(SwaggerUiConfigProperties swaggerUiConfig /** * Redirect to ui mono. * - * @param request the request + * @param request the request * @param response the response * @return the mono */ diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java index 4bf3ae22e..87660e686 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java @@ -39,6 +39,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.util.ForwardedHeaderUtils; import org.springframework.web.util.UriComponentsBuilder; import static org.springdoc.core.utils.Constants.DEFAULT_WEB_JARS_PREFIX_URL; @@ -123,12 +124,13 @@ protected Map getSwaggerUiConfig(ServerHttpRequest request) { void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, ServerHttpRequest request) { super.init(swaggerUiConfigParameters); swaggerUiConfigParameters.setContextPath(request.getPath().contextPath().value()); - String url = UriComponentsBuilder.fromHttpRequest(request).toUriString(); + String url = ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()).toUriString(); String target = UriComponentsBuilder.fromPath(request.getPath().contextPath().value()).toUriString(); int endIndex = url.indexOf(target) + target.length(); if (endIndex > 0) { url = url.substring(0, endIndex); - } else { + } + else { url = url.replace(request.getPath().toString(), ""); } buildConfigUrl(swaggerUiConfigParameters, UriComponentsBuilder.fromUriString(url)); diff --git a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeWebFlux.java b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeWebFlux.java index a4dcdb4e3..12e630fd9 100644 --- a/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeWebFlux.java +++ b/springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeWebFlux.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webflux.ui; @@ -71,7 +71,7 @@ public SwaggerWelcomeWebFlux(SwaggerUiConfigProperties swaggerUiConfig, SpringDo /** * Redirect to ui mono. * - * @param request the request + * @param request the request * @param response the response * @return the mono */ @@ -85,7 +85,7 @@ public Mono redirectToUi(ServerHttpRequest request, ServerHttpResponse res @Override protected void calculateUiRootPath(SwaggerUiConfigParameters swaggerUiConfigParameters, StringBuilder... sbUrls) { StringBuilder sbUrl = new StringBuilder(); - calculateUiRootCommon(swaggerUiConfigParameters,sbUrl, sbUrls); + calculateUiRootCommon(swaggerUiConfigParameters, sbUrl, sbUrls); } @Override @@ -99,14 +99,15 @@ protected String buildUrlWithContextPath(SwaggerUiConfigParameters swaggerUiConf swaggerUiConfigParameters.setPathPrefix(springWebProvider.findPathPrefix(springDocConfigProperties)); if (swaggerUiUrl.startsWith(swaggerUiConfigParameters.getPathPrefix())) { return buildUrl(swaggerUiConfigParameters.getContextPath(), swaggerUiUrl); - } else { + } + else { return buildUrl(swaggerUiConfigParameters.getContextPath() + swaggerUiConfigParameters.getPathPrefix(), swaggerUiUrl); } } @Override protected void buildSwaggerConfigUrl(SwaggerUiConfigParameters swaggerUiConfigParameters) { - swaggerUiConfigParameters.setConfigUrl(swaggerUiConfigParameters.getApiDocsUrl()+ DEFAULT_PATH_SEPARATOR + SWAGGER_CONFIG_FILE); + swaggerUiConfigParameters.setConfigUrl(swaggerUiConfigParameters.getApiDocsUrl() + DEFAULT_PATH_SEPARATOR + SWAGGER_CONFIG_FILE); } } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java index c4fa0d6f3..007cb67ed 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java @@ -17,7 +17,7 @@ @AutoConfigureWebTestClient(timeout = "3600000") @ActiveProfiles("test") -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractCommonTest { protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectConfigUrlTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectConfigUrlTest.java index 7ef39597e..3774d2ea2 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectConfigUrlTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectConfigUrlTest.java @@ -39,7 +39,7 @@ void shouldRedirectWithConfigUrlIgnoringQueryParams() { WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/swagger-ui.html").exchange() .expectStatus().isFound(); responseSpec.expectHeader() - .value("Location", Matchers.is("/swagger-ui/index.html")); + .value("Location", Matchers.is("/swagger-ui/index.html")); super.checkJS("index1-configurl"); } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectDefaultTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectDefaultTest.java index 9fa823945..d34ecac52 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectDefaultTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectDefaultTest.java @@ -33,7 +33,7 @@ void shouldRedirectWithDefaultQueryParams() { WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/swagger-ui.html").exchange() .expectStatus().isFound(); responseSpec.expectHeader() - .value("Location", Matchers.is("/swagger-ui/index.html")); + .value("Location", Matchers.is("/swagger-ui/index.html")); webTestClient.get().uri("/v3/api-docs/swagger-config").exchange() .expectStatus().isOk().expectBody().jsonPath("$.validatorUrl").isEqualTo(""); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectLayoutTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectLayoutTest.java index 88ef7a407..899740c1b 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectLayoutTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectLayoutTest.java @@ -36,7 +36,7 @@ void shouldRedirectWithConfigUrlIgnoringQueryParams() { WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/swagger-ui.html").exchange() .expectStatus().isFound(); responseSpec.expectHeader() - .value("Location", Matchers.is("/swagger-ui/index.html")); + .value("Location", Matchers.is("/swagger-ui/index.html")); super.checkJS("index1-layout"); } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectWithConfigTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectWithConfigTest.java index 32f6f57a3..6fc616f42 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectWithConfigTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1RedirectWithConfigTest.java @@ -38,7 +38,7 @@ void shouldRedirectWithConfiguredParams() { .expectStatus().isFound(); responseSpec.expectHeader() - .value("Location", Matchers.is("/swagger-ui/index.html")); + .value("Location", Matchers.is("/swagger-ui/index.html")); webTestClient.get().uri("/baf/batz/swagger-config").exchange() .expectStatus().isOk().expectBody().jsonPath("$.validatorUrl").isEqualTo("/foo/validate"); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java index 1902acacb..471510933 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java @@ -47,7 +47,7 @@ class SpringDocApp13Test extends AbstractSpringDocActuatorTest { @Test void testIndex() { - EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") + EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") .exchange() .expectStatus().isOk() .expectBody().returnResult(); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java index 7f5aaf45f..2e40484b7 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java @@ -45,7 +45,7 @@ class SpringDocApp14Test extends AbstractSpringDocActuatorTest { @Test void testIndex() { - EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") + EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") .exchange() .expectStatus().isOk() .expectBody().returnResult(); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java index d944c945d..73ffff0db 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java @@ -48,7 +48,7 @@ class SpringDocApp15Test extends AbstractSpringDocActuatorTest { @Test void testIndex() { - EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") + EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") .exchange() .expectStatus().isOk() .expectBody().returnResult(); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java index 143b1ffd6..1d4f11c70 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app16/SpringDocApp16Test.java @@ -48,7 +48,7 @@ class SpringDocApp16Test extends AbstractSpringDocActuatorTest { @Test void testIndex() { - EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") + EntityExchangeResult getResult = webTestClient.get().uri("/application/swagger-ui/index.html") .exchange() .expectStatus().isOk() .expectBody().returnResult(); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app19/SpringDocApp19Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app19/SpringDocApp19Test.java index 0ef0b31e4..52172b241 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app19/SpringDocApp19Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app19/SpringDocApp19Test.java @@ -63,7 +63,7 @@ void testIndex() throws Exception { .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND); - httpStatusMono = webClient.get().uri("/swagger-ui/index.html") + httpStatusMono = webClient.get().uri("/swagger-ui/index.html") .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); assertThat(httpStatusMono).isEqualTo(HttpStatus.OK); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app20/SpringDocApp20Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app20/SpringDocApp20Test.java index 488fccad7..71c9a4a82 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app20/SpringDocApp20Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app20/SpringDocApp20Test.java @@ -63,7 +63,7 @@ void testIndex() throws Exception { .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND); - httpStatusMono = webClient.get().uri("/swagger-ui/index.html") + httpStatusMono = webClient.get().uri("/swagger-ui/index.html") .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); assertThat(httpStatusMono).isEqualTo(HttpStatus.OK); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app24/SpringDocApp24Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app24/SpringDocApp24Test.java index dd2cd880a..4d36fe90b 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app24/SpringDocApp24Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app24/SpringDocApp24Test.java @@ -40,7 +40,7 @@ void test_apidocs_disabled() { .jsonPath("$.url").isEqualTo("/api-docs/xxx/v1/openapi.yml") .jsonPath("$.configUrl").isEqualTo("/api-docs/swagger-config") .jsonPath("$.validatorUrl").isEqualTo("") - .jsonPath("$.oauth2RedirectUrl").isEqualTo("/swagger-ui/oauth2-redirect.html"); + .jsonPath("$.oauth2RedirectUrl").isEqualTo("/swagger-ui/oauth2-redirect.html"); } @SpringBootApplication diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3RedirectDefaultTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3RedirectDefaultTest.java index bb9de5920..01a28be74 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3RedirectDefaultTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3RedirectDefaultTest.java @@ -39,12 +39,12 @@ void shouldRedirectWithDefaultQueryParams() { WebTestClient.ResponseSpec responseSpec = webTestClient.get().uri("/documentation/swagger-ui.html").exchange() .expectStatus().isFound(); responseSpec.expectHeader() - .value("Location", Matchers.is("/documentation/swagger-ui/index.html")); + .value("Location", Matchers.is("/documentation/swagger-ui/index.html")); webTestClient.get().uri("/documentation/v3/api-docs/swagger-config").exchange() .expectStatus().isOk().expectBody() .jsonPath("$.validatorUrl").isEqualTo("") - .jsonPath("$.oauth2RedirectUrl").isEqualTo("/documentation/swagger-ui/oauth2-redirect.html"); + .jsonPath("$.oauth2RedirectUrl").isEqualTo("/documentation/swagger-ui/oauth2-redirect.html"); super.checkJS("index3", "/documentation" + Constants.SWAGGER_INITIALIZER_URL); } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3Test.java index efc687688..e8d611979 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3Test.java @@ -34,7 +34,7 @@ public class SpringDocApp3Test extends AbstractSpringDocTest { void shouldDisplaySwaggerUiPage() { webTestClient.get().uri("/documentation/swagger-ui.html").exchange() .expectStatus().isFound(); - webTestClient.get().uri("/documentation/swagger-ui/index.html").exchange() + webTestClient.get().uri("/documentation/swagger-ui/index.html").exchange() .expectStatus().isOk(); } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java index 18f2b6cf8..6c7fec424 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java @@ -40,14 +40,14 @@ public class SpringDocBehindProxyTest extends AbstractSpringDocTest { @Test void shouldServeSwaggerUIAtDefaultPath() { - webTestClient.get().uri("/swagger-ui/index.html").exchange() + webTestClient.get().uri("/swagger-ui/index.html").exchange() .expectStatus().isOk(); } @Test void shouldReturnCorrectInitializerJS() throws Exception { webTestClient - .get().uri("/swagger-ui/swagger-initializer.js") + .get().uri("/swagger-ui/swagger-initializer.js") .header("X-Forwarded-Prefix", X_FORWARD_PREFIX) .exchange() .expectStatus().isOk() @@ -67,7 +67,7 @@ void shouldCalculateOauthRedirectBehindProxy() throws Exception { .header("X-Forwarded-Prefix", X_FORWARD_PREFIX) .exchange() .expectStatus().isOk().expectBody() - .jsonPath("$.oauth2RedirectUrl").isEqualTo("https://proxy-host/path/prefix/swagger-ui/oauth2-redirect.html"); + .jsonPath("$.oauth2RedirectUrl").isEqualTo("https://proxy-host/path/prefix/swagger-ui/oauth2-redirect.html"); } @Test @@ -87,7 +87,7 @@ void shouldCalculateUrlsBehindProxy() throws Exception { void shouldReturnCorrectInitializerJSWhenChangingForwardedPrefixHeader() throws Exception { var tasks = IntStream.range(0, 10).mapToObj(i -> CompletableFuture.runAsync(() -> { try { - webTestClient.get().uri("/swagger-ui/swagger-initializer.js") + webTestClient.get().uri("/swagger-ui/swagger-initializer.js") .header("X-Forwarded-Prefix", "/path/prefix" + i) .exchange() .expectStatus().isOk() @@ -96,7 +96,8 @@ void shouldReturnCorrectInitializerJSWhenChangingForwardedPrefixHeader() throws assertThat(response.getResponseBody()) .contains("\"configUrl\" : \"/path/prefix" + i + "/v3/api-docs/swagger-config\",") ); - } catch (Exception e) { + } + catch (Exception e) { throw new RuntimeException(e); } })).toArray(CompletableFuture[]::new); @@ -114,7 +115,8 @@ void shouldCalculateUrlsBehindProxyWhenChangingForwardedPrefixHeader() { .expectStatus().isOk().expectBody() .jsonPath("$.url").isEqualTo("/path/prefix" + i + "/v3/api-docs") .jsonPath("$.configUrl").isEqualTo("/path/prefix" + i + "/v3/api-docs/swagger-config"); - } catch (Exception e) { + } + catch (Exception e) { throw new RuntimeException(e); } })).toArray(CompletableFuture[]::new); @@ -122,7 +124,7 @@ void shouldCalculateUrlsBehindProxyWhenChangingForwardedPrefixHeader() { CompletableFuture.allOf(tasks).join(); } - + @SpringBootApplication static class SpringDocTestApp {} } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyWithCustomUIPathTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyWithCustomUIPathTest.java index f7003c711..3584fdee3 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyWithCustomUIPathTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyWithCustomUIPathTest.java @@ -43,13 +43,13 @@ void shouldRedirectSwaggerUIFromCustomPath() { .header("X-Forwarded-Prefix", X_FORWARD_PREFIX) .exchange() .expectStatus().isFound() - .expectHeader().location("/path/prefix/foo/documentation/swagger-ui/index.html"); + .expectHeader().location("/path/prefix/foo/documentation/swagger-ui/index.html"); } @Test void shouldReturnCorrectInitializerJS() { webTestClient - .get().uri("/foo/documentation/swagger-ui/swagger-initializer.js") + .get().uri("/foo/documentation/swagger-ui/swagger-initializer.js") .header("X-Forwarded-Prefix", X_FORWARD_PREFIX) .exchange() .expectStatus().isOk() diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocBehindProxyBasePathTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocBehindProxyBasePathTest.java index 32b2f2196..9134b91df 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocBehindProxyBasePathTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocBehindProxyBasePathTest.java @@ -48,6 +48,7 @@ public class SpringDocBehindProxyBasePathTest extends AbstractCommonTest { public static final String WEBFLUX_BASE_PATH = "/test"; + public static final String X_FORWARD_PREFIX = "/path/prefix"; @LocalServerPort @@ -63,27 +64,26 @@ void init() { @Test void testIndex() throws Exception { - HttpStatusCode httpStatusMono = webClient.get().uri(WEBFLUX_BASE_PATH+"/documentation/swagger-ui.html") + HttpStatusCode httpStatusMono = webClient.get().uri(WEBFLUX_BASE_PATH + "/documentation/swagger-ui.html") .header("X-Forwarded-Prefix", X_FORWARD_PREFIX) .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); assertThat(httpStatusMono).isEqualTo(HttpStatus.FOUND); - httpStatusMono = webClient.get().uri(WEBFLUX_BASE_PATH+"/documentation/webjars-pref/swagger-ui/index.html") + httpStatusMono = webClient.get().uri(WEBFLUX_BASE_PATH + "/documentation/webjars-pref/swagger-ui/index.html") .header("X-Forwarded-Prefix", X_FORWARD_PREFIX) .exchangeToMono(clientResponse -> Mono.just(clientResponse.statusCode())).block(); assertThat(httpStatusMono).isEqualTo(HttpStatus.OK); - String contentAsString = webClient.get().uri(WEBFLUX_BASE_PATH+"/documentation/v3/api-docs/swagger-config") + String contentAsString = webClient.get().uri(WEBFLUX_BASE_PATH + "/documentation/v3/api-docs/swagger-config") .header("X-Forwarded-Prefix", X_FORWARD_PREFIX) .retrieve() .bodyToMono(String.class).block(); - + String expected = getContent("results/app33.json"); assertEquals(expected, contentAsString, true); } - - + @SpringBootApplication static class SpringDocTestApp {} } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocConfig.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocConfig.java index edf233cb4..65fb80b6b 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocConfig.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app33/SpringDocConfig.java @@ -22,7 +22,7 @@ public class SpringDocConfig { @Bean - public WebFilter rewritePathWebFilter(WebFluxProperties webFluxProperties) { + public WebFilter rewritePathWebFilter(WebFluxProperties webFluxProperties) { return (ServerWebExchange exchange, WebFilterChain chain) -> { try { ServerHttpRequest originalRequest = (ServerHttpRequest) FieldUtils.readDeclaredField(exchange.getRequest(), "originalRequest", true); @@ -36,7 +36,8 @@ public WebFilter rewritePathWebFilter(WebFluxProperties webFluxProperties) { return chain.filter(mutatedExchange); } - } catch (Exception e) { + } + catch (Exception e) { LOGGER.error(e.getMessage()); } return chain.filter(exchange); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app34/HelloController.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app34/HelloController.java new file mode 100644 index 000000000..b0ae7702c --- /dev/null +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app34/HelloController.java @@ -0,0 +1,41 @@ +/* + * + * * + * * * + * * * * Copyright 2019-2020 the original author or authors. + * * * * + * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * you may not use this file except in compliance with the License. + * * * * You may obtain a copy of the License at + * * * * + * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * + * * * * Unless required by applicable law or agreed to in writing, software + * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * See the License for the specific language governing permissions and + * * * * limitations under the License. + * * * + * * + * + * + */ + +package test.org.springdoc.ui.app34; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java new file mode 100644 index 000000000..b478b2eb7 --- /dev/null +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java @@ -0,0 +1,54 @@ +/* + * + * * + * * * + * * * * Copyright 2019-2020 the original author or authors. + * * * * + * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * you may not use this file except in compliance with the License. + * * * * You may obtain a copy of the License at + * * * * + * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * + * * * * Unless required by applicable law or agreed to in writing, software + * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * See the License for the specific language governing permissions and + * * * * limitations under the License. + * * * + * * + * + * + */ + +package test.org.springdoc.ui.app34; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.ui.AbstractSpringDocTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.web.reactive.server.EntityExchangeResult; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@TestPropertySource(properties = "springdoc.swagger-ui.disable-swagger-default-url=true") +public class SpringDocApp34Test extends AbstractSpringDocTest { + + @Test + void transformed_index_with_oauth() throws Exception { + EntityExchangeResult getResult = webTestClient.get().uri("/webjars/swagger-ui/swagger-initializer.js") + .exchange() + .expectStatus().isOk() + .expectBody().returnResult(); + + var responseContent = new String(getResult.getResponseBody()); + assertFalse(responseContent.contains("https://petstore.swagger.io/v2/swagger.json")); + assertTrue(responseContent.contains("/v3/api-docs")); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthPathsTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthPathsTest.java index 6fe45330a..bf65c4a77 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthPathsTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthPathsTest.java @@ -29,7 +29,7 @@ public class SpringDocOauthPathsTest extends AbstractSpringDocTest { void oauth2_redirect_url_calculated() throws Exception { webTestClient.get().uri("/v3/api-docs/swagger-config").exchange() .expectStatus().isOk().expectBody() - .jsonPath("$.oauth2RedirectUrl").isEqualTo("/swagger-ui/oauth2-redirect.html"); + .jsonPath("$.oauth2RedirectUrl").isEqualTo("/swagger-ui/oauth2-redirect.html"); } @SpringBootApplication diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthRedirectUrlRecalculateTest.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthRedirectUrlRecalculateTest.java index 8bcebbbf8..ff201ea01 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthRedirectUrlRecalculateTest.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app4/SpringDocOauthRedirectUrlRecalculateTest.java @@ -36,7 +36,7 @@ void oauth2_redirect_url_recalculation() throws Exception { .exchange() .expectStatus().isOk() .expectBody() - .jsonPath("$.oauth2RedirectUrl").isEqualTo("https://host1/swagger-ui/oauth2-redirect.html"); + .jsonPath("$.oauth2RedirectUrl").isEqualTo("https://host1/swagger-ui/oauth2-redirect.html"); webTestClient.get().uri("/v3/api-docs/swagger-config") @@ -45,7 +45,7 @@ void oauth2_redirect_url_recalculation() throws Exception { .exchange() .expectStatus().isOk() .expectBody() - .jsonPath("$.oauth2RedirectUrl").isEqualTo("http://host2:8080/swagger-ui/oauth2-redirect.html"); + .jsonPath("$.oauth2RedirectUrl").isEqualTo("http://host2:8080/swagger-ui/oauth2-redirect.html"); } diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app6/SpringDocApp6Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app6/SpringDocApp6Test.java index 83f667954..bb9ebb0f9 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app6/SpringDocApp6Test.java @@ -36,7 +36,7 @@ public class SpringDocApp6Test extends AbstractSpringDocTest { @Test void transformed_index_with_oauth() throws Exception { - EntityExchangeResult getResult = webTestClient.get().uri(Constants.SWAGGER_INITIALIZER_URL) + EntityExchangeResult getResult = webTestClient.get().uri(Constants.SWAGGER_INITIALIZER_URL) .exchange() .expectStatus().isOk() .expectBody().returnResult(); diff --git a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app7/SpringDocApp7Test.java b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app7/SpringDocApp7Test.java index bb95daa59..65004c491 100644 --- a/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app7/SpringDocApp7Test.java @@ -36,7 +36,7 @@ public class SpringDocApp7Test extends AbstractSpringDocTest { @Test void transformed_index_with_oauth() throws Exception { - EntityExchangeResult getResult = webTestClient.get().uri(Constants.SWAGGER_INITIALIZER_URL) + EntityExchangeResult getResult = webTestClient.get().uri(Constants.SWAGGER_INITIALIZER_URL) .exchange() .expectStatus().isOk() .expectBody().returnResult(); diff --git a/springdoc-openapi-starter-webmvc-api/pom.xml b/springdoc-openapi-starter-webmvc-api/pom.xml index 8c868d9b2..293ed0f5a 100644 --- a/springdoc-openapi-starter-webmvc-api/pom.xml +++ b/springdoc-openapi-starter-webmvc-api/pom.xml @@ -3,9 +3,10 @@ org.springdoc springdoc-openapi - 2.8.5 + 2.8.13 springdoc-openapi-starter-webmvc-api + ${project.artifactId} @@ -17,25 +18,20 @@ org.springframework spring-webmvc - - - org.springframework.boot - spring-boot-starter-actuator - true - jakarta.servlet jakarta.servlet-api provided + - javax.money - money-api - test + org.springframework.boot + spring-boot-actuator-autoconfigure + true - org.hibernate.validator - hibernate-validator + javax.money + money-api test @@ -55,4 +51,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiActuatorResource.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiActuatorResource.java index 637d47a93..fa0e4e45e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiActuatorResource.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiActuatorResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.api; diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java index 647a6d75c..fb897d3c6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.api; @@ -90,14 +90,14 @@ public abstract class MultipleOpenApiResource implements InitializingBean { private final SpringDocConfigProperties springDocConfigProperties; /** - * The Grouped open api resources. + * The Spring doc customizers. */ - private Map groupedOpenApiResources; + private final SpringDocCustomizers springDocCustomizers; /** - * The Spring doc customizers. + * The Grouped open api resources. */ - private final SpringDocCustomizers springDocCustomizers; + private Map groupedOpenApiResources; /** * Instantiates a new Multiple open api resource. @@ -161,7 +161,7 @@ private OpenApiResource buildWebMvcOpenApiResource(GroupedOpenApi item) { operationParser, springDocConfigProperties, springDocProviders, new SpringDocCustomizers(Optional.of(item.getOpenApiCustomizers()), Optional.of(item.getOperationCustomizers()), - Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters())) + Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters()), Optional.empty(),Optional.empty()) ); else @@ -172,7 +172,7 @@ private OpenApiResource buildWebMvcOpenApiResource(GroupedOpenApi item) { operationParser, springDocConfigProperties, springDocProviders, new SpringDocCustomizers(Optional.of(item.getOpenApiCustomizers()), Optional.of(item.getOperationCustomizers()), - Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters())) + Optional.of(item.getRouterOperationCustomizers()), Optional.of(item.getOpenApiMethodFilters()),Optional.empty(),Optional.empty()) ); } diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiWebMvcResource.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiWebMvcResource.java index 097872c63..387eac815 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiWebMvcResource.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiWebMvcResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.api; diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiActuatorResource.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiActuatorResource.java index 32291d816..650effcab 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiActuatorResource.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiActuatorResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.api; @@ -77,7 +77,7 @@ public OpenApiActuatorResource(ObjectFactory openAPIBuilderObjec AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, - SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { + SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } @@ -95,8 +95,8 @@ public OpenApiActuatorResource(ObjectFactory openAPIBuilderObjec */ public OpenApiActuatorResource(String groupName, ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, - OperationService operationParser,SpringDocConfigProperties springDocConfigProperties, - SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { + OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, + SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java index c4557a5be..6d2465ba8 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.api; @@ -90,7 +90,7 @@ protected OpenApiResource(String groupName, ObjectFactory openAP GenericResponseService responseBuilder, OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { - super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); + super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } /** @@ -123,8 +123,8 @@ protected OpenApiResource(ObjectFactory openAPIBuilderObjectFact public byte[] openapiJson(HttpServletRequest request, String apiDocsUrl, Locale locale) throws JsonProcessingException { - calculateServerUrl(request, apiDocsUrl, locale); - OpenAPI openAPI = this.getOpenApi(locale); + String serverBaseUrl = calculateServerUrl(request, apiDocsUrl, locale); + OpenAPI openAPI = this.getOpenApi(serverBaseUrl, locale); return writeJsonValue(openAPI); } @@ -140,8 +140,8 @@ public byte[] openapiJson(HttpServletRequest request, public byte[] openapiYaml(HttpServletRequest request, String apiDocsUrl, Locale locale) throws JsonProcessingException { - calculateServerUrl(request, apiDocsUrl, locale); - OpenAPI openAPI = this.getOpenApi(locale); + String serverBaseUrl = calculateServerUrl(request, apiDocsUrl, locale); + OpenAPI openAPI = this.getOpenApi(serverBaseUrl, locale); return writeYamlValue(openAPI); } @@ -168,9 +168,9 @@ protected void getPaths(Map restControllers, Locale locale, Open if (actuatorProviderOptional.isPresent() && springDocConfigProperties.isShowActuator()) { Map actuatorMap = actuatorProviderOptional.get().getMethods(); List globMatchActuators = actuatorMap.keySet().stream() - .filter(requestMappingInfo -> requestMappingInfo.getPatternValues().stream() - .anyMatch(patternValues -> patternValues.contains("**"))) - .toList(); + .filter(requestMappingInfo -> requestMappingInfo.getPatternValues().stream() + .anyMatch(patternValues -> patternValues.contains("**"))) + .toList(); globMatchActuators.forEach(actuatorMap::remove); this.openAPIService.addTag(new HashSet<>(actuatorMap.values()), getTag()); map.putAll(actuatorMap); @@ -248,12 +248,13 @@ private Comparator byReversedRequestMappingInfos() { * @param request the request * @param apiDocsUrl the api docs url * @param locale the locale + * @return the string */ - protected void calculateServerUrl(HttpServletRequest request, String apiDocsUrl, Locale locale) { + protected String calculateServerUrl(HttpServletRequest request, String apiDocsUrl, Locale locale) { super.initOpenAPIBuilder(locale); String calculatedUrl = getServerUrl(request, apiDocsUrl); ServletServerHttpRequest serverRequest = request != null ? new ServletServerHttpRequest(request) : null; - openAPIService.setServerBaseUrl(calculatedUrl, serverRequest); + return openAPIService.calculateServerBaseUrl(calculatedUrl, serverRequest); } /** diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiWebMvcResource.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiWebMvcResource.java index de359f0df..2de2ccf69 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiWebMvcResource.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/api/OpenApiWebMvcResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.api; @@ -80,7 +80,7 @@ public OpenApiWebMvcResource(String groupName, ObjectFactory ope GenericResponseService responseBuilder, OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { - super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders,springDocCustomizers); + super(groupName, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } /** @@ -96,16 +96,16 @@ public OpenApiWebMvcResource(String groupName, ObjectFactory ope */ @Autowired public OpenApiWebMvcResource(ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, - OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { - super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); + OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { + super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } /** * Openapi json string. * - * @param request the request + * @param request the request * @param apiDocsUrl the api docs url - * @param locale the locale + * @param locale the locale * @return the string * @throws JsonProcessingException the json processing exception */ @@ -120,9 +120,9 @@ public byte[] openapiJson(HttpServletRequest request, @Value(API_DOCS_URL) Strin /** * Openapi yaml string. * - * @param request the request + * @param request the request * @param apiDocsUrl the api docs url - * @param locale the locale + * @param locale the locale * @return the string * @throws JsonProcessingException the json processing exception */ @@ -137,7 +137,7 @@ public byte[] openapiYaml(HttpServletRequest request, @Value(DEFAULT_API_DOCS_UR /** * Gets server url. * - * @param request the request + * @param request the request * @param apiDocsUrl the api docs url * @return the server url */ diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/MultipleOpenApiSupportConfiguration.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/MultipleOpenApiSupportConfiguration.java index 0e9c5310b..2401b00b3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/MultipleOpenApiSupportConfiguration.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/MultipleOpenApiSupportConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.core.configuration; diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/SpringDocWebMvcConfiguration.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/SpringDocWebMvcConfiguration.java index 2df2a480c..da35cf0a1 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/SpringDocWebMvcConfiguration.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/SpringDocWebMvcConfiguration.java @@ -21,18 +21,17 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.core.configuration; -import java.util.List; import java.util.Optional; import org.springdoc.core.configuration.SpringDocConfiguration; -import org.springdoc.core.customizers.ParameterCustomizer; import org.springdoc.core.customizers.SpringDocCustomizers; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; +import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.properties.SpringDocConfigProperties; import org.springdoc.core.providers.ActuatorProvider; import org.springdoc.core.providers.SpringDocProviders; @@ -112,7 +111,7 @@ OpenApiWebMvcResource openApiResource(ObjectFactory openAPIBuild SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { return new OpenApiWebMvcResource(openAPIBuilderObjectFactory, requestBuilder, - responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); + responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); } /** @@ -120,18 +119,20 @@ OpenApiWebMvcResource openApiResource(ObjectFactory openAPIBuild * * @param parameterBuilder the parameter builder * @param requestBodyService the request body builder - * @param parameterCustomizers the parameter customizers + * @param springDocCustomizers the spring doc customizers * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer + * @param methodParameterPojoExtractor the method parameter pojo extractor * @return the request builder */ @Bean @ConditionalOnMissingBean @Lazy(false) RequestService requestBuilder(GenericParameterService parameterBuilder, RequestBodyService requestBodyService, - Optional> parameterCustomizers, - SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) { + SpringDocCustomizers springDocCustomizers, + SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, + MethodParameterPojoExtractor methodParameterPojoExtractor) { return new RequestService(parameterBuilder, requestBodyService, - parameterCustomizers, localSpringDocParameterNameDiscoverer); + springDocCustomizers, localSpringDocParameterNameDiscoverer, methodParameterPojoExtractor); } /** @@ -193,10 +194,10 @@ static class SpringDocWebMvcActuatorConfiguration { /** * Actuator provider actuator provider. * - * @param serverProperties the server properties - * @param springDocConfigProperties the spring doc config properties - * @param managementServerProperties the management server properties - * @param webEndpointProperties the web endpoint properties + * @param serverProperties the server properties + * @param springDocConfigProperties the spring doc config properties + * @param managementServerProperties the management server properties + * @param webEndpointProperties the web endpoint properties * @return the actuator provider */ @Bean @@ -233,11 +234,11 @@ ActuatorProvider actuatorProvider(ServerProperties serverProperties, OpenApiActuatorResource openApiActuatorResource(ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, - SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { + SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { return new OpenApiActuatorResource(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, - springDocConfigProperties, springDocProviders, springDocCustomizers); + springDocConfigProperties, springDocProviders, springDocCustomizers); } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/fn/SpringdocRouteBuilder.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/fn/SpringdocRouteBuilder.java index e9b058c06..43753d0c6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/fn/SpringdocRouteBuilder.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/fn/SpringdocRouteBuilder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.core.fn; diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/ActuatorWebMvcProvider.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/ActuatorWebMvcProvider.java index d42495402..a3eea69ef 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/ActuatorWebMvcProvider.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/ActuatorWebMvcProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.core.providers; diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/RouterFunctionWebMvcProvider.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/RouterFunctionWebMvcProvider.java index 618b17388..3fbf2182a 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/RouterFunctionWebMvcProvider.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/RouterFunctionWebMvcProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.core.providers; diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/SpringWebMvcProvider.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/SpringWebMvcProvider.java index e64e17e4d..b532a73c3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/SpringWebMvcProvider.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/providers/SpringWebMvcProvider.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.core.providers; diff --git a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/service/RequestService.java b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/service/RequestService.java index 9feb94fc8..a56affdcd 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/service/RequestService.java +++ b/springdoc-openapi-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/service/RequestService.java @@ -21,16 +21,14 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.core.service; -import java.util.List; -import java.util.Optional; - -import org.springdoc.core.customizers.ParameterCustomizer; +import org.springdoc.core.customizers.SpringDocCustomizers; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; +import org.springdoc.core.extractor.MethodParameterPojoExtractor; import org.springdoc.core.service.AbstractRequestService; import org.springdoc.core.service.GenericParameterService; import org.springdoc.core.service.RequestBodyService; @@ -58,12 +56,14 @@ public class RequestService extends AbstractRequestService { * * @param parameterBuilder the parameter builder * @param requestBodyService the request body builder - * @param parameterCustomizers the parameter customizers + * @param springDocCustomizers the spring doc customizers * @param localSpringDocParameterNameDiscoverer the local spring doc parameter name discoverer + * @param methodParameterPojoExtractor the method parameter pojo extractor */ public RequestService(GenericParameterService parameterBuilder, RequestBodyService requestBodyService, - Optional> parameterCustomizers, - SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) { - super(parameterBuilder, requestBodyService, parameterCustomizers, localSpringDocParameterNameDiscoverer); + SpringDocCustomizers springDocCustomizers, + SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer, + MethodParameterPojoExtractor methodParameterPojoExtractor) { + super(parameterBuilder, requestBodyService, springDocCustomizers, localSpringDocParameterNameDiscoverer,methodParameterPojoExtractor); } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java index d6cdd00f2..30d5320d4 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java @@ -43,13 +43,13 @@ public class SpringDocApp110Test extends AbstractSpringDocV30Test { static class SpringDocTestApp { @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java index dad12e8d6..ce7391d72 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java @@ -43,12 +43,12 @@ public class SpringDocApp111Test extends AbstractSpringDocV30Test { static class SpringDocTestApp { @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java index 68b6e5e6e..ea2da1062 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java @@ -43,12 +43,12 @@ public class SpringDocApp112Test extends AbstractSpringDocV30Test { static class SpringDocTestApp { @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java index 44564e9b6..30b00e3f7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java @@ -46,7 +46,6 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) { Content content = response.getContent(); if (content.containsKey(MediaType.APPLICATION_JSON_VALUE)) { Schema schema = content.get(MediaType.APPLICATION_JSON_VALUE).getSchema(); - schema.getProperties().clear(); schema.setType("string"); } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java index b4ad1cf6b..07df36bd3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java @@ -27,8 +27,11 @@ import test.org.springdoc.api.v30.AbstractSpringDocV30Test; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; +import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_EXTRA_SCHEMAS; +@TestPropertySource(properties = SPRINGDOC_ENABLE_EXTRA_SCHEMAS + "=true") public class SpringDocApp115Test extends AbstractSpringDocV30Test { @SpringBootApplication diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java index 6b21f521b..dbc4b9519 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java @@ -46,7 +46,7 @@ public class HelloController { produces = MediaType.TEXT_PLAIN_VALUE) public String multiFilesInMultiPart( @RequestPart("params") - @RequestBody(content = @Content(encoding = @Encoding(name="params", contentType=MediaType.APPLICATION_JSON_VALUE))) + @RequestBody(content = @Content(encoding = @Encoding(name = "params", contentType = MediaType.APPLICATION_JSON_VALUE))) @Parameter( description = "This is the configuration", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)) final JsonRequest jsonRequest, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app136/SpringDocApp136Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app136/SpringDocApp136Test.java index eeceb5d61..422498e8c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app136/SpringDocApp136Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app136/SpringDocApp136Test.java @@ -52,7 +52,7 @@ /** * Tests deterministic creation of operationIds */ -@SpringBootTest(properties = { SPRINGDOC_CACHE_DISABLED + "=true", "springdoc.api-docs.version=openapi_3_0" }) +@SpringBootTest(properties = { SPRINGDOC_CACHE_DISABLED + "=true", "springdoc.api-docs.version=openapi_3_0" }) public class SpringDocApp136Test extends AbstractCommonTest { @Autowired diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app163/Examples.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app163/Examples.java index 915e5b11e..367d5373c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app163/Examples.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app163/Examples.java @@ -35,7 +35,6 @@ /** * This class contributes OpenAPI examples. - * * Each example is contributed through a bean typed as a map entry * (Map.Entry) and referenced through a constant by a resource * operation's @ApiResponse. diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app164/SampleResponseClass.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app164/SampleResponseClass.java index 5807b3e4f..b89d8bafa 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app164/SampleResponseClass.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app164/SampleResponseClass.java @@ -39,8 +39,8 @@ public class SampleResponseClass { private boolean booleanValueAsFourthParameter; - @ArraySchema( arraySchema = @Schema( description = "${blahDescription.value}" ), - schema = @Schema( description = "${blahDescription.value}" ) ) + @ArraySchema(arraySchema = @Schema(description = "${blahDescription.value}"), + schema = @Schema(description = "${blahDescription.value}")) private List listBlah; public List getListBlah() { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java index d07603bd3..f04d8e16d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java @@ -32,7 +32,7 @@ /** * In this test, it is checked that the error handler is displayed correctly in the documentation. * Exactly, that the local handler takes precedence over the global one - * */ + */ @TestPropertySource(properties = "springdoc.api-docs.resolve-schema-properties=true") public class SpringDocApp166Test extends AbstractSpringDocV30Test { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app183/SpringDocApp183Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app183/SpringDocApp183Test.java index fb5e98fdb..1d6d30ca3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app183/SpringDocApp183Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app183/SpringDocApp183Test.java @@ -46,7 +46,7 @@ record ObjectB(Integer bb, Integer bbb) {} class BToAConvertor implements Converter { @Override public ObjectA convert(ObjectB source) { - return new ObjectA(source.bb+"", source.bbb+""); + return new ObjectA(source.bb + "", source.bbb + ""); } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app198/Response.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app198/Response.java index feb9159be..74c51b168 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app198/Response.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app198/Response.java @@ -9,12 +9,6 @@ */ public class Response { - public Response(BigDecimal val1, BigDecimal val2, BigDecimal val3) { - this.val1 = val1; - this.val2 = val2; - this.val3 = val3; - } - @Schema(deprecated = true) @Deprecated private BigDecimal val1; @@ -23,6 +17,12 @@ public Response(BigDecimal val1, BigDecimal val2, BigDecimal val3) { private BigDecimal val3; + public Response(BigDecimal val1, BigDecimal val2, BigDecimal val3) { + this.val1 = val1; + this.val2 = val2; + this.val3 = val3; + } + public BigDecimal getVal1() { return val1; } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/CustomExceptionHandler.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/CustomExceptionHandler.java index 87d700197..886625b7c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/CustomExceptionHandler.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/CustomExceptionHandler.java @@ -10,14 +10,13 @@ @ControllerAdvice public class CustomExceptionHandler { - static public class MyInternalException extends Exception {} - - @ResponseStatus( value = INTERNAL_SERVER_ERROR ) - @ExceptionHandler( MyInternalException.class ) - @ResponseBody - public ErrorDto handleMyInternalException( final MyInternalException ex ) { - return new ErrorDto( ex.getMessage() ); - } + @ResponseStatus(value = INTERNAL_SERVER_ERROR) + @ExceptionHandler(MyInternalException.class) + @ResponseBody + public ErrorDto handleMyInternalException(final MyInternalException ex) { + return new ErrorDto(ex.getMessage()); + } + static public class MyInternalException extends Exception {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/ErrorDto.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/ErrorDto.java index 20b4a0e73..7cd5ba7af 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/ErrorDto.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/ErrorDto.java @@ -1,12 +1,17 @@ package test.org.springdoc.api.v30.app199; public class ErrorDto { - private String message; + private String message; - public ErrorDto( final String message ) { - this.message = message; - } + public ErrorDto(final String message) { + this.message = message; + } - public String getMessage() { return message; } - public void setMessage( final String message ) { this.message = message; } + public String getMessage() { + return message; + } + + public void setMessage(final String message) { + this.message = message; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/HelloController.java index f20f32e39..a2304bf49 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app199/HelloController.java @@ -48,57 +48,58 @@ public class HelloController { ObjectMapper defaultObjectMapper; @GetMapping( - value = "/first", - produces = APPLICATION_JSON_VALUE + value = "/first", + produces = APPLICATION_JSON_VALUE ) - public void first() throws MyInternalException {} + public void first() throws MyInternalException { + } @GetMapping( - value = "/second", - produces = APPLICATION_JSON_VALUE + value = "/second", + produces = APPLICATION_JSON_VALUE ) - public void second() throws MyInternalException {} + public void second() throws MyInternalException { + } @Bean - public OperationCustomizer operationCustomizer() - { - return ( Operation operation, HandlerMethod handlerMethod ) -> + public OperationCustomizer operationCustomizer() { + return (Operation operation, HandlerMethod handlerMethod) -> { final io.swagger.v3.oas.models.media.MediaType mediaType = operation - .getResponses() - .get( "500" ) - .getContent() - .get( ALL_VALUE ); + .getResponses() + .get("500") + .getContent() + .get(ALL_VALUE); - mediaType.setExamples( mediaType.getExamples() != null - ? mediaType.getExamples() - : new LinkedHashMap<>() ); + mediaType.setExamples(mediaType.getExamples() != null + ? mediaType.getExamples() + : new LinkedHashMap<>()); final Map examples = mediaType.getExamples(); - switch ( handlerMethod.getMethod().getName() ) { + switch (handlerMethod.getMethod().getName()) { - case "first" : + case "first": examples.put( - "First case example", - new Example().value( - defaultObjectMapper.valueToTree( - new ErrorDto( "An ErrorDto sample specific to /first endpoint" ) + "First case example", + new Example().value( + defaultObjectMapper.valueToTree( + new ErrorDto("An ErrorDto sample specific to /first endpoint") + ) ) - ) ); - break; + break; - case "second" : + case "second": examples.put( - "Second case example", - new Example().value( - defaultObjectMapper.valueToTree( - new ErrorDto( "An ErrorDto sample specific to /second endpoint" ) + "Second case example", + new Example().value( + defaultObjectMapper.valueToTree( + new ErrorDto("An ErrorDto sample specific to /second endpoint") + ) ) - ) ); - break; + break; } return operation; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app200/FooBar.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app200/FooBar.java index ac4bdbcb7..86b88a37f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app200/FooBar.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app200/FooBar.java @@ -13,16 +13,6 @@ public enum FooBar { this.value = value; } - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - @JsonCreator public static FooBar fromValue(String value) { for (FooBar b : FooBar.values()) { @@ -32,4 +22,14 @@ public static FooBar fromValue(String value) { } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app203/SpringDocApp203Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app203/SpringDocApp203Test.java index b6062a46b..32825e1cf 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app203/SpringDocApp203Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app203/SpringDocApp203Test.java @@ -39,14 +39,6 @@ @TestPropertySource(properties = { "springdoc.group-configs[0].group=mygroup", "springdoc.group-configs[0].paths-to-match=/test" }) public class SpringDocApp203Test extends AbstractSpringDocV30Test { - @SpringBootApplication - @Import({ - OrderDemo.Customizer1.class, - OrderDemo.Customizer2.class, - OrderDemo.Customizer3.class, - }) - static class SpringDocTestApp {} - @Test void testApp1() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL + "/mygroup")) @@ -54,4 +46,12 @@ void testApp1() throws Exception { .andExpect(jsonPath("$.openapi", is("3.0.1"))) .andExpect(content().json(getContent("results/3.0.1/app203.json"), true)); } + + @SpringBootApplication + @Import({ + OrderDemo.Customizer1.class, + OrderDemo.Customizer2.class, + OrderDemo.Customizer3.class, + }) + static class SpringDocTestApp {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/OrderDemo.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/OrderDemo.java index eb6713b51..e15d7119c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/OrderDemo.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/OrderDemo.java @@ -1,7 +1,7 @@ package test.org.springdoc.api.v30.app205; /** - * @author bnasslahsen + * */ import org.springframework.web.bind.annotation.GetMapping; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/SpringdocApp205Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/SpringdocApp205Test.java index 31af42af4..67f996bce 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/SpringdocApp205Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app205/SpringdocApp205Test.java @@ -1,7 +1,7 @@ package test.org.springdoc.api.v30.app205; /** - * @author bnasslahsen + * */ import test.org.springdoc.api.v30.AbstractSpringDocV30Test; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SuperController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SuperController.java index 284ac4876..c3dc5ee55 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SuperController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SuperController.java @@ -11,10 +11,10 @@ public abstract class SuperController> { - @GetMapping({"page/{current}/{size}", "page"}) - public List findPage(@PathVariable(required = false) Long current, - @PathVariable(required = false) Long size, - @RequestParam(required = false) T params) { - return new ArrayList<>(); - } + @GetMapping({ "page/{current}/{size}", "page" }) + public List findPage(@PathVariable(required = false) Long current, + @PathVariable(required = false) Long size, + @RequestParam(required = false) T params) { + return new ArrayList<>(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SysUserController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SysUserController.java index ab71579d5..6a0061255 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SysUserController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SysUserController.java @@ -10,5 +10,5 @@ @RequestMapping("/api/sysUser") public class SysUserController extends SuperController { - + } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app209/SpringDocApp209Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app209/SpringDocApp209Test.java index 49fcaf4ba..33ab603fb 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app209/SpringDocApp209Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app209/SpringDocApp209Test.java @@ -70,6 +70,23 @@ public class SpringDocApp209Test extends AbstractCommonTest { @Autowired private OpenAPIServiceMock openAPIService; + @Test + void shouldOnlyByCalledOnce() throws Exception { + // assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); + + className = getClass().getSimpleName(); + String testNumber = className.replaceAll("[^0-9]", ""); + MvcResult mockMvcResult = mockMvc + .perform(get(Constants.DEFAULT_API_DOCS_URL).header(HttpHeaders.ACCEPT_LANGUAGE, "ja")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.0.1"))).andReturn(); + String result = mockMvcResult.getResponse().getContentAsString(); + String expected = getContent("results/3.0.1/app" + testNumber + ".json"); + JSONAssert.assertEquals(expected, result, true); + + assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); + } + @SpringBootApplication static class SpringDocTestApp { @Bean("openAPIService") @@ -95,21 +112,4 @@ public int getNumberOfTimesCalculatePathWasCalled() { return numberOfTimesCalculatePathWasCalled; } } - - @Test - void shouldOnlyByCalledOnce() throws Exception { - // assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); - - className = getClass().getSimpleName(); - String testNumber = className.replaceAll("[^0-9]", ""); - MvcResult mockMvcResult = mockMvc - .perform(get(Constants.DEFAULT_API_DOCS_URL).header(HttpHeaders.ACCEPT_LANGUAGE, "ja")) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.0.1"))).andReturn(); - String result = mockMvcResult.getResponse().getContentAsString(); - String expected = getContent("results/3.0.1/app" + testNumber + ".json"); - JSONAssert.assertEquals(expected, result, true); - - assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); - } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app210/SpringDocApp210Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app210/SpringDocApp210Test.java index 2908290ad..026cab8a6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app210/SpringDocApp210Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app210/SpringDocApp210Test.java @@ -35,12 +35,12 @@ @SpringBootTest public class SpringDocApp210Test extends AbstractCommonTest { - + @Test - protected void testApp(){ + protected void testApp() { assertThrows(IllegalArgumentException.class, () -> GroupedOpenApi.builder().group("").build()); } - + @SpringBootApplication static class SpringDocTestApp {} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app211/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app211/HelloController.java index 7bb8fb903..f17bb4428 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app211/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app211/HelloController.java @@ -57,5 +57,6 @@ public String index() { } record PagedObject(long id, String name) {} + record Paging(int page, int total, int lastPage) {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/HelloController.java index 582d8a75a..616848693 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/HelloController.java @@ -31,7 +31,7 @@ public class HelloController { public PersonDTO persons1() { return new PersonDTO("John"); } - + @GetMapping(value = "/persons2") public PersonDTO persons2() { return new PersonDTO("John"); diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/SpringDocApp212Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/SpringDocApp212Test.java index 1a6f4a54b..2b755746b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/SpringDocApp212Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app212/SpringDocApp212Test.java @@ -39,28 +39,28 @@ @ActiveProfiles("212") public class SpringDocApp212Test extends AbstractSpringDocV30Test { - /** - * The type Spring doc test app. - */ - @SpringBootApplication - static class SpringDocTestApp { + @Test + void getGroupedOpenapi_shouldCustomizeFromPropertiesWithGroupNamePrefix() throws Exception { + String result = mockMvc.perform(get("/v3/api-docs/apiGroupName")) + .andExpect(status().isOk()) + .andReturn().getResponse().getContentAsString(); + String expected = getContent("results/3.0.1/app212-grouped.json"); + assertEquals(expected, result, true); + } - @Bean - GroupedOpenApi apiGroupBeanName() { - return GroupedOpenApi.builder() - .group("apiGroupName") - .packagesToScan("test.org.springdoc.api.v30.app212") - .build(); - } - } + /** + * The type Spring doc test app. + */ + @SpringBootApplication + static class SpringDocTestApp { - @Test - void getGroupedOpenapi_shouldCustomizeFromPropertiesWithGroupNamePrefix() throws Exception { - String result = mockMvc.perform(get("/v3/api-docs/apiGroupName")) - .andExpect(status().isOk()) - .andReturn().getResponse().getContentAsString(); - String expected = getContent("results/3.0.1/app212-grouped.json"); - assertEquals(expected, result, true); - } + @Bean + GroupedOpenApi apiGroupBeanName() { + return GroupedOpenApi.builder() + .group("apiGroupName") + .packagesToScan("test.org.springdoc.api.v30.app212") + .build(); + } + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/HelloController.java index ab400dfc8..d53d53c19 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/HelloController.java @@ -58,7 +58,7 @@ public class HelloController { value = "${api.extensions.properties.uri}/testcontroller/getTest"), @ExtensionProperty(name = "passthroughBehavior", value = "${api.extensions.properties.passthroughBehavior}"), @ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}") }) }) - + public PersonDTO queryMyDto() { // This return a PageImpl with the data, the method parameter 'query' is a pojo containg filter properties return null; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/PersonDTO.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/PersonDTO.java index d6a15a849..53aadccb0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/PersonDTO.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app213/PersonDTO.java @@ -47,9 +47,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app214/SpringDocApp214Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app214/SpringDocApp214Test.java index dc78d90b6..0fca6af72 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app214/SpringDocApp214Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app214/SpringDocApp214Test.java @@ -49,13 +49,13 @@ public class SpringDocApp214Test extends AbstractCommonTest { @Autowired private SpringDocConfigProperties springDocConfigProperties; - - @SpringBootApplication - static class SpringDocTestApp {} @Test protected void testApp() throws Exception { assertEquals(4, springDocConfigProperties.getGroupConfigs().stream().map(GroupConfig::getGroup).toList().size()); } + @SpringBootApplication + static class SpringDocTestApp {} + } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215Test.java index 9a557b7a2..4b3afc615 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215Test.java @@ -30,15 +30,15 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=false") +@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=false") public class SpringDocApp215Test extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc" }) - static class SpringDocTestApp {} - @Test void test_disable_default_api_docs() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isNotFound()); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215bisTest.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215bisTest.java index ca3266181..bca4e230f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215bisTest.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app215/SpringDocApp215bisTest.java @@ -30,15 +30,15 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=true") +@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=true") public class SpringDocApp215bisTest extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v30.app214" }) - static class SpringDocTestApp {} - @Test void test_enable_default_api_docs() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v30.app214" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app216/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app216/HelloController.java index fbb0d54ef..7450e63ba 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app216/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app216/HelloController.java @@ -23,7 +23,6 @@ package test.org.springdoc.api.v30.app216; - import io.swagger.v3.oas.annotations.Operation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/HelloController.java index 057e6d589..6862e1c91 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/HelloController.java @@ -24,9 +24,9 @@ @RestController public class HelloController { - @GetMapping(value = "/persons") - public PersonDTO persons() { - return new PersonDTO("John"); - } + @GetMapping(value = "/persons") + public PersonDTO persons() { + return new PersonDTO("John"); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/SpringDocApp217Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/SpringDocApp217Test.java index c0693a87a..5a9ea21b2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/SpringDocApp217Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app217/SpringDocApp217Test.java @@ -40,8 +40,8 @@ @SpringBootTest @ActiveProfiles("217") public class SpringDocApp217Test extends AbstractSpringDocV30Test { - - + + @Test void testApp1() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL + "/demo")) @@ -57,7 +57,7 @@ void testApp2() throws Exception { .andExpect(jsonPath("$.openapi", is("3.0.1"))) .andExpect(content().json(getContent("results/3.0.1/app217-2.json"), true)); } - + @SpringBootApplication static class SpringDocTestApp {} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app218/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app218/HelloController.java index e753b54f0..5e33fe80f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app218/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app218/HelloController.java @@ -40,25 +40,25 @@ @RequestMapping("/") public class HelloController { - @Operation( - summary = "Summary", - description = "This is description.", - tags = {"Sample"}, - responses = { - @ApiResponse( - responseCode = "201", - description = "201 (Created)", - headers = - @Header( - name = HttpHeaders.LOCATION, - description = "Sample endpoint", - schema = @Schema(implementation = URI.class) - ) - ) - } - ) - @GetMapping - public String get() { - return "Hello World!"; - } + @Operation( + summary = "Summary", + description = "This is description.", + tags = { "Sample" }, + responses = { + @ApiResponse( + responseCode = "201", + description = "201 (Created)", + headers = + @Header( + name = HttpHeaders.LOCATION, + description = "Sample endpoint", + schema = @Schema(implementation = URI.class) + ) + ) + } + ) + @GetMapping + public String get() { + return "Hello World!"; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app219/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app219/HelloController.java index c8d6e3438..53ea4cb35 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app219/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app219/HelloController.java @@ -36,7 +36,22 @@ public class HelloController { @RequestMapping(value = "/testpost", method = RequestMethod.POST, produces = {"application/json"}, consumes = {"application/json;charset=UTF-8", "application/json; charset=UTF-8"}) - public ResponseEntity testpost(@RequestBody TestObject dto) { + public ResponseEntity postWithProducesAndConsumes(@RequestBody TestObject dto) { + return ResponseEntity.ok(dto); + } + + @RequestMapping(value = "/testpost2", method = RequestMethod.POST, consumes = {"application/json;charset=UTF-8"}) + public ResponseEntity postWithConsumes(@RequestBody TestObject dto) { + return ResponseEntity.ok(dto); + } + + @RequestMapping(value = "/testpost3", method = RequestMethod.POST, produces = {"application/json"}) + public ResponseEntity postWithProduces(@RequestBody TestObject dto) { + return ResponseEntity.ok(dto); + } + + @RequestMapping(value = "/testpost4", method = RequestMethod.POST) + public ResponseEntity post(@RequestBody TestObject dto) { return ResponseEntity.ok(dto); } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app220/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app220/HelloController.java index f5b17bc2b..6628c7b6d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app220/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app220/HelloController.java @@ -12,12 +12,12 @@ @RestController public class HelloController { - - @PostMapping("/parent") - public void parentEndpoint(@RequestBody Superclass parent) { - - } - + + @PostMapping("/parent") + public void parentEndpoint(@RequestBody Superclass parent) { + + } + } @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "@type") @@ -26,7 +26,8 @@ public void parentEndpoint(@RequestBody Superclass parent) { }) sealed class Superclass permits IntermediateClass { - public Superclass() {} + public Superclass() { + } } @Schema(name = IntermediateClass.SCHEMA_NAME) diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeApi.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeApi.java index 40506c3da..67b55994b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeApi.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeApi.java @@ -17,7 +17,7 @@ @RequestMapping("api/hello") public interface HomeApi { - @Operation(summary = "Upload new content", description = "Upload test content") - @PostMapping(produces = APPLICATION_JSON_VALUE, consumes = MULTIPART_FORM_DATA_VALUE) - HelloDto uploadContent(HelloUploadDto contentUploadDto) throws IOException; + @Operation(summary = "Upload new content", description = "Upload test content") + @PostMapping(produces = APPLICATION_JSON_VALUE, consumes = MULTIPART_FORM_DATA_VALUE) + HelloDto uploadContent(HelloUploadDto contentUploadDto) throws IOException; } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeController.java index 3c4115e94..a21fdacb9 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app221/HomeController.java @@ -10,15 +10,15 @@ @RestController public class HomeController implements HomeApi { - - @Override - public HelloDto uploadContent(@Valid HelloUploadDto uploadDto) - throws IOException { - var fileBytes = uploadDto.file.getBytes(); - return new HelloDto(uploadDto.title, fileBytes); - } - public record HelloDto(String title, byte[] file) {} + @Override + public HelloDto uploadContent(@Valid HelloUploadDto uploadDto) + throws IOException { + var fileBytes = uploadDto.file.getBytes(); + return new HelloDto(uploadDto.title, fileBytes); + } - public record HelloUploadDto(@NotNull String title, MultipartFile file) {} + public record HelloDto(String title, byte[] file) {} + + public record HelloUploadDto(@NotNull String title, MultipartFile file) {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/HelloController.java index 0415f7911..308aa4205 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/HelloController.java @@ -1,7 +1,6 @@ package test.org.springdoc.api.v30.app222; - import test.org.springdoc.api.v30.app222.SpringDocApp222Test.FirstHierarchyUser; import test.org.springdoc.api.v30.app222.SpringDocApp222Test.SecondHierarchyUser; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/SpringDocApp222Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/SpringDocApp222Test.java index 1cab9fbe9..33469fb77 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/SpringDocApp222Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app222/SpringDocApp222Test.java @@ -34,9 +34,6 @@ public class SpringDocApp222Test extends AbstractSpringDocV30Test { - @SpringBootApplication - static class SpringDocTestApp {} - @JsonTypeInfo(use = Id.NAME, property = "@type") @JsonSubTypes(@Type(CommonImplementor.class)) interface FirstHierarchy {} @@ -45,11 +42,15 @@ interface FirstHierarchy {} @JsonSubTypes(@Type(CommonImplementor.class)) interface SecondHierarchy {} - class CommonImplementor implements FirstHierarchy, SecondHierarchy {} + @SpringBootApplication + static class SpringDocTestApp {} - record CommonImplementorUser(FirstHierarchy firstHierarchy, SecondHierarchy secondHierarchy) {} + record CommonImplementorUser(FirstHierarchy firstHierarchy, + SecondHierarchy secondHierarchy) {} record FirstHierarchyUser(FirstHierarchy firstHierarchy) {} record SecondHierarchyUser(SecondHierarchy secondHierarchy) {} + + class CommonImplementor implements FirstHierarchy, SecondHierarchy {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/ARestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/ARestController.java index 8c672eb38..f49e34097 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/ARestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/ARestController.java @@ -11,13 +11,13 @@ @RestController public class ARestController { - @PostMapping("/parent") - public Response parentEndpoint(@RequestBody AbstractParent parent) { - return null; - } + @PostMapping("/parent") + public Response parentEndpoint(@RequestBody AbstractParent parent) { + return null; + } - @PostMapping("/child") - public Response childEndpoint(@RequestBody AbstractChild child) { - return null; - } + @PostMapping("/child") + public Response childEndpoint(@RequestBody AbstractChild child) { + return null; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractChild.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractChild.java index de53786c3..5ec3c4f20 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractChild.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractChild.java @@ -26,7 +26,7 @@ public void setId(int id) { } } - class ChildType1 extends AbstractChild { +class ChildType1 extends AbstractChild { private String childType1Param; public ChildType1(int id, String childType1Param) { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractParent.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractParent.java index 73795f768..76e1ba8cc 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractParent.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app223/apiobjects/AbstractParent.java @@ -29,6 +29,7 @@ public void setId(int id) { class ParentType1 extends AbstractParent { private String parentType1Param; + private AbstractChild abstractChild; public ParentType1(int id, String parentType1Param, AbstractChild abstractChild) { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/RootModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/RootModel.java index 5a18b69f4..a36daa6d6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/RootModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/RootModel.java @@ -4,24 +4,24 @@ public class RootModel { - private Integer rootProperty; + private Integer rootProperty; - @JsonUnwrapped - private UnwrappedModel unwrappedModel; + @JsonUnwrapped + private UnwrappedModel unwrappedModel; - public Integer getRootProperty() { - return rootProperty; - } + public Integer getRootProperty() { + return rootProperty; + } - public void setRootProperty(Integer rootProperty) { - this.rootProperty = rootProperty; - } + public void setRootProperty(Integer rootProperty) { + this.rootProperty = rootProperty; + } - public UnwrappedModel getUnwrappedModel() { - return unwrappedModel; - } + public UnwrappedModel getUnwrappedModel() { + return unwrappedModel; + } - public void setUnwrappedModel(UnwrappedModel unwrappedModel) { - this.unwrappedModel = unwrappedModel; - } + public void setUnwrappedModel(UnwrappedModel unwrappedModel) { + this.unwrappedModel = unwrappedModel; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/TestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/TestController.java index e69c8e01d..e00a906a0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/TestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/TestController.java @@ -8,8 +8,8 @@ @RequestMapping("/api") public class TestController { - @GetMapping - public RootModel getRootModel() { - return new RootModel(); - } + @GetMapping + public RootModel getRootModel() { + return new RootModel(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/UnwrappedModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/UnwrappedModel.java index 3de72ae51..4241e7b46 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/UnwrappedModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app224/UnwrappedModel.java @@ -2,13 +2,13 @@ public class UnwrappedModel { - private Integer unwrappedProperty; + private Integer unwrappedProperty; - public Integer getUnwrappedProperty() { - return unwrappedProperty; - } + public Integer getUnwrappedProperty() { + return unwrappedProperty; + } - public void setUnwrappedProperty(Integer unwrappedProperty) { - this.unwrappedProperty = unwrappedProperty; - } + public void setUnwrappedProperty(Integer unwrappedProperty) { + this.unwrappedProperty = unwrappedProperty; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app225/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app225/HelloController.java index ac2b7b0af..879cb746f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app225/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app225/HelloController.java @@ -21,7 +21,7 @@ public void HelloController(@ParameterObject RequestDto requestDto) { } @JsonNaming(PropertyNamingStrategies.UpperSnakeCaseStrategy.class) - class RequestDto { +class RequestDto { private String personalNumber; public String getPersonalNumber() { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app226/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app226/HelloController.java index 2d71cbb37..58d6817fe 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app226/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app226/HelloController.java @@ -28,7 +28,7 @@ public class HelloController { examples = @ExampleObject( name = "success", - value ="...")) + value = "...")) } ) public Map HelloController() { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/model/Item.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/model/Item.java index fc55e60f0..a2b93fbf0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/model/Item.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/model/Item.java @@ -5,10 +5,10 @@ */ public record Item(String id, String type, T resource) { - /** - * Create Item object - */ - public static Item fromPayload(String id, String type, T payload) { - return new Item<>(id, type, payload); - } + /** + * Create Item object + */ + public static Item fromPayload(String id, String type, T payload) { + return new Item<>(id, type, payload); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/NoGenericWrapper.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/NoGenericWrapper.java index ba32477dc..77483b6ae 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/NoGenericWrapper.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/NoGenericWrapper.java @@ -6,7 +6,7 @@ import org.springframework.http.HttpStatusCode; public class NoGenericWrapper extends ResponseEntityWrapper { - public NoGenericWrapper(Item body, HttpStatusCode status) { - super(body, status); - } + public NoGenericWrapper(Item body, HttpStatusCode status) { + super(body, status); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/ResponseEntityWrapper.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/ResponseEntityWrapper.java index 0c8efb548..cca45a4e2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/ResponseEntityWrapper.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/ResponseEntityWrapper.java @@ -7,7 +7,7 @@ import org.springframework.http.ResponseEntity; public class ResponseEntityWrapper extends ResponseEntity> { - public ResponseEntityWrapper(Item body, HttpStatusCode status) { - super(body, status); - } + public ResponseEntityWrapper(Item body, HttpStatusCode status) { + super(body, status); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app228/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app228/HelloController.java index b19e30d3e..8db9e0570 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app228/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app228/HelloController.java @@ -23,7 +23,7 @@ public String swaggerTest(@RequestBody MyRequest myRequest) { } public class MyRequest { - @Schema(oneOf = {Child1.class, Child2.class}) + @Schema(oneOf = { Child1.class, Child2.class }) @JsonProperty private Parent parent; } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/LocaleParam.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/LocaleParam.java index ad3b8d826..eef078411 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/LocaleParam.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/LocaleParam.java @@ -44,7 +44,7 @@ /** * @author bnasslahsen */ -@Target({PARAMETER, METHOD, FIELD, ANNOTATION_TYPE}) +@Target({ PARAMETER, METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) @Parameter( examples = { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/SpringDocApp229Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/SpringDocApp229Test.java index c252428bb..526cd7e21 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/SpringDocApp229Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app229/SpringDocApp229Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app229; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/App230RequestBody.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/App230RequestBody.java index a275a0a7b..2ce05d131 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/App230RequestBody.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/App230RequestBody.java @@ -13,9 +13,9 @@ /** * @author edudar */ -@Target({PARAMETER, METHOD, ANNOTATION_TYPE}) +@Target({ PARAMETER, METHOD, ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) @RequestBody(required = true) @interface App230RequestBody { - + } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/SpringDocApp230Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/SpringDocApp230Test.java index 981e3e664..95e2ab528 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/SpringDocApp230Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app230/SpringDocApp230Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app230; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/ApplicationsRestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/ApplicationsRestController.java index 11afc6089..36a3d9a3a 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/ApplicationsRestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/ApplicationsRestController.java @@ -14,12 +14,12 @@ @RequestMapping(value = "/applications", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public class ApplicationsRestController { - @Operation(summary = "Parameter object") - @PostMapping("/parameter-object") - public Application createWithParameterObject( - @RequestBody @ParameterObject SubClass request - ) { - return new Application(); - } + @Operation(summary = "Parameter object") + @PostMapping("/parameter-object") + public Application createWithParameterObject( + @RequestBody @ParameterObject SubClass request + ) { + return new Application(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SpringDocApp231Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SpringDocApp231Test.java index 05bdd1c28..28e1e98ac 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SpringDocApp231Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SpringDocApp231Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app231; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SubClass.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SubClass.java index c37a37f26..3d3288877 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SubClass.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SubClass.java @@ -5,13 +5,13 @@ @Schema(description = "Used to create a new application") public class SubClass extends SuperClass { - public SubClass(String name) { - super(name); - } + public SubClass(String name) { + super(name); + } - @Override - @Schema(description = "Overriding the description in sub class") - public String getName() { - return super.getName(); - } + @Override + @Schema(description = "Overriding the description in sub class") + public String getName() { + return super.getName(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SuperClass.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SuperClass.java index 586435cb8..a51ad8c64 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SuperClass.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app231/SuperClass.java @@ -4,15 +4,15 @@ import jakarta.validation.constraints.Size; public class SuperClass { - @Size(min = 1, max = 30) - @Schema(description = "Description from the super class") - private String name; + @Size(min = 1, max = 30) + @Schema(description = "Description from the super class") + private String name; - public SuperClass(String name) { - this.name = name; - } + public SuperClass(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app232/SpringDocApp232Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app232/SpringDocApp232Test.java index 0028c1d92..938d3e9aa 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app232/SpringDocApp232Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app232/SpringDocApp232Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app232; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/ParameterController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/ParameterController.java index c891b3a90..166c16aa7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/ParameterController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/ParameterController.java @@ -38,58 +38,58 @@ @RestController public class ParameterController { - @GetMapping("/hidden-parent") - public void nestedParameterObjectWithHiddenParentField(@ParameterObject ParameterObjectWithHiddenField parameters) { + @GetMapping("/hidden-parent") + public void nestedParameterObjectWithHiddenParentField(@ParameterObject ParameterObjectWithHiddenField parameters) { - } + } - public record ParameterObjectWithHiddenField( - @Schema(hidden = true) NestedParameterObject schemaHiddenNestedParameterObject, - @Parameter(hidden = true) NestedParameterObject parameterHiddenNestedParameterObject, - NestedParameterObject visibleNestedParameterObject - ) { + @GetMapping("/renamed-parent") + public void nestedParameterObjectWithRenamedParentField(@ParameterObject ParameterObjectWithRenamedField parameters) { - } + } - public record NestedParameterObject( - String parameterField) { - } + @GetMapping("/optional-parent") + public void nestedParameterObjectWithOptionalParentField(@Valid @ParameterObject MultiFieldParameterObject parameters) { - @GetMapping("/renamed-parent") - public void nestedParameterObjectWithRenamedParentField(@ParameterObject ParameterObjectWithRenamedField parameters) { + } - } + public record ParameterObjectWithHiddenField( + @Schema(hidden = true) NestedParameterObject schemaHiddenNestedParameterObject, + @Parameter(hidden = true) NestedParameterObject parameterHiddenNestedParameterObject, + NestedParameterObject visibleNestedParameterObject + ) { - public record ParameterObjectWithRenamedField( - @Schema(name = "schemaRenamed") NestedParameterObject schemaRenamedNestedParameterObject, - @Parameter(name = "parameterRenamed") NestedParameterObject parameterRenamedNestedParameterObject, - NestedParameterObject originalNameNestedParameterObject - ) { + } - } + public record NestedParameterObject( + String parameterField) { + } - @GetMapping("/optional-parent") - public void nestedParameterObjectWithOptionalParentField(@Valid @ParameterObject MultiFieldParameterObject parameters) { + public record ParameterObjectWithRenamedField( + @Schema(name = "schemaRenamed") NestedParameterObject schemaRenamedNestedParameterObject, + @Parameter(name = "parameterRenamed") NestedParameterObject parameterRenamedNestedParameterObject, + NestedParameterObject originalNameNestedParameterObject + ) { - } + } - public record MultiFieldParameterObject( - @Valid @Schema(requiredMode = RequiredMode.REQUIRED) @NotNull MultiFieldNestedParameterObject requiredNotNullParameterObject, - @Valid @Schema(requiredMode = RequiredMode.REQUIRED) MultiFieldNestedParameterObject requiredNoValidationParameterObject, - @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull MultiFieldNestedParameterObject notRequiredNotNullParameterObject, - @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) MultiFieldNestedParameterObject notRequiredNoValidationParameterObject, - @Valid @NotNull MultiFieldNestedParameterObject noSchemaNotNullParameterObject, - @Valid MultiFieldNestedParameterObject noSchemaNoValidationParameterObject) { + public record MultiFieldParameterObject( + @Valid @Schema(requiredMode = RequiredMode.REQUIRED) @NotNull MultiFieldNestedParameterObject requiredNotNullParameterObject, + @Valid @Schema(requiredMode = RequiredMode.REQUIRED) MultiFieldNestedParameterObject requiredNoValidationParameterObject, + @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull MultiFieldNestedParameterObject notRequiredNotNullParameterObject, + @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) MultiFieldNestedParameterObject notRequiredNoValidationParameterObject, + @Valid @NotNull MultiFieldNestedParameterObject noSchemaNotNullParameterObject, + @Valid MultiFieldNestedParameterObject noSchemaNoValidationParameterObject) { - } + } - public record MultiFieldNestedParameterObject ( - @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @NotNull String requiredNotNullField, - @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String requiredNoValidationField, - @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull String notRequiredNotNullField, - @Schema(requiredMode = RequiredMode.NOT_REQUIRED) String notRequiredNoValidationField, - @NotNull String noSchemaNotNullField, - String noSchemaNoValidationField) { - } + public record MultiFieldNestedParameterObject( + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @NotNull String requiredNotNullField, + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String requiredNoValidationField, + @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull String notRequiredNotNullField, + @Schema(requiredMode = RequiredMode.NOT_REQUIRED) String notRequiredNoValidationField, + @NotNull String noSchemaNotNullField, + String noSchemaNoValidationField) { + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/SpringDocApp233Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/SpringDocApp233Test.java index 582cc60ca..e899c674e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/SpringDocApp233Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app233/SpringDocApp233Test.java @@ -57,130 +57,130 @@ */ class SpringDocApp233Test extends AbstractSpringDocV30Test { - @CsvSource({"requiredNotNullParameterObject.requiredNotNullField, true", - "requiredNotNullParameterObject.requiredNoValidationField, true", - "requiredNotNullParameterObject.notRequiredNotNullField, false", - "requiredNotNullParameterObject.notRequiredNoValidationField, false", - "requiredNotNullParameterObject.noSchemaNotNullField, true", - "requiredNotNullParameterObject.noSchemaNoValidationField, false", - "requiredNoValidationParameterObject.requiredNotNullField, true", - "requiredNoValidationParameterObject.requiredNoValidationField, true", - "requiredNoValidationParameterObject.notRequiredNotNullField, false", - "requiredNoValidationParameterObject.notRequiredNoValidationField, false", - "requiredNoValidationParameterObject.noSchemaNotNullField, true", - "requiredNoValidationParameterObject.noSchemaNoValidationField, false", - "notRequiredNotNullParameterObject.requiredNotNullField, true", - "notRequiredNotNullParameterObject.requiredNoValidationField, true", - "notRequiredNotNullParameterObject.notRequiredNotNullField, false", - "notRequiredNotNullParameterObject.notRequiredNoValidationField, false", - "notRequiredNotNullParameterObject.noSchemaNotNullField, false", - "notRequiredNotNullParameterObject.noSchemaNoValidationField, false", - "notRequiredNoValidationParameterObject.requiredNotNullField, true", - "notRequiredNoValidationParameterObject.requiredNoValidationField, true", - "notRequiredNoValidationParameterObject.notRequiredNotNullField, false", - "notRequiredNoValidationParameterObject.notRequiredNoValidationField, false", - "notRequiredNoValidationParameterObject.noSchemaNotNullField, false", - "notRequiredNoValidationParameterObject.noSchemaNoValidationField, false", - "noSchemaNotNullParameterObject.requiredNotNullField, true", - "noSchemaNotNullParameterObject.requiredNoValidationField, true", - "noSchemaNotNullParameterObject.notRequiredNotNullField, false", - "noSchemaNotNullParameterObject.notRequiredNoValidationField, false", - "noSchemaNotNullParameterObject.noSchemaNotNullField, true", - "noSchemaNotNullParameterObject.noSchemaNoValidationField, false", - "noSchemaNoValidationParameterObject.requiredNotNullField, true", - "noSchemaNoValidationParameterObject.requiredNoValidationField, true", - "noSchemaNoValidationParameterObject.notRequiredNotNullField, false", - "noSchemaNoValidationParameterObject.notRequiredNoValidationField, false", - "noSchemaNoValidationParameterObject.noSchemaNotNullField, false", - "noSchemaNoValidationParameterObject.noSchemaNoValidationField, false"}) - @ParameterizedTest - void shouldHaveCorrectRequireStatus(String field, String required) throws Exception { - MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); - String result = mockMvcResult.getResponse().getContentAsString(); - - String requiredMode = ((JSONArray) JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.name == '" + field + "')].required")).get(0).toString(); - assertThat(requiredMode).isEqualTo(required); - } - - @Test - void shouldMatchSwaggerFieldRequirementsMatchJavaValidation() throws Exception { - MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); - String result = mockMvcResult.getResponse().getContentAsString(); - - JSONArray allFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[*].name"); - List allFields = allFieldsJsonArray.stream().map(Object::toString).toList(); - - // check we get no validation failures when all mandatory fields are present - verifySwaggerFieldRequirementsMatchJavaValidation(allFields, List.of()); - - JSONArray mandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == true)].name"); - List mandatoryFields = mandatoryFieldsJsonArray.stream().map(Object::toString).toList(); - - // check validation failures when each individual mandatory field is missing - for (String mandatoryField : mandatoryFields) { - List filteredFields = allFields.stream() - .filter(field -> !field.equals(mandatoryField)) - .toList(); - - List expectedErrors = Stream.of(mandatoryField) - // Fields using Swagger annotations to drive required status but not using Java validation to enforce it so don't cause validation errors - .filter(field -> !field.endsWith("requiredNullableField")) - .filter(field -> !field.endsWith("requiredNoValidationField")) - // the error is returned prefixed with the query parameter name, so add it to the expected error message - .map(field -> "multiFieldParameterObject." + field) - .toList(); - verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); - } - - - JSONArray nonMandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == false)].name"); - List nonMandatoryFields = nonMandatoryFieldsJsonArray.stream().map(Object::toString).toList(); - - // check validation failures for any individual non-mandatory fields being missed - for (String nonMandatoryField : nonMandatoryFields) { - List filteredFields = allFields.stream() - .filter(field -> !field.equals(nonMandatoryField)) - .toList(); - - List expectedErrors = Stream.of(nonMandatoryField) - // Fields that are mandatory but either have nullable parent fields so are excluded in swagger or are marked as not required so do cause validation errors - .filter(field -> field.endsWith("NotNullField")) - // the error is returned prefixed with the query parameter name, so add it to the expected error message - .map(field -> "multiFieldParameterObject." + field) - .toList(); - verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); - } - } - - private void verifySwaggerFieldRequirementsMatchJavaValidation(Collection requestFields, Collection expectedErrorFields) throws Exception { - MockHttpServletRequestBuilder request = get("/optional-parent"); - for (String mandatoryField : requestFields) { - request.queryParam(mandatoryField, mandatoryField + ".value"); - } - - mockMvc.perform(request) - .andExpect(result -> { - - Set errorFields = Optional.ofNullable(result.getResolvedException()) - .map(MethodArgumentNotValidException.class::cast) - .map(MethodArgumentNotValidException::getBindingResult) - .map(BindingResult::getFieldErrors) - .stream() - .flatMap(Collection::stream) - .map(field -> field.getObjectName() + "." + field.getField()) - .collect(Collectors.toCollection(LinkedHashSet::new)); - - - assertThat(errorFields).containsExactlyElementsOf(expectedErrorFields); - - assertThat(result.getResponse().getStatus()).isEqualTo(expectedErrorFields.isEmpty() ? 200 : 400); - }); - } - - - @SpringBootApplication - static class SpringDocTestApp { - - } + @CsvSource({ "requiredNotNullParameterObject.requiredNotNullField, true", + "requiredNotNullParameterObject.requiredNoValidationField, true", + "requiredNotNullParameterObject.notRequiredNotNullField, false", + "requiredNotNullParameterObject.notRequiredNoValidationField, false", + "requiredNotNullParameterObject.noSchemaNotNullField, true", + "requiredNotNullParameterObject.noSchemaNoValidationField, false", + "requiredNoValidationParameterObject.requiredNotNullField, true", + "requiredNoValidationParameterObject.requiredNoValidationField, true", + "requiredNoValidationParameterObject.notRequiredNotNullField, false", + "requiredNoValidationParameterObject.notRequiredNoValidationField, false", + "requiredNoValidationParameterObject.noSchemaNotNullField, true", + "requiredNoValidationParameterObject.noSchemaNoValidationField, false", + "notRequiredNotNullParameterObject.requiredNotNullField, true", + "notRequiredNotNullParameterObject.requiredNoValidationField, true", + "notRequiredNotNullParameterObject.notRequiredNotNullField, false", + "notRequiredNotNullParameterObject.notRequiredNoValidationField, false", + "notRequiredNotNullParameterObject.noSchemaNotNullField, false", + "notRequiredNotNullParameterObject.noSchemaNoValidationField, false", + "notRequiredNoValidationParameterObject.requiredNotNullField, true", + "notRequiredNoValidationParameterObject.requiredNoValidationField, true", + "notRequiredNoValidationParameterObject.notRequiredNotNullField, false", + "notRequiredNoValidationParameterObject.notRequiredNoValidationField, false", + "notRequiredNoValidationParameterObject.noSchemaNotNullField, false", + "notRequiredNoValidationParameterObject.noSchemaNoValidationField, false", + "noSchemaNotNullParameterObject.requiredNotNullField, true", + "noSchemaNotNullParameterObject.requiredNoValidationField, true", + "noSchemaNotNullParameterObject.notRequiredNotNullField, false", + "noSchemaNotNullParameterObject.notRequiredNoValidationField, false", + "noSchemaNotNullParameterObject.noSchemaNotNullField, true", + "noSchemaNotNullParameterObject.noSchemaNoValidationField, false", + "noSchemaNoValidationParameterObject.requiredNotNullField, true", + "noSchemaNoValidationParameterObject.requiredNoValidationField, true", + "noSchemaNoValidationParameterObject.notRequiredNotNullField, false", + "noSchemaNoValidationParameterObject.notRequiredNoValidationField, false", + "noSchemaNoValidationParameterObject.noSchemaNotNullField, false", + "noSchemaNoValidationParameterObject.noSchemaNoValidationField, false" }) + @ParameterizedTest + void shouldHaveCorrectRequireStatus(String field, String required) throws Exception { + MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); + String result = mockMvcResult.getResponse().getContentAsString(); + + String requiredMode = ((JSONArray) JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.name == '" + field + "')].required")).get(0).toString(); + assertThat(requiredMode).isEqualTo(required); + } + + @Test + void shouldMatchSwaggerFieldRequirementsMatchJavaValidation() throws Exception { + MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); + String result = mockMvcResult.getResponse().getContentAsString(); + + JSONArray allFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[*].name"); + List allFields = allFieldsJsonArray.stream().map(Object::toString).toList(); + + // check we get no validation failures when all mandatory fields are present + verifySwaggerFieldRequirementsMatchJavaValidation(allFields, List.of()); + + JSONArray mandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == true)].name"); + List mandatoryFields = mandatoryFieldsJsonArray.stream().map(Object::toString).toList(); + + // check validation failures when each individual mandatory field is missing + for (String mandatoryField : mandatoryFields) { + List filteredFields = allFields.stream() + .filter(field -> !field.equals(mandatoryField)) + .toList(); + + List expectedErrors = Stream.of(mandatoryField) + // Fields using Swagger annotations to drive required status but not using Java validation to enforce it so don't cause validation errors + .filter(field -> !field.endsWith("requiredNullableField")) + .filter(field -> !field.endsWith("requiredNoValidationField")) + // the error is returned prefixed with the query parameter name, so add it to the expected error message + .map(field -> "multiFieldParameterObject." + field) + .toList(); + verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); + } + + + JSONArray nonMandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == false)].name"); + List nonMandatoryFields = nonMandatoryFieldsJsonArray.stream().map(Object::toString).toList(); + + // check validation failures for any individual non-mandatory fields being missed + for (String nonMandatoryField : nonMandatoryFields) { + List filteredFields = allFields.stream() + .filter(field -> !field.equals(nonMandatoryField)) + .toList(); + + List expectedErrors = Stream.of(nonMandatoryField) + // Fields that are mandatory but either have nullable parent fields so are excluded in swagger or are marked as not required so do cause validation errors + .filter(field -> field.endsWith("NotNullField")) + // the error is returned prefixed with the query parameter name, so add it to the expected error message + .map(field -> "multiFieldParameterObject." + field) + .toList(); + verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); + } + } + + private void verifySwaggerFieldRequirementsMatchJavaValidation(Collection requestFields, Collection expectedErrorFields) throws Exception { + MockHttpServletRequestBuilder request = get("/optional-parent"); + for (String mandatoryField : requestFields) { + request.queryParam(mandatoryField, mandatoryField + ".value"); + } + + mockMvc.perform(request) + .andExpect(result -> { + + Set errorFields = Optional.ofNullable(result.getResolvedException()) + .map(MethodArgumentNotValidException.class::cast) + .map(MethodArgumentNotValidException::getBindingResult) + .map(BindingResult::getFieldErrors) + .stream() + .flatMap(Collection::stream) + .map(field -> field.getObjectName() + "." + field.getField()) + .collect(Collectors.toCollection(LinkedHashSet::new)); + + + assertThat(errorFields).containsExactlyElementsOf(expectedErrorFields); + + assertThat(result.getResponse().getStatus()).isEqualTo(expectedErrorFields.isEmpty() ? 200 : 400); + }); + } + + + @SpringBootApplication + static class SpringDocTestApp { + + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app234/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app234/HelloController.java index ee7d689b2..9c47a53fc 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app234/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app234/HelloController.java @@ -32,7 +32,7 @@ @RestController public class HelloController { - + @GetMapping("/test") String test(MyObj obj) { return obj.getContent(); diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/MyDebugController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/MyDebugController.java index 0a1d37338..1d429f49a 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/MyDebugController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/MyDebugController.java @@ -51,7 +51,7 @@ public ResponseEntity getWildcard(String wildcard) { // THIS ONE IS MISSING @PostMapping(value = "/debug/{*wildcard}") - public ResponseEntity postWildcard(String wildcard) { + public ResponseEntity postWildcard(String wildcard) { return new ResponseEntity<>("", HttpStatus.NO_CONTENT); } @@ -61,7 +61,7 @@ public ResponseEntity get(String simple) { } @PostMapping(value = "/debug/{simple}") - public ResponseEntity post(String simple) { + public ResponseEntity post(String simple) { return new ResponseEntity<>("", HttpStatus.NO_CONTENT); } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/SpringDocApp235Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/SpringDocApp235Test.java index 50a4ce817..c284ddcb0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/SpringDocApp235Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app235/SpringDocApp235Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app235; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassOne.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassOne.java index 91df42f50..ca7aafda5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassOne.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassOne.java @@ -5,8 +5,8 @@ public class ClassOne { - @Valid - private ClassTwo description; + @Valid + private ClassTwo description; public @Valid ClassTwo getDescription() { return description; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassTwo.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassTwo.java index 65fdf2041..47bf01f7e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassTwo.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/ClassTwo.java @@ -7,8 +7,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class ClassTwo { - @NotNull - private String name; + @NotNull + private String name; public @NotNull String getName() { return name; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/HelloController.java index 9c822d971..358031fa7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/HelloController.java @@ -13,13 +13,13 @@ @RestController public class HelloController { - @PostMapping(path = "/testOne", consumes = MediaType.APPLICATION_JSON_VALUE) - ResponseEntity testOne(@ParameterObject @Valid ClassOne test) { - return ResponseEntity.ok("ok"); - } + @PostMapping(path = "/testOne", consumes = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity testOne(@ParameterObject @Valid ClassOne test) { + return ResponseEntity.ok("ok"); + } - @PostMapping(path = "/testTwo", consumes = MediaType.APPLICATION_JSON_VALUE) - ResponseEntity testTwo(@RequestBody ClassOne test) { - return ResponseEntity.ok("ok"); - } + @PostMapping(path = "/testTwo", consumes = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity testTwo(@RequestBody ClassOne test) { + return ResponseEntity.ok("ok"); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/SpringDocApp236Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/SpringDocApp236Test.java index f7ee84ff3..139dc62f7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/SpringDocApp236Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app236/SpringDocApp236Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app236; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/OpenApiConfiguration.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/OpenApiConfiguration.java index 37fd00048..38dbb83a8 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/OpenApiConfiguration.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/OpenApiConfiguration.java @@ -10,23 +10,23 @@ @Configuration public class OpenApiConfiguration { - public OpenApiConfiguration() { - // LocalTime support - PrimitiveType.enablePartialTime(); - } + public OpenApiConfiguration() { + // LocalTime support + PrimitiveType.enablePartialTime(); + } - private OpenAPI standardOpenApi() { - String title = getClass().getPackage().getImplementationTitle(); - String version = getClass().getPackage().getImplementationVersion(); - return new OpenAPI() - .info(new Info() - .title(title == null ? "DEV" : title) - .version(version == null ? "local" : version)); - } + private OpenAPI standardOpenApi() { + String title = getClass().getPackage().getImplementationTitle(); + String version = getClass().getPackage().getImplementationVersion(); + return new OpenAPI() + .info(new Info() + .title(title == null ? "DEV" : title) + .version(version == null ? "local" : version)); + } - @Bean - public OpenAPI devOpenApi() { - return standardOpenApi(); - } + @Bean + public OpenAPI devOpenApi() { + return standardOpenApi(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/SpringDocApp237Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/SpringDocApp237Test.java index 8c13dd0df..9011b345b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/SpringDocApp237Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/SpringDocApp237Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app237; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/UnwrappedController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/UnwrappedController.java index adad005ab..426594242 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/UnwrappedController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/UnwrappedController.java @@ -12,13 +12,13 @@ @RestController public class UnwrappedController { - @GetMapping("/") - @ResponseStatus(HttpStatus.OK) - @Operation(summary = "Simple get task") - @ApiResponse(responseCode = "200", description = "Task has been started") - @ApiResponse(responseCode = "404", description = "Task was not found") - @ApiResponse(responseCode = "409", description = "Task is already running") - public Example exampleGet() { - return new Example(new Example.Wrapped("Some value"), 1); - } + @GetMapping("/") + @ResponseStatus(HttpStatus.OK) + @Operation(summary = "Simple get task") + @ApiResponse(responseCode = "200", description = "Task has been started") + @ApiResponse(responseCode = "404", description = "Task was not found") + @ApiResponse(responseCode = "409", description = "Task is already running") + public Example exampleGet() { + return new Example(new Example.Wrapped("Some value"), 1); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/dto/Example.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/dto/Example.java index b75ba666e..2b9677b60 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/dto/Example.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app237/dto/Example.java @@ -4,16 +4,16 @@ import io.swagger.v3.oas.annotations.media.Schema; public record Example( - @JsonUnwrapped - @Schema(requiredMode = Schema.RequiredMode.REQUIRED) - Wrapped unwrapped, + @JsonUnwrapped + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) + Wrapped unwrapped, - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description") - Integer number + @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description") + Integer number ) { - public record Wrapped( - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description of value") - String value - ) { - } + public record Wrapped( + @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description of value") + String value + ) { + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/RootModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/RootModel.java index cf2bd6039..374979767 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/RootModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/RootModel.java @@ -4,24 +4,24 @@ public class RootModel { - private Integer rootProperty; + private Integer rootProperty; - private UnwrappedModel unwrappedModel; + private UnwrappedModel unwrappedModel; - public Integer getRootProperty() { - return rootProperty; - } + public Integer getRootProperty() { + return rootProperty; + } - public void setRootProperty(Integer rootProperty) { - this.rootProperty = rootProperty; - } + public void setRootProperty(Integer rootProperty) { + this.rootProperty = rootProperty; + } - @JsonUnwrapped - public UnwrappedModel getUnwrappedModel() { - return unwrappedModel; - } + @JsonUnwrapped + public UnwrappedModel getUnwrappedModel() { + return unwrappedModel; + } - public void setUnwrappedModel(UnwrappedModel unwrappedModel) { - this.unwrappedModel = unwrappedModel; - } + public void setUnwrappedModel(UnwrappedModel unwrappedModel) { + this.unwrappedModel = unwrappedModel; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/SpringDocApp239Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/SpringDocApp239Test.java index 122f279a5..056aab387 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/SpringDocApp239Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/SpringDocApp239Test.java @@ -24,9 +24,10 @@ package test.org.springdoc.api.v30.app239; -import org.springframework.boot.autoconfigure.SpringBootApplication; import test.org.springdoc.api.v30.AbstractSpringDocV30Test; +import org.springframework.boot.autoconfigure.SpringBootApplication; + public class SpringDocApp239Test extends AbstractSpringDocV30Test { @SpringBootApplication diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/TestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/TestController.java index a3f084691..291217cca 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/TestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/TestController.java @@ -8,8 +8,8 @@ @RequestMapping("/api") public class TestController { - @GetMapping - public RootModel getRootModel() { - return new RootModel(); - } + @GetMapping + public RootModel getRootModel() { + return new RootModel(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/UnwrappedModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/UnwrappedModel.java index 9ac5c2a48..e4d669c3e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/UnwrappedModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app239/UnwrappedModel.java @@ -2,13 +2,13 @@ public class UnwrappedModel { - private Integer unwrappedProperty; + private Integer unwrappedProperty; - public Integer getUnwrappedProperty() { - return unwrappedProperty; - } + public Integer getUnwrappedProperty() { + return unwrappedProperty; + } - public void setUnwrappedProperty(Integer unwrappedProperty) { - this.unwrappedProperty = unwrappedProperty; - } + public void setUnwrappedProperty(Integer unwrappedProperty) { + this.unwrappedProperty = unwrappedProperty; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app241/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app241/HelloController.java index 213093d74..a01efb593 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app241/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app241/HelloController.java @@ -47,7 +47,8 @@ public void parentEndpoint(@RequestBody Superclass parent) { @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "@type") sealed class Superclass permits IntermediateClass { - public Superclass() {} + public Superclass() { + } } @Schema(name = IntermediateClass.SCHEMA_NAME) diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/RootModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/RootModel.java new file mode 100644 index 000000000..ace808e76 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/RootModel.java @@ -0,0 +1,41 @@ +package test.org.springdoc.api.v30.app242; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonUnwrapped; + +public class RootModel { + + private Integer rootProperty; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonUnwrapped + private UnwrappedModelOne unwrappedModelOne; + + private UnwrappedModelTwo unwrappedModelTwo; + + public Integer getRootProperty() { + return rootProperty; + } + + public void setRootProperty(Integer rootProperty) { + this.rootProperty = rootProperty; + } + + public UnwrappedModelOne getUnwrappedModelOne() { + return unwrappedModelOne; + } + + public void setUnwrappedModelOne(UnwrappedModelOne unwrappedModelOne) { + this.unwrappedModelOne = unwrappedModelOne; + } + + public UnwrappedModelTwo getUnwrappedModelTwo() { + return unwrappedModelTwo; + } + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @JsonUnwrapped + public void setUnwrappedModelTwo(UnwrappedModelTwo unwrappedModelTwo) { + this.unwrappedModelTwo = unwrappedModelTwo; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/SpringDocApp242Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/SpringDocApp242Test.java new file mode 100644 index 000000000..5f3e8fed4 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/SpringDocApp242Test.java @@ -0,0 +1,35 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v30.app242; + +import test.org.springdoc.api.v30.AbstractSpringDocV30Test; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +public class SpringDocApp242Test extends AbstractSpringDocV30Test { + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/TestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/TestController.java new file mode 100644 index 000000000..f37824bbf --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/TestController.java @@ -0,0 +1,15 @@ +package test.org.springdoc.api.v30.app242; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api") +public class TestController { + + @GetMapping + public RootModel getRootModel() { + return new RootModel(); + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/UnwrappedModelOne.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/UnwrappedModelOne.java new file mode 100644 index 000000000..733cf6d0e --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/UnwrappedModelOne.java @@ -0,0 +1,14 @@ +package test.org.springdoc.api.v30.app242; + +public class UnwrappedModelOne { + + private Integer unwrappedOneProperty; + + public Integer getUnwrappedOneProperty() { + return unwrappedOneProperty; + } + + public void setUnwrappedOneProperty(Integer unwrappedOneProperty) { + this.unwrappedOneProperty = unwrappedOneProperty; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/UnwrappedModelTwo.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/UnwrappedModelTwo.java new file mode 100644 index 000000000..840c0c2eb --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app242/UnwrappedModelTwo.java @@ -0,0 +1,14 @@ +package test.org.springdoc.api.v30.app242; + +public class UnwrappedModelTwo { + + private Integer unwrappedTwoProperty; + + public Integer getUnwrappedTwoProperty() { + return unwrappedTwoProperty; + } + + public void setUnwrappedTwoProperty(Integer unwrappedTwoProperty) { + this.unwrappedTwoProperty = unwrappedTwoProperty; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app243/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app243/HelloController.java new file mode 100644 index 000000000..f82daf5ae --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app243/HelloController.java @@ -0,0 +1,93 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v30.app243; + +import io.swagger.v3.oas.annotations.media.DiscriminatorMapping; +import io.swagger.v3.oas.annotations.media.Schema; + +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @PostMapping("/parent") + public void parentEndpoint(@RequestBody SuperClass parent) { + + } + +} + +@Schema(name = SuperClass.SCHEMA_NAME, + discriminatorProperty = "type", + oneOf = { + FirstChildClass.class, + SecondChildClass.class + }, + discriminatorMapping = { + @DiscriminatorMapping(value = FirstChildClass.SCHEMA_NAME, schema = FirstChildClass.class), + @DiscriminatorMapping(value = SecondChildClass.SCHEMA_NAME, schema = SecondChildClass.class) + } +) +sealed class SuperClass { + + public static final String SCHEMA_NAME = "SuperClass"; + + public String type; + + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) + public String getType() { + return type; + } +} + +@Schema(name = FirstChildClass.SCHEMA_NAME) +final class FirstChildClass extends SuperClass { + + public static final String SCHEMA_NAME = "Image"; + + public String type; + + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) + public String getType() { + return type; + } +} + +@Schema(name = SecondChildClass.SCHEMA_NAME) +final class SecondChildClass extends SuperClass { + + public static final String SCHEMA_NAME = "Mail"; + + public String type; + + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) + public String getType() { + return type; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app243/SpringDocApp243Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app243/SpringDocApp243Test.java new file mode 100644 index 000000000..d7af04c6f --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app243/SpringDocApp243Test.java @@ -0,0 +1,35 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2025 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v30.app243; + +import test.org.springdoc.api.v30.AbstractSpringDocV30Test; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +public class SpringDocApp243Test extends AbstractSpringDocV30Test { + + @SpringBootApplication + static class SpringDocTestApp {} +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java index 550b17a97..713ca0040 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java @@ -25,6 +25,7 @@ package test.org.springdoc.api.v30.app52; import java.util.List; +import java.util.Map; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PathVariable; @@ -37,29 +38,42 @@ @RestController public class HelloController { - @PostMapping(value = "/test1/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public String createTest1(@PathVariable String username, @RequestPart("test") MyTestDto test, - @RequestPart("image") MultipartFile imageFile) { - return null; - } + @PostMapping(value = "/test1/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String createTest1( + @PathVariable String username, + @RequestPart("test") MyTestDto test, + @RequestPart("image") MultipartFile imageFile) { + return null; + } - @PostMapping(value = "/test2/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public String createTest2(@PathVariable String username, @RequestPart("image") MultipartFile imageFile, - @RequestPart("test") MyTestDto test, @RequestHeader("My-Header") String workspaceId) { - return null; - } + @PostMapping(value = "/test2/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String createTest2( + @PathVariable String username, + @RequestPart("image") MultipartFile imageFile, + @RequestPart("test") MyTestDto test, + @RequestHeader("My-Header") String workspaceId) { + return null; + } - @PostMapping(value = "/test3", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public String createTest3(@RequestPart("test") MyTestDto test, - @RequestPart("doc") List multipartFiles) { - return null; - } + @PostMapping(value = "/test3", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String createTest3( + @RequestPart("test") MyTestDto test, + @RequestPart("doc") List multipartFiles) { + return null; + } - class MyTestDto { - public String object1; + @PostMapping(value = "/test4", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String createTest4( + @RequestPart List multipartFiles, + @RequestPart Map map) { + return null; + } - public String object2; + class MyTestDto { + public String object1; - public String object3; - } + public String object2; + + public String object3; + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java index 9c7856e73..c3a4dd3c4 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java @@ -92,9 +92,9 @@ public RequestMappingHandlerMapping defaultTestHandlerMapping(GreetingController @Bean(name = "openApiResource") public OpenApiWebMvcResource openApiResource(ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, - OperationService operationParser,SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { + OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { return new OpenApiWebMvcResource(DEFAULT_GROUP_NAME, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, - springDocConfigProperties, springDocProviders,springDocCustomizers); + springDocConfigProperties, springDocProviders, springDocCustomizers); } @Override diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocV31Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocV31Test.java new file mode 100644 index 000000000..33595ce7c --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocV31Test.java @@ -0,0 +1,62 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31; + +import org.junit.jupiter.api.Test; +import org.springdoc.core.utils.Constants; +import test.org.springdoc.api.AbstractCommonTest; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.web.servlet.MvcResult; + +import static org.hamcrest.Matchers.is; +import static org.skyscreamer.jsonassert.JSONAssert.assertEquals; +import static org.springdoc.core.utils.Constants.SPRINGDOC_CACHE_DISABLED; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * A common base for OpenAPI 3.1 tests which provides the necessary foundation for OpenAPI 3.1 tests, + * making the test setup cleaner and more consistent. + * + * @author zdary + */ +@SpringBootTest +@TestPropertySource(properties = { SPRINGDOC_CACHE_DISABLED + "=true", "springdoc.api-docs.version=OPENAPI_3_1" }) +public abstract class AbstractSpringDocV31Test extends AbstractCommonTest { + + @Test + protected void testApp() throws Exception { + String className = getClass().getSimpleName(); + String testNumber = className.replaceAll("[^0-9]", ""); + MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.1.0"))).andReturn(); + String result = mockMvcResult.getResponse().getContentAsString(); + String expected = getContent("results/3.1.0/app" + testNumber + ".json"); + assertEquals(expected, result, true); + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java index f335aac0a..92ce4f91f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java @@ -38,6 +38,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotNull; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -110,4 +111,9 @@ public ResponseEntity deletePerson( } return ResponseEntity.noContent().build(); } + + @PostMapping(path = "/api/test", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) + public void postSingleParameter(@RequestParam(name = "test_id") @NotNull final UUID testId) { + System.out.println("Received test_id: " + testId); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/GreetController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/GreetController.java index 71bcde546..ad43f7a7e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/GreetController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/GreetController.java @@ -28,11 +28,11 @@ @RestController public class GreetController { - @PostMapping("/greet") - @Operation(summary = "Greet") - public String greet( - @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "Some description", required = false) - @RequestBody(required = false) Map body) { - return body.getOrDefault("greet", "Hello"); - } + @PostMapping("/greet") + @Operation(summary = "Greet") + public String greet( + @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "Some description", required = false) + @RequestBody(required = false) Map body) { + return body.getOrDefault("greet", "Hello"); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java index 0d0384cc5..621ebef1f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java @@ -24,8 +24,8 @@ public class SpringDocApp10Test extends AbstractSpringDocTest { - @SpringBootApplication - static class SpringDocTestApp { + @SpringBootApplication + static class SpringDocTestApp { - } + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java index b68e94a80..dbcc0dca6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java @@ -24,12 +24,19 @@ package test.org.springdoc.api.v31.app105; +import java.util.Optional; + +import io.swagger.v3.core.converter.ModelConverter; +import io.swagger.v3.core.converter.ModelConverters; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; +import org.springdoc.core.converters.OAS31ModelConverter; import org.springdoc.core.utils.Constants; import test.org.springdoc.api.v31.AbstractSpringDocTest; @@ -38,12 +45,14 @@ import org.springframework.test.context.TestPropertySource; import static org.hamcrest.Matchers.is; +import static org.springdoc.core.utils.Constants.SPRINGDOC_EXPLICIT_OBJECT_SCHEMA; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @TestPropertySource(properties = { + SPRINGDOC_EXPLICIT_OBJECT_SCHEMA + "=true", "springdoc.group-configs[0].group=stores", "springdoc.group-configs[0].paths-to-match=/store/**", "springdoc.group-configs[1].group=users", @@ -57,7 +66,15 @@ }) public class SpringDocApp105Test extends AbstractSpringDocTest { - public static String className; + @AfterAll + public static void reset() { + System.setProperty(Schema.EXPLICIT_OBJECT_SCHEMA_PROPERTY, "false"); + ModelConverters instance = ModelConverters.getInstance(true); + Optional oas31ModelConverter = + instance.getConverters() + .stream().filter(modelConverter -> modelConverter instanceof OAS31ModelConverter).findAny(); + oas31ModelConverter.ifPresent(instance::removeConverter); + } @Test protected void testApp() throws Exception { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java index d0639c8d1..95423b715 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java @@ -43,13 +43,13 @@ public class SpringDocApp110Test extends AbstractSpringDocTest { static class SpringDocTestApp { @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java index f8b8954ba..b13e18635 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java @@ -43,12 +43,12 @@ public class SpringDocApp111Test extends AbstractSpringDocTest { static class SpringDocTestApp { @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java index 308852152..636c3b6dd 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java @@ -43,12 +43,12 @@ public class SpringDocApp112Test extends AbstractSpringDocTest { static class SpringDocTestApp { @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java index d399eb272..7f4914316 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java @@ -24,13 +24,30 @@ package test.org.springdoc.api.v31.app115; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import test.org.springdoc.api.v31.AbstractSpringDocTest; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; +import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_EXTRA_SCHEMAS; +import static org.springdoc.core.utils.SpringDocUtils.getConfig; +@TestPropertySource(properties = SPRINGDOC_ENABLE_EXTRA_SCHEMAS + "=false") public class SpringDocApp115Test extends AbstractSpringDocTest { + @BeforeAll + public static void clear() { + getConfig().resetExtraSchemas(); + } + + @AfterAll + public static void restore() { + getConfig().initExtraSchemas(); + } + + @SpringBootApplication static class SpringDocTestApp {} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java index ab77cb0d1..2dbc818f8 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java @@ -31,6 +31,7 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody; import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; @@ -46,7 +47,7 @@ public class HelloController { produces = MediaType.TEXT_PLAIN_VALUE) public String multiFilesInMultiPart( @RequestPart("params") - @RequestBody(content = @Content(encoding = @Encoding(name="params", contentType=MediaType.APPLICATION_JSON_VALUE))) + @RequestBody(content = @Content(encoding = @Encoding(name = "params", contentType = MediaType.APPLICATION_JSON_VALUE))) @Parameter( description = "This is the configuration", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)) final JsonRequest jsonRequest, @@ -54,4 +55,13 @@ public String multiFilesInMultiPart( @RequestPart(value = "file2", required = false) @Parameter(description = "This is file2") final MultipartFile file2) { return "Hello World " + jsonRequest.getName(); } + + @PostMapping(value = "/uploadFileWithJson2", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}, produces = { + MediaType.APPLICATION_JSON_VALUE}) + public ResponseEntity uploadFileWithJson( + @Parameter(description="file") @RequestPart("file") final MultipartFile file, + @RequestBody(description = "toto", content = @Content(encoding = @Encoding(name = "jsonRequest", contentType = MediaType.APPLICATION_JSON_VALUE))) + @Parameter(description = "An extra JSON payload sent with file") @RequestPart("jsonRequest") final JsonRequest jsonRequest) { + return null; + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java index 6c52c9e16..0e8ae74f4 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java @@ -25,6 +25,7 @@ package test.org.springdoc.api.v31.app124; import org.springframework.http.HttpStatus; +import org.springframework.http.ProblemDetail; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -34,7 +35,7 @@ public class MyExceptionHandler { @ExceptionHandler(RuntimeException.class) @ResponseStatus(HttpStatus.BAD_GATEWAY) - public Object gateway(RuntimeException e) { + public ProblemDetail gateway(RuntimeException e) { return null; } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java index ae548662b..f66a71bd0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java @@ -26,11 +26,13 @@ import test.org.springdoc.api.v31.AbstractSpringDocTest; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; /** * Tests Spring meta-annotations as method parameters */ +@TestPropertySource(properties = "springdoc.default-produces-media-type=application/json") public class SpringDocApp124Test extends AbstractSpringDocTest { @SpringBootApplication diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java index a52df52e7..18c4e838c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java @@ -24,6 +24,8 @@ package test.org.springdoc.api.v31.app129; +import java.util.concurrent.CompletableFuture; + import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; @@ -43,4 +45,11 @@ public DeferredResult> update( @RequestBody ActualReturnedEntity entity) throws Exception { return null; } + + @PostMapping("/test2") + @ApiResponses({ @ApiResponse(responseCode = "200") }) + public CompletableFuture> update2( + @RequestBody ActualReturnedEntity entity) throws Exception { + return null; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app136/SpringDocApp136Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app136/SpringDocApp136Test.java index f2a13533e..8f7bbfe8b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app136/SpringDocApp136Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app136/SpringDocApp136Test.java @@ -52,7 +52,7 @@ /** * Tests deterministic creation of operationIds */ -@SpringBootTest(properties = { SPRINGDOC_CACHE_DISABLED + "=true", "springdoc.api-docs.version=openapi_3_1" }) +@SpringBootTest(properties = { SPRINGDOC_CACHE_DISABLED + "=true", "springdoc.api-docs.version=openapi_3_1" }) public class SpringDocApp136Test extends AbstractCommonTest { @Autowired diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java index 9930508ab..0448d2839 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java @@ -64,7 +64,7 @@ public class SpringDocApp157Test extends AbstractSpringDocTest { public void unregisterConverter() { converters.removeConverter(stringyConverter); } - + @Test protected void testApp() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) @@ -75,7 +75,7 @@ protected void testApp() throws Exception { }}))) .andExpect(jsonPath("$.components.schemas.Bar", not(hasProperty("required")))); } - + @SpringBootApplication static class SpringBootApp {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app163/Examples.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app163/Examples.java index 20c099430..9f9138920 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app163/Examples.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app163/Examples.java @@ -35,7 +35,6 @@ /** * This class contributes OpenAPI examples. - * * Each example is contributed through a bean typed as a map entry * (Map.Entry) and referenced through a constant by a resource * operation's @ApiResponse. diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app164/SampleResponseClass.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app164/SampleResponseClass.java index 824192c23..ea7f01063 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app164/SampleResponseClass.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app164/SampleResponseClass.java @@ -39,8 +39,8 @@ public class SampleResponseClass { private boolean booleanValueAsFourthParameter; - @ArraySchema( arraySchema = @Schema( description = "${blahDescription.value}" ), - schema = @Schema( description = "${blahDescription.value}" ) ) + @ArraySchema(arraySchema = @Schema(description = "${blahDescription.value}"), + schema = @Schema(description = "${blahDescription.value}")) private List listBlah; public List getListBlah() { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java index 169fd2791..4b8d374c7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java @@ -32,7 +32,7 @@ /** * In this test, it is checked that the error handler is displayed correctly in the documentation. * Exactly, that the local handler takes precedence over the global one - * */ + */ @TestPropertySource(properties = "springdoc.api-docs.resolve-schema-properties=true") public class SpringDocApp166Test extends AbstractSpringDocTest { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app183/SpringDocApp183Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app183/SpringDocApp183Test.java index 34ba0b7e1..938ca29ac 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app183/SpringDocApp183Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app183/SpringDocApp183Test.java @@ -46,7 +46,7 @@ record ObjectB(Integer bb, Integer bbb) {} class BToAConvertor implements Converter { @Override public ObjectA convert(ObjectB source) { - return new ObjectA(source.bb+"", source.bbb+""); + return new ObjectA(source.bb + "", source.bbb + ""); } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app193/SpringDocApp193Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app193/SpringDocApp193Test.java index a52caa280..b52ca2c6e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app193/SpringDocApp193Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app193/SpringDocApp193Test.java @@ -39,7 +39,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@SpringBootTest(properties = { "springdoc.api-docs.version=openapi_3_1" }) +@SpringBootTest(properties = { "springdoc.api-docs.version=openapi_3_1", "springdoc.remove-broken-reference-definitions=false"}) public class SpringDocApp193Test extends AbstractCommonTest { @Test diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app198/Response.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app198/Response.java index 70e504cef..3a26cd0a8 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app198/Response.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app198/Response.java @@ -9,12 +9,6 @@ */ public class Response { - public Response(BigDecimal val1, BigDecimal val2, BigDecimal val3) { - this.val1 = val1; - this.val2 = val2; - this.val3 = val3; - } - @Schema(deprecated = true) @Deprecated private BigDecimal val1; @@ -23,6 +17,12 @@ public Response(BigDecimal val1, BigDecimal val2, BigDecimal val3) { private BigDecimal val3; + public Response(BigDecimal val1, BigDecimal val2, BigDecimal val3) { + this.val1 = val1; + this.val2 = val2; + this.val3 = val3; + } + public BigDecimal getVal1() { return val1; } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/CustomExceptionHandler.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/CustomExceptionHandler.java index 97fe3df77..ead7a3da2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/CustomExceptionHandler.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/CustomExceptionHandler.java @@ -10,14 +10,13 @@ @ControllerAdvice public class CustomExceptionHandler { - static public class MyInternalException extends Exception {} - - @ResponseStatus( value = INTERNAL_SERVER_ERROR ) - @ExceptionHandler( MyInternalException.class ) - @ResponseBody - public ErrorDto handleMyInternalException( final MyInternalException ex ) { - return new ErrorDto( ex.getMessage() ); - } + @ResponseStatus(value = INTERNAL_SERVER_ERROR) + @ExceptionHandler(MyInternalException.class) + @ResponseBody + public ErrorDto handleMyInternalException(final MyInternalException ex) { + return new ErrorDto(ex.getMessage()); + } + static public class MyInternalException extends Exception {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/ErrorDto.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/ErrorDto.java index 3f6779ce6..122ae2950 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/ErrorDto.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/ErrorDto.java @@ -1,12 +1,17 @@ package test.org.springdoc.api.v31.app199; public class ErrorDto { - private String message; + private String message; - public ErrorDto( final String message ) { - this.message = message; - } + public ErrorDto(final String message) { + this.message = message; + } - public String getMessage() { return message; } - public void setMessage( final String message ) { this.message = message; } + public String getMessage() { + return message; + } + + public void setMessage(final String message) { + this.message = message; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/HelloController.java index 9edf7f90f..c68bdd2e9 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app199/HelloController.java @@ -48,57 +48,58 @@ public class HelloController { ObjectMapper defaultObjectMapper; @GetMapping( - value = "/first", - produces = APPLICATION_JSON_VALUE + value = "/first", + produces = APPLICATION_JSON_VALUE ) - public void first() throws MyInternalException {} + public void first() throws MyInternalException { + } @GetMapping( - value = "/second", - produces = APPLICATION_JSON_VALUE + value = "/second", + produces = APPLICATION_JSON_VALUE ) - public void second() throws MyInternalException {} + public void second() throws MyInternalException { + } @Bean - public OperationCustomizer operationCustomizer() - { - return ( Operation operation, HandlerMethod handlerMethod ) -> + public OperationCustomizer operationCustomizer() { + return (Operation operation, HandlerMethod handlerMethod) -> { final io.swagger.v3.oas.models.media.MediaType mediaType = operation - .getResponses() - .get( "500" ) - .getContent() - .get( ALL_VALUE ); + .getResponses() + .get("500") + .getContent() + .get(ALL_VALUE); - mediaType.setExamples( mediaType.getExamples() != null - ? mediaType.getExamples() - : new LinkedHashMap<>() ); + mediaType.setExamples(mediaType.getExamples() != null + ? mediaType.getExamples() + : new LinkedHashMap<>()); final Map examples = mediaType.getExamples(); - switch ( handlerMethod.getMethod().getName() ) { + switch (handlerMethod.getMethod().getName()) { - case "first" : + case "first": examples.put( - "First case example", - new Example().value( - defaultObjectMapper.valueToTree( - new ErrorDto( "An ErrorDto sample specific to /first endpoint" ) + "First case example", + new Example().value( + defaultObjectMapper.valueToTree( + new ErrorDto("An ErrorDto sample specific to /first endpoint") + ) ) - ) ); - break; + break; - case "second" : + case "second": examples.put( - "Second case example", - new Example().value( - defaultObjectMapper.valueToTree( - new ErrorDto( "An ErrorDto sample specific to /second endpoint" ) + "Second case example", + new Example().value( + defaultObjectMapper.valueToTree( + new ErrorDto("An ErrorDto sample specific to /second endpoint") + ) ) - ) ); - break; + break; } return operation; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app200/FooBar.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app200/FooBar.java index bcfe0aff8..87074b2ae 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app200/FooBar.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app200/FooBar.java @@ -13,16 +13,6 @@ public enum FooBar { this.value = value; } - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - @JsonCreator public static FooBar fromValue(String value) { for (FooBar b : FooBar.values()) { @@ -32,4 +22,14 @@ public static FooBar fromValue(String value) { } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app203/SpringDocApp203Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app203/SpringDocApp203Test.java index 440badb3c..50e5d5ae2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app203/SpringDocApp203Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app203/SpringDocApp203Test.java @@ -39,14 +39,6 @@ @TestPropertySource(properties = { "springdoc.group-configs[0].group=mygroup", "springdoc.group-configs[0].paths-to-match=/test" }) public class SpringDocApp203Test extends AbstractSpringDocTest { - @SpringBootApplication - @Import({ - OrderDemo.Customizer1.class, - OrderDemo.Customizer2.class, - OrderDemo.Customizer3.class, - }) - static class SpringDocTestApp {} - @Test void testApp1() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL + "/mygroup")) @@ -54,4 +46,12 @@ void testApp1() throws Exception { .andExpect(jsonPath("$.openapi", is("3.1.0"))) .andExpect(content().json(getContent("results/3.1.0/app203.json"), true)); } + + @SpringBootApplication + @Import({ + OrderDemo.Customizer1.class, + OrderDemo.Customizer2.class, + OrderDemo.Customizer3.class, + }) + static class SpringDocTestApp {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/OrderDemo.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/OrderDemo.java index b8fa2b453..ca9b07c64 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/OrderDemo.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/OrderDemo.java @@ -1,7 +1,7 @@ package test.org.springdoc.api.v31.app205; /** - * @author bnasslahsen + * */ import org.springframework.web.bind.annotation.GetMapping; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/SpringdocApp205Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/SpringdocApp205Test.java index 52e9f0256..11f7804f7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/SpringdocApp205Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app205/SpringdocApp205Test.java @@ -1,7 +1,7 @@ package test.org.springdoc.api.v31.app205; /** - * @author bnasslahsen + * */ import test.org.springdoc.api.v31.AbstractSpringDocTest; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SuperController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SuperController.java index a44eea147..f7f02a9df 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SuperController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SuperController.java @@ -11,10 +11,10 @@ public abstract class SuperController> { - @GetMapping({"page/{current}/{size}", "page"}) - public List findPage(@PathVariable(required = false) Long current, - @PathVariable(required = false) Long size, - @RequestParam(required = false) T params) { - return new ArrayList<>(); - } + @GetMapping({ "page/{current}/{size}", "page" }) + public List findPage(@PathVariable(required = false) Long current, + @PathVariable(required = false) Long size, + @RequestParam(required = false) T params) { + return new ArrayList<>(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SysUserController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SysUserController.java index 04cc6ceb1..0c0730f8e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SysUserController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app207/controller/SysUserController.java @@ -10,5 +10,5 @@ @RequestMapping("/api/sysUser") public class SysUserController extends SuperController { - + } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app209/SpringDocApp209Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app209/SpringDocApp209Test.java index 83ec3010c..6b533fff0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app209/SpringDocApp209Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app209/SpringDocApp209Test.java @@ -70,6 +70,23 @@ public class SpringDocApp209Test extends AbstractCommonTest { @Autowired private OpenAPIServiceMock openAPIService; + @Test + void shouldOnlyByCalledOnce() throws Exception { + // assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); + + className = getClass().getSimpleName(); + String testNumber = className.replaceAll("[^0-9]", ""); + MvcResult mockMvcResult = mockMvc + .perform(get(Constants.DEFAULT_API_DOCS_URL).header(HttpHeaders.ACCEPT_LANGUAGE, "ja")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.1.0"))).andReturn(); + String result = mockMvcResult.getResponse().getContentAsString(); + String expected = getContent("results/3.1.0/app" + testNumber + ".json"); + JSONAssert.assertEquals(expected, result, true); + + assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); + } + @SpringBootApplication static class SpringDocTestApp { @Bean("openAPIService") @@ -95,21 +112,4 @@ public int getNumberOfTimesCalculatePathWasCalled() { return numberOfTimesCalculatePathWasCalled; } } - - @Test - void shouldOnlyByCalledOnce() throws Exception { - // assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); - - className = getClass().getSimpleName(); - String testNumber = className.replaceAll("[^0-9]", ""); - MvcResult mockMvcResult = mockMvc - .perform(get(Constants.DEFAULT_API_DOCS_URL).header(HttpHeaders.ACCEPT_LANGUAGE, "ja")) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.1.0"))).andReturn(); - String result = mockMvcResult.getResponse().getContentAsString(); - String expected = getContent("results/3.1.0/app" + testNumber + ".json"); - JSONAssert.assertEquals(expected, result, true); - - assertEquals(1, openAPIService.getNumberOfTimesCalculatePathWasCalled()); - } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app210/SpringDocApp210Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app210/SpringDocApp210Test.java index 2541eef30..72709ece4 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app210/SpringDocApp210Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app210/SpringDocApp210Test.java @@ -35,12 +35,12 @@ @SpringBootTest public class SpringDocApp210Test extends AbstractCommonTest { - + @Test - protected void testApp(){ + protected void testApp() { assertThrows(IllegalArgumentException.class, () -> GroupedOpenApi.builder().group("").build()); } - + @SpringBootApplication static class SpringDocTestApp {} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app211/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app211/HelloController.java index 653b96716..4eeb72cd3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app211/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app211/HelloController.java @@ -57,5 +57,6 @@ public String index() { } record PagedObject(long id, String name) {} + record Paging(int page, int total, int lastPage) {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/HelloController.java index bee6597db..3bffdc098 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/HelloController.java @@ -31,7 +31,7 @@ public class HelloController { public PersonDTO persons1() { return new PersonDTO("John"); } - + @GetMapping(value = "/persons2") public PersonDTO persons2() { return new PersonDTO("John"); diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/SpringDocApp212Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/SpringDocApp212Test.java index 6d3219a8d..d3d8cf4a0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/SpringDocApp212Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app212/SpringDocApp212Test.java @@ -39,28 +39,28 @@ @ActiveProfiles("212") public class SpringDocApp212Test extends AbstractSpringDocTest { - /** - * The type Spring doc test app. - */ - @SpringBootApplication - static class SpringDocTestApp { + @Test + void getGroupedOpenapi_shouldCustomizeFromPropertiesWithGroupNamePrefix() throws Exception { + String result = mockMvc.perform(get("/v3/api-docs/apiGroupName")) + .andExpect(status().isOk()) + .andReturn().getResponse().getContentAsString(); + String expected = getContent("results/3.1.0/app212-grouped.json"); + assertEquals(expected, result, true); + } - @Bean - GroupedOpenApi apiGroupBeanName() { - return GroupedOpenApi.builder() - .group("apiGroupName") - .packagesToScan("test.org.springdoc.api.v31.app212") - .build(); - } - } + /** + * The type Spring doc test app. + */ + @SpringBootApplication + static class SpringDocTestApp { - @Test - void getGroupedOpenapi_shouldCustomizeFromPropertiesWithGroupNamePrefix() throws Exception { - String result = mockMvc.perform(get("/v3/api-docs/apiGroupName")) - .andExpect(status().isOk()) - .andReturn().getResponse().getContentAsString(); - String expected = getContent("results/3.1.0/app212-grouped.json"); - assertEquals(expected, result, true); - } + @Bean + GroupedOpenApi apiGroupBeanName() { + return GroupedOpenApi.builder() + .group("apiGroupName") + .packagesToScan("test.org.springdoc.api.v31.app212") + .build(); + } + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/HelloController.java index a18bf5374..85e260bc5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/HelloController.java @@ -58,7 +58,7 @@ public class HelloController { value = "${api.extensions.properties.uri}/testcontroller/getTest"), @ExtensionProperty(name = "passthroughBehavior", value = "${api.extensions.properties.passthroughBehavior}"), @ExtensionProperty(name = "connectionType", value = "${api.extensions.properties.connectionType}") }) }) - + public PersonDTO queryMyDto() { // This return a PageImpl with the data, the method parameter 'query' is a pojo containg filter properties return null; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/PersonDTO.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/PersonDTO.java index a7bb1210f..7c2986936 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/PersonDTO.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app213/PersonDTO.java @@ -47,9 +47,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app214/SpringDocApp214Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app214/SpringDocApp214Test.java index 6eee89e7e..e269b3c79 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app214/SpringDocApp214Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app214/SpringDocApp214Test.java @@ -49,13 +49,13 @@ public class SpringDocApp214Test extends AbstractCommonTest { @Autowired private SpringDocConfigProperties springDocConfigProperties; - - @SpringBootApplication - static class SpringDocTestApp {} @Test protected void testApp() throws Exception { assertEquals(4, springDocConfigProperties.getGroupConfigs().stream().map(GroupConfig::getGroup).toList().size()); } + @SpringBootApplication + static class SpringDocTestApp {} + } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215Test.java index 0d1385fb4..4c78c3ea9 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215Test.java @@ -30,15 +30,15 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=false") +@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=false") public class SpringDocApp215Test extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc" }) - static class SpringDocTestApp {} - @Test void test_disable_default_api_docs() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isNotFound()); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215bisTest.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215bisTest.java index f259c8904..3d9320d20 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215bisTest.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app215/SpringDocApp215bisTest.java @@ -30,15 +30,15 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS+"=true") +@WebMvcTest(properties = SPRINGDOC_ENABLE_DEFAULT_API_DOCS + "=true") public class SpringDocApp215bisTest extends AbstractCommonTest { - @SpringBootApplication - @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v31.app214" }) - static class SpringDocTestApp {} - @Test void test_enable_default_api_docs() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()); } + + @SpringBootApplication + @ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.v31.app214" }) + static class SpringDocTestApp {} } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app216/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app216/HelloController.java index 826add455..5cfacedba 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app216/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app216/HelloController.java @@ -23,7 +23,6 @@ package test.org.springdoc.api.v31.app216; - import io.swagger.v3.oas.annotations.Operation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/HelloController.java index ec2f89d77..30c0ba61f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/HelloController.java @@ -24,9 +24,9 @@ @RestController public class HelloController { - @GetMapping(value = "/persons") - public PersonDTO persons() { - return new PersonDTO("John"); - } + @GetMapping(value = "/persons") + public PersonDTO persons() { + return new PersonDTO("John"); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/SpringDocApp217Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/SpringDocApp217Test.java index 31335635f..1d9d75c79 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/SpringDocApp217Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app217/SpringDocApp217Test.java @@ -40,8 +40,8 @@ @SpringBootTest @ActiveProfiles("217") public class SpringDocApp217Test extends AbstractSpringDocTest { - - + + @Test void testApp1() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL + "/demo")) @@ -57,7 +57,7 @@ void testApp2() throws Exception { .andExpect(jsonPath("$.openapi", is("3.1.0"))) .andExpect(content().json(getContent("results/3.1.0/app217-2.json"), true)); } - + @SpringBootApplication static class SpringDocTestApp {} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app218/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app218/HelloController.java index afff3bd31..5c4f583e0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app218/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app218/HelloController.java @@ -40,25 +40,25 @@ @RequestMapping("/") public class HelloController { - @Operation( - summary = "Summary", - description = "This is description.", - tags = {"Sample"}, - responses = { - @ApiResponse( - responseCode = "201", - description = "201 (Created)", - headers = - @Header( - name = HttpHeaders.LOCATION, - description = "Sample endpoint", - schema = @Schema(implementation = URI.class) - ) - ) - } - ) - @GetMapping - public String get() { - return "Hello World!"; - } + @Operation( + summary = "Summary", + description = "This is description.", + tags = { "Sample" }, + responses = { + @ApiResponse( + responseCode = "201", + description = "201 (Created)", + headers = + @Header( + name = HttpHeaders.LOCATION, + description = "Sample endpoint", + schema = @Schema(implementation = URI.class) + ) + ) + } + ) + @GetMapping + public String get() { + return "Hello World!"; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app219/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app219/HelloController.java index 876c2eec8..c4c0e5a60 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app219/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app219/HelloController.java @@ -24,6 +24,8 @@ package test.org.springdoc.api.v31.app219; +import test.org.springdoc.api.v30.app219.TestObject; + import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,7 +38,22 @@ public class HelloController { @RequestMapping(value = "/testpost", method = RequestMethod.POST, produces = {"application/json"}, consumes = {"application/json;charset=UTF-8", "application/json; charset=UTF-8"}) - public ResponseEntity testpost(@RequestBody TestObject dto) { + public ResponseEntity postWithProducesAndConsumes(@RequestBody TestObject dto) { + return ResponseEntity.ok(dto); + } + + @RequestMapping(value = "/testpost2", method = RequestMethod.POST, consumes = {"application/json;charset=UTF-8"}) + public ResponseEntity postWithConsumes(@RequestBody TestObject dto) { + return ResponseEntity.ok(dto); + } + + @RequestMapping(value = "/testpost3", method = RequestMethod.POST, produces = {"application/json"}) + public ResponseEntity postWithProduces(@RequestBody TestObject dto) { + return ResponseEntity.ok(dto); + } + + @RequestMapping(value = "/testpost4", method = RequestMethod.POST) + public ResponseEntity post(@RequestBody TestObject dto) { return ResponseEntity.ok(dto); } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app220/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app220/HelloController.java index 2fdca57aa..cd2d85779 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app220/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app220/HelloController.java @@ -12,12 +12,12 @@ @RestController public class HelloController { - - @PostMapping("/parent") - public void parentEndpoint(@RequestBody Superclass parent) { - - } - + + @PostMapping("/parent") + public void parentEndpoint(@RequestBody Superclass parent) { + + } + } @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "@type") @@ -26,7 +26,8 @@ public void parentEndpoint(@RequestBody Superclass parent) { }) sealed class Superclass permits IntermediateClass { - public Superclass() {} + public Superclass() { + } } @Schema(name = IntermediateClass.SCHEMA_NAME) diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeApi.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeApi.java index 621ed25d1..3d43fad08 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeApi.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeApi.java @@ -17,7 +17,7 @@ @RequestMapping("api/hello") public interface HomeApi { - @Operation(summary = "Upload new content", description = "Upload test content") - @PostMapping(produces = APPLICATION_JSON_VALUE, consumes = MULTIPART_FORM_DATA_VALUE) - HelloDto uploadContent(HelloUploadDto contentUploadDto) throws IOException; + @Operation(summary = "Upload new content", description = "Upload test content") + @PostMapping(produces = APPLICATION_JSON_VALUE, consumes = MULTIPART_FORM_DATA_VALUE) + HelloDto uploadContent(HelloUploadDto contentUploadDto) throws IOException; } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeController.java index a2eac75d2..c83749088 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app221/HomeController.java @@ -10,15 +10,15 @@ @RestController public class HomeController implements HomeApi { - - @Override - public HelloDto uploadContent(@Valid HelloUploadDto uploadDto) - throws IOException { - var fileBytes = uploadDto.file.getBytes(); - return new HelloDto(uploadDto.title, fileBytes); - } - public record HelloDto(String title, byte[] file) {} + @Override + public HelloDto uploadContent(@Valid HelloUploadDto uploadDto) + throws IOException { + var fileBytes = uploadDto.file.getBytes(); + return new HelloDto(uploadDto.title, fileBytes); + } - public record HelloUploadDto(@NotNull String title, MultipartFile file) {} + public record HelloDto(String title, byte[] file) {} + + public record HelloUploadDto(@NotNull String title, MultipartFile file) {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app222/SpringDocApp222Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app222/SpringDocApp222Test.java index ffa9bb163..f8672e66e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app222/SpringDocApp222Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app222/SpringDocApp222Test.java @@ -34,9 +34,6 @@ public class SpringDocApp222Test extends AbstractSpringDocTest { - @SpringBootApplication - static class SpringDocTestApp {} - @JsonTypeInfo(use = Id.NAME, property = "@type") @JsonSubTypes(@Type(CommonImplementor.class)) interface FirstHierarchy {} @@ -45,11 +42,15 @@ interface FirstHierarchy {} @JsonSubTypes(@Type(CommonImplementor.class)) interface SecondHierarchy {} - class CommonImplementor implements FirstHierarchy, SecondHierarchy {} + @SpringBootApplication + static class SpringDocTestApp {} - record CommonImplementorUser(FirstHierarchy firstHierarchy, SecondHierarchy secondHierarchy) {} + record CommonImplementorUser(FirstHierarchy firstHierarchy, + SecondHierarchy secondHierarchy) {} record FirstHierarchyUser(FirstHierarchy firstHierarchy) {} record SecondHierarchyUser(SecondHierarchy secondHierarchy) {} + + class CommonImplementor implements FirstHierarchy, SecondHierarchy {} } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/ARestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/ARestController.java index 46ce60f3f..b85eca55d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/ARestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/ARestController.java @@ -11,13 +11,13 @@ @RestController public class ARestController { - @PostMapping("/parent") - public Response parentEndpoint(@RequestBody AbstractParent parent) { - return null; - } + @PostMapping("/parent") + public Response parentEndpoint(@RequestBody AbstractParent parent) { + return null; + } - @PostMapping("/child") - public Response childEndpoint(@RequestBody AbstractChild child) { - return null; - } + @PostMapping("/child") + public Response childEndpoint(@RequestBody AbstractChild child) { + return null; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractChild.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractChild.java index 647bd004c..9118eee79 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractChild.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractChild.java @@ -26,7 +26,7 @@ public void setId(int id) { } } - class ChildType1 extends AbstractChild { +class ChildType1 extends AbstractChild { private String childType1Param; public ChildType1(int id, String childType1Param) { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractParent.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractParent.java index 1db34b92a..160c81c30 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractParent.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app223/apiobjects/AbstractParent.java @@ -29,6 +29,7 @@ public void setId(int id) { class ParentType1 extends AbstractParent { private String parentType1Param; + private AbstractChild abstractChild; public ParentType1(int id, String parentType1Param, AbstractChild abstractChild) { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/RootModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/RootModel.java index 8e4c9ce6a..728ff1b5f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/RootModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/RootModel.java @@ -4,24 +4,24 @@ public class RootModel { - private Integer rootProperty; + private Integer rootProperty; - private UnwrappedModel unwrappedModel; + private UnwrappedModel unwrappedModel; - public Integer getRootProperty() { - return rootProperty; - } + public Integer getRootProperty() { + return rootProperty; + } - public void setRootProperty(Integer rootProperty) { - this.rootProperty = rootProperty; - } + public void setRootProperty(Integer rootProperty) { + this.rootProperty = rootProperty; + } - @JsonUnwrapped - public UnwrappedModel getUnwrappedModel() { - return unwrappedModel; - } + @JsonUnwrapped + public UnwrappedModel getUnwrappedModel() { + return unwrappedModel; + } - public void setUnwrappedModel(UnwrappedModel unwrappedModel) { - this.unwrappedModel = unwrappedModel; - } + public void setUnwrappedModel(UnwrappedModel unwrappedModel) { + this.unwrappedModel = unwrappedModel; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/TestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/TestController.java index dea8c7feb..336cad045 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/TestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/TestController.java @@ -8,8 +8,8 @@ @RequestMapping("/api") public class TestController { - @GetMapping - public RootModel getRootModel() { - return new RootModel(); - } + @GetMapping + public RootModel getRootModel() { + return new RootModel(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/UnwrappedModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/UnwrappedModel.java index 1ea78b8d6..3faf4fe6e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/UnwrappedModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app224/UnwrappedModel.java @@ -2,13 +2,13 @@ public class UnwrappedModel { - private Integer unwrappedProperty; + private Integer unwrappedProperty; - public Integer getUnwrappedProperty() { - return unwrappedProperty; - } + public Integer getUnwrappedProperty() { + return unwrappedProperty; + } - public void setUnwrappedProperty(Integer unwrappedProperty) { - this.unwrappedProperty = unwrappedProperty; - } + public void setUnwrappedProperty(Integer unwrappedProperty) { + this.unwrappedProperty = unwrappedProperty; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app225/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app225/HelloController.java index 178598b6c..0d952bef2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app225/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app225/HelloController.java @@ -21,7 +21,7 @@ public void HelloController(@ParameterObject RequestDto requestDto) { } @JsonNaming(PropertyNamingStrategies.UpperSnakeCaseStrategy.class) - class RequestDto { +class RequestDto { private String personalNumber; public String getPersonalNumber() { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app226/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app226/HelloController.java index c7d4e5af1..47b6a8e79 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app226/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app226/HelloController.java @@ -28,7 +28,7 @@ public class HelloController { examples = @ExampleObject( name = "success", - value ="...")) + value = "...")) } ) public Map HelloController() { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/model/Item.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/model/Item.java index 4e3bee8ba..d290aa6e0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/model/Item.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/model/Item.java @@ -5,10 +5,10 @@ */ public record Item(String id, String type, T resource) { - /** - * Create Item object - */ - public static Item fromPayload(String id, String type, T payload) { - return new Item<>(id, type, payload); - } + /** + * Create Item object + */ + public static Item fromPayload(String id, String type, T payload) { + return new Item<>(id, type, payload); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/NoGenericWrapper.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/NoGenericWrapper.java index 798837bf1..71fd797b9 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/NoGenericWrapper.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/NoGenericWrapper.java @@ -6,7 +6,7 @@ import org.springframework.http.HttpStatusCode; public class NoGenericWrapper extends ResponseEntityWrapper { - public NoGenericWrapper(Item body, HttpStatusCode status) { - super(body, status); - } + public NoGenericWrapper(Item body, HttpStatusCode status) { + super(body, status); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/ResponseEntityWrapper.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/ResponseEntityWrapper.java index 8002762db..5d780b137 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/ResponseEntityWrapper.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app227/wrapper/ResponseEntityWrapper.java @@ -7,7 +7,7 @@ import org.springframework.http.ResponseEntity; public class ResponseEntityWrapper extends ResponseEntity> { - public ResponseEntityWrapper(Item body, HttpStatusCode status) { - super(body, status); - } + public ResponseEntityWrapper(Item body, HttpStatusCode status) { + super(body, status); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app228/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app228/HelloController.java index 5ea115c37..8350c5bca 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app228/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app228/HelloController.java @@ -23,7 +23,7 @@ public String swaggerTest(@RequestBody MyRequest myRequest) { } public class MyRequest { - @Schema(oneOf = {Child1.class, Child2.class}) + @Schema(oneOf = { Child1.class, Child2.class }) @JsonProperty private Parent parent; } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/LocaleParam.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/LocaleParam.java index 94afad322..84bcaee61 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/LocaleParam.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/LocaleParam.java @@ -44,7 +44,7 @@ /** * @author bnasslahsen */ -@Target({PARAMETER, METHOD, FIELD, ANNOTATION_TYPE}) +@Target({ PARAMETER, METHOD, FIELD, ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) @Parameter( examples = { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/SpringDocApp229Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/SpringDocApp229Test.java index 45ee13cfc..6ba510e5d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/SpringDocApp229Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app229/SpringDocApp229Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app229; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/App230RequestBody.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/App230RequestBody.java index ddf530836..24b759588 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/App230RequestBody.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/App230RequestBody.java @@ -13,9 +13,9 @@ /** * @author edudar */ -@Target({PARAMETER, METHOD, ANNOTATION_TYPE}) +@Target({ PARAMETER, METHOD, ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) @RequestBody(required = true) @interface App230RequestBody { - + } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/SpringDocApp230Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/SpringDocApp230Test.java index 24bb726e8..8f7db28f9 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/SpringDocApp230Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app230/SpringDocApp230Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app230; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/ApplicationsRestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/ApplicationsRestController.java index ae41a0676..021e5b2fe 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/ApplicationsRestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/ApplicationsRestController.java @@ -14,12 +14,12 @@ @RequestMapping(value = "/applications", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public class ApplicationsRestController { - @Operation(summary = "Parameter object") - @PostMapping("/parameter-object") - public Application createWithParameterObject( - @RequestBody @ParameterObject SubClass request - ) { - return new Application(); - } + @Operation(summary = "Parameter object") + @PostMapping("/parameter-object") + public Application createWithParameterObject( + @RequestBody @ParameterObject SubClass request + ) { + return new Application(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SpringDocApp231Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SpringDocApp231Test.java index bd968441b..3045371f5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SpringDocApp231Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SpringDocApp231Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app231; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SubClass.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SubClass.java index 86b854eed..4d3f2e592 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SubClass.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SubClass.java @@ -5,13 +5,13 @@ @Schema(description = "Used to create a new application") public class SubClass extends SuperClass { - public SubClass(String name) { - super(name); - } + public SubClass(String name) { + super(name); + } - @Override - @Schema(description = "Overriding the description in sub class") - public String getName() { - return super.getName(); - } + @Override + @Schema(description = "Overriding the description in sub class") + public String getName() { + return super.getName(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SuperClass.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SuperClass.java index 5d57d76d0..5dddeaca4 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SuperClass.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app231/SuperClass.java @@ -4,15 +4,15 @@ import jakarta.validation.constraints.Size; public class SuperClass { - @Size(min = 1, max = 30) - @Schema(description = "Description from the super class") - private String name; + @Size(min = 1, max = 30) + @Schema(description = "Description from the super class") + private String name; - public SuperClass(String name) { - this.name = name; - } + public SuperClass(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app232/SpringDocApp232Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app232/SpringDocApp232Test.java index 8b224cde2..d9c62efe8 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app232/SpringDocApp232Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app232/SpringDocApp232Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app232; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/ParameterController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/ParameterController.java index d027a2400..16bbde25d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/ParameterController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/ParameterController.java @@ -38,58 +38,58 @@ @RestController public class ParameterController { - @GetMapping("/hidden-parent") - public void nestedParameterObjectWithHiddenParentField(@ParameterObject ParameterObjectWithHiddenField parameters) { + @GetMapping("/hidden-parent") + public void nestedParameterObjectWithHiddenParentField(@ParameterObject ParameterObjectWithHiddenField parameters) { - } + } - public record ParameterObjectWithHiddenField( - @Schema(hidden = true) NestedParameterObject schemaHiddenNestedParameterObject, - @Parameter(hidden = true) NestedParameterObject parameterHiddenNestedParameterObject, - NestedParameterObject visibleNestedParameterObject - ) { + @GetMapping("/renamed-parent") + public void nestedParameterObjectWithRenamedParentField(@ParameterObject ParameterObjectWithRenamedField parameters) { - } + } - public record NestedParameterObject( - String parameterField) { - } + @GetMapping("/optional-parent") + public void nestedParameterObjectWithOptionalParentField(@Valid @ParameterObject MultiFieldParameterObject parameters) { - @GetMapping("/renamed-parent") - public void nestedParameterObjectWithRenamedParentField(@ParameterObject ParameterObjectWithRenamedField parameters) { + } - } + public record ParameterObjectWithHiddenField( + @Schema(hidden = true) NestedParameterObject schemaHiddenNestedParameterObject, + @Parameter(hidden = true) NestedParameterObject parameterHiddenNestedParameterObject, + NestedParameterObject visibleNestedParameterObject + ) { - public record ParameterObjectWithRenamedField( - @Schema(name = "schemaRenamed") NestedParameterObject schemaRenamedNestedParameterObject, - @Parameter(name = "parameterRenamed") NestedParameterObject parameterRenamedNestedParameterObject, - NestedParameterObject originalNameNestedParameterObject - ) { + } - } + public record NestedParameterObject( + String parameterField) { + } - @GetMapping("/optional-parent") - public void nestedParameterObjectWithOptionalParentField(@Valid @ParameterObject MultiFieldParameterObject parameters) { + public record ParameterObjectWithRenamedField( + @Schema(name = "schemaRenamed") NestedParameterObject schemaRenamedNestedParameterObject, + @Parameter(name = "parameterRenamed") NestedParameterObject parameterRenamedNestedParameterObject, + NestedParameterObject originalNameNestedParameterObject + ) { - } + } - public record MultiFieldParameterObject( - @Valid @Schema(requiredMode = RequiredMode.REQUIRED) @NotNull MultiFieldNestedParameterObject requiredNotNullParameterObject, - @Valid @Schema(requiredMode = RequiredMode.REQUIRED) MultiFieldNestedParameterObject requiredNoValidationParameterObject, - @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull MultiFieldNestedParameterObject notRequiredNotNullParameterObject, - @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) MultiFieldNestedParameterObject notRequiredNoValidationParameterObject, - @Valid @NotNull MultiFieldNestedParameterObject noSchemaNotNullParameterObject, - @Valid MultiFieldNestedParameterObject noSchemaNoValidationParameterObject) { + public record MultiFieldParameterObject( + @Valid @Schema(requiredMode = RequiredMode.REQUIRED) @NotNull MultiFieldNestedParameterObject requiredNotNullParameterObject, + @Valid @Schema(requiredMode = RequiredMode.REQUIRED) MultiFieldNestedParameterObject requiredNoValidationParameterObject, + @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull MultiFieldNestedParameterObject notRequiredNotNullParameterObject, + @Valid @Schema(requiredMode = RequiredMode.NOT_REQUIRED) MultiFieldNestedParameterObject notRequiredNoValidationParameterObject, + @Valid @NotNull MultiFieldNestedParameterObject noSchemaNotNullParameterObject, + @Valid MultiFieldNestedParameterObject noSchemaNoValidationParameterObject) { - } + } - public record MultiFieldNestedParameterObject ( - @Schema(requiredMode = RequiredMode.REQUIRED) @NotNull String requiredNotNullField, - @Schema(requiredMode = RequiredMode.REQUIRED) String requiredNoValidationField, - @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull String notRequiredNotNullField, - @Schema(requiredMode = RequiredMode.NOT_REQUIRED) String notRequiredNoValidationField, - @NotNull String noSchemaNotNullField, - String noSchemaNoValidationField) { - } + public record MultiFieldNestedParameterObject( + @Schema(requiredMode = RequiredMode.REQUIRED) @NotNull String requiredNotNullField, + @Schema(requiredMode = RequiredMode.REQUIRED) String requiredNoValidationField, + @Schema(requiredMode = RequiredMode.NOT_REQUIRED) @NotNull String notRequiredNotNullField, + @Schema(requiredMode = RequiredMode.NOT_REQUIRED) String notRequiredNoValidationField, + @NotNull String noSchemaNotNullField, + String noSchemaNoValidationField) { + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/SpringDocApp233Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/SpringDocApp233Test.java index 21ca8c25e..b3e786b15 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/SpringDocApp233Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app233/SpringDocApp233Test.java @@ -57,130 +57,130 @@ */ class SpringDocApp233Test extends AbstractSpringDocTest { - @CsvSource({"requiredNotNullParameterObject.requiredNotNullField, true", - "requiredNotNullParameterObject.requiredNoValidationField, true", - "requiredNotNullParameterObject.notRequiredNotNullField, false", - "requiredNotNullParameterObject.notRequiredNoValidationField, false", - "requiredNotNullParameterObject.noSchemaNotNullField, true", - "requiredNotNullParameterObject.noSchemaNoValidationField, false", - "requiredNoValidationParameterObject.requiredNotNullField, true", - "requiredNoValidationParameterObject.requiredNoValidationField, true", - "requiredNoValidationParameterObject.notRequiredNotNullField, false", - "requiredNoValidationParameterObject.notRequiredNoValidationField, false", - "requiredNoValidationParameterObject.noSchemaNotNullField, true", - "requiredNoValidationParameterObject.noSchemaNoValidationField, false", - "notRequiredNotNullParameterObject.requiredNotNullField, true", - "notRequiredNotNullParameterObject.requiredNoValidationField, true", - "notRequiredNotNullParameterObject.notRequiredNotNullField, false", - "notRequiredNotNullParameterObject.notRequiredNoValidationField, false", - "notRequiredNotNullParameterObject.noSchemaNotNullField, false", - "notRequiredNotNullParameterObject.noSchemaNoValidationField, false", - "notRequiredNoValidationParameterObject.requiredNotNullField, true", - "notRequiredNoValidationParameterObject.requiredNoValidationField, true", - "notRequiredNoValidationParameterObject.notRequiredNotNullField, false", - "notRequiredNoValidationParameterObject.notRequiredNoValidationField, false", - "notRequiredNoValidationParameterObject.noSchemaNotNullField, false", - "notRequiredNoValidationParameterObject.noSchemaNoValidationField, false", - "noSchemaNotNullParameterObject.requiredNotNullField, true", - "noSchemaNotNullParameterObject.requiredNoValidationField, true", - "noSchemaNotNullParameterObject.notRequiredNotNullField, false", - "noSchemaNotNullParameterObject.notRequiredNoValidationField, false", - "noSchemaNotNullParameterObject.noSchemaNotNullField, true", - "noSchemaNotNullParameterObject.noSchemaNoValidationField, false", - "noSchemaNoValidationParameterObject.requiredNotNullField, true", - "noSchemaNoValidationParameterObject.requiredNoValidationField, true", - "noSchemaNoValidationParameterObject.notRequiredNotNullField, false", - "noSchemaNoValidationParameterObject.notRequiredNoValidationField, false", - "noSchemaNoValidationParameterObject.noSchemaNotNullField, false", - "noSchemaNoValidationParameterObject.noSchemaNoValidationField, false"}) - @ParameterizedTest - void shouldHaveCorrectRequireStatus(String field, String required) throws Exception { - MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); - String result = mockMvcResult.getResponse().getContentAsString(); - - String requiredMode = ((JSONArray) JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.name == '" + field + "')].required")).get(0).toString(); - assertThat(requiredMode).isEqualTo(required); - } - - @Test - void shouldMatchSwaggerFieldRequirementsMatchJavaValidation() throws Exception { - MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); - String result = mockMvcResult.getResponse().getContentAsString(); - - JSONArray allFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[*].name"); - List allFields = allFieldsJsonArray.stream().map(Object::toString).toList(); - - // check we get no validation failures when all mandatory fields are present - verifySwaggerFieldRequirementsMatchJavaValidation(allFields, List.of()); - - JSONArray mandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == true)].name"); - List mandatoryFields = mandatoryFieldsJsonArray.stream().map(Object::toString).toList(); - - // check validation failures when each individual mandatory field is missing - for (String mandatoryField : mandatoryFields) { - List filteredFields = allFields.stream() - .filter(field -> !field.equals(mandatoryField)) - .toList(); - - List expectedErrors = Stream.of(mandatoryField) - // Fields using Swagger annotations to drive required status but not using Java validation to enforce it so don't cause validation errors - .filter(field -> !field.endsWith("requiredNullableField")) - .filter(field -> !field.endsWith("requiredNoValidationField")) - // the error is returned prefixed with the query parameter name, so add it to the expected error message - .map(field -> "multiFieldParameterObject." + field) - .toList(); - verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); - } - - - JSONArray nonMandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == false)].name"); - List nonMandatoryFields = nonMandatoryFieldsJsonArray.stream().map(Object::toString).toList(); - - // check validation failures for any individual non-mandatory fields being missed - for (String nonMandatoryField : nonMandatoryFields) { - List filteredFields = allFields.stream() - .filter(field -> !field.equals(nonMandatoryField)) - .toList(); - - List expectedErrors = Stream.of(nonMandatoryField) - // Fields that are mandatory but either have nullable parent fields so are excluded in swagger or are marked as not required so do cause validation errors - .filter(field -> field.endsWith("NotNullField")) - // the error is returned prefixed with the query parameter name, so add it to the expected error message - .map(field -> "multiFieldParameterObject." + field) - .toList(); - verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); - } - } - - private void verifySwaggerFieldRequirementsMatchJavaValidation(Collection requestFields, Collection expectedErrorFields) throws Exception { - MockHttpServletRequestBuilder request = get("/optional-parent"); - for (String mandatoryField : requestFields) { - request.queryParam(mandatoryField, mandatoryField + ".value"); - } - - mockMvc.perform(request) - .andExpect(result -> { - - Set errorFields = Optional.ofNullable(result.getResolvedException()) - .map(MethodArgumentNotValidException.class::cast) - .map(MethodArgumentNotValidException::getBindingResult) - .map(BindingResult::getFieldErrors) - .stream() - .flatMap(Collection::stream) - .map(field -> field.getObjectName() + "." + field.getField()) - .collect(Collectors.toCollection(LinkedHashSet::new)); - - - assertThat(errorFields).containsExactlyElementsOf(expectedErrorFields); - - assertThat(result.getResponse().getStatus()).isEqualTo(expectedErrorFields.isEmpty() ? 200 : 400); - }); - } - - - @SpringBootApplication - static class SpringDocTestApp { - - } + @CsvSource({ "requiredNotNullParameterObject.requiredNotNullField, true", + "requiredNotNullParameterObject.requiredNoValidationField, true", + "requiredNotNullParameterObject.notRequiredNotNullField, false", + "requiredNotNullParameterObject.notRequiredNoValidationField, false", + "requiredNotNullParameterObject.noSchemaNotNullField, true", + "requiredNotNullParameterObject.noSchemaNoValidationField, false", + "requiredNoValidationParameterObject.requiredNotNullField, true", + "requiredNoValidationParameterObject.requiredNoValidationField, true", + "requiredNoValidationParameterObject.notRequiredNotNullField, false", + "requiredNoValidationParameterObject.notRequiredNoValidationField, false", + "requiredNoValidationParameterObject.noSchemaNotNullField, true", + "requiredNoValidationParameterObject.noSchemaNoValidationField, false", + "notRequiredNotNullParameterObject.requiredNotNullField, true", + "notRequiredNotNullParameterObject.requiredNoValidationField, true", + "notRequiredNotNullParameterObject.notRequiredNotNullField, false", + "notRequiredNotNullParameterObject.notRequiredNoValidationField, false", + "notRequiredNotNullParameterObject.noSchemaNotNullField, false", + "notRequiredNotNullParameterObject.noSchemaNoValidationField, false", + "notRequiredNoValidationParameterObject.requiredNotNullField, true", + "notRequiredNoValidationParameterObject.requiredNoValidationField, true", + "notRequiredNoValidationParameterObject.notRequiredNotNullField, false", + "notRequiredNoValidationParameterObject.notRequiredNoValidationField, false", + "notRequiredNoValidationParameterObject.noSchemaNotNullField, false", + "notRequiredNoValidationParameterObject.noSchemaNoValidationField, false", + "noSchemaNotNullParameterObject.requiredNotNullField, true", + "noSchemaNotNullParameterObject.requiredNoValidationField, true", + "noSchemaNotNullParameterObject.notRequiredNotNullField, false", + "noSchemaNotNullParameterObject.notRequiredNoValidationField, false", + "noSchemaNotNullParameterObject.noSchemaNotNullField, true", + "noSchemaNotNullParameterObject.noSchemaNoValidationField, false", + "noSchemaNoValidationParameterObject.requiredNotNullField, true", + "noSchemaNoValidationParameterObject.requiredNoValidationField, true", + "noSchemaNoValidationParameterObject.notRequiredNotNullField, false", + "noSchemaNoValidationParameterObject.notRequiredNoValidationField, false", + "noSchemaNoValidationParameterObject.noSchemaNotNullField, false", + "noSchemaNoValidationParameterObject.noSchemaNoValidationField, false" }) + @ParameterizedTest + void shouldHaveCorrectRequireStatus(String field, String required) throws Exception { + MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); + String result = mockMvcResult.getResponse().getContentAsString(); + + String requiredMode = ((JSONArray) JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.name == '" + field + "')].required")).get(0).toString(); + assertThat(requiredMode).isEqualTo(required); + } + + @Test + void shouldMatchSwaggerFieldRequirementsMatchJavaValidation() throws Exception { + MvcResult mockMvcResult = mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk()).andReturn(); + String result = mockMvcResult.getResponse().getContentAsString(); + + JSONArray allFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[*].name"); + List allFields = allFieldsJsonArray.stream().map(Object::toString).toList(); + + // check we get no validation failures when all mandatory fields are present + verifySwaggerFieldRequirementsMatchJavaValidation(allFields, List.of()); + + JSONArray mandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == true)].name"); + List mandatoryFields = mandatoryFieldsJsonArray.stream().map(Object::toString).toList(); + + // check validation failures when each individual mandatory field is missing + for (String mandatoryField : mandatoryFields) { + List filteredFields = allFields.stream() + .filter(field -> !field.equals(mandatoryField)) + .toList(); + + List expectedErrors = Stream.of(mandatoryField) + // Fields using Swagger annotations to drive required status but not using Java validation to enforce it so don't cause validation errors + .filter(field -> !field.endsWith("requiredNullableField")) + .filter(field -> !field.endsWith("requiredNoValidationField")) + // the error is returned prefixed with the query parameter name, so add it to the expected error message + .map(field -> "multiFieldParameterObject." + field) + .toList(); + verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); + } + + + JSONArray nonMandatoryFieldsJsonArray = JsonPath.parse(result).read("$.paths.['/optional-parent'].get.parameters[?(@.required == false)].name"); + List nonMandatoryFields = nonMandatoryFieldsJsonArray.stream().map(Object::toString).toList(); + + // check validation failures for any individual non-mandatory fields being missed + for (String nonMandatoryField : nonMandatoryFields) { + List filteredFields = allFields.stream() + .filter(field -> !field.equals(nonMandatoryField)) + .toList(); + + List expectedErrors = Stream.of(nonMandatoryField) + // Fields that are mandatory but either have nullable parent fields so are excluded in swagger or are marked as not required so do cause validation errors + .filter(field -> field.endsWith("NotNullField")) + // the error is returned prefixed with the query parameter name, so add it to the expected error message + .map(field -> "multiFieldParameterObject." + field) + .toList(); + verifySwaggerFieldRequirementsMatchJavaValidation(filteredFields, expectedErrors); + } + } + + private void verifySwaggerFieldRequirementsMatchJavaValidation(Collection requestFields, Collection expectedErrorFields) throws Exception { + MockHttpServletRequestBuilder request = get("/optional-parent"); + for (String mandatoryField : requestFields) { + request.queryParam(mandatoryField, mandatoryField + ".value"); + } + + mockMvc.perform(request) + .andExpect(result -> { + + Set errorFields = Optional.ofNullable(result.getResolvedException()) + .map(MethodArgumentNotValidException.class::cast) + .map(MethodArgumentNotValidException::getBindingResult) + .map(BindingResult::getFieldErrors) + .stream() + .flatMap(Collection::stream) + .map(field -> field.getObjectName() + "." + field.getField()) + .collect(Collectors.toCollection(LinkedHashSet::new)); + + + assertThat(errorFields).containsExactlyElementsOf(expectedErrorFields); + + assertThat(result.getResponse().getStatus()).isEqualTo(expectedErrorFields.isEmpty() ? 200 : 400); + }); + } + + + @SpringBootApplication + static class SpringDocTestApp { + + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app234/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app234/HelloController.java index e6cb4e638..70fdfb415 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app234/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app234/HelloController.java @@ -32,7 +32,7 @@ @RestController public class HelloController { - + @GetMapping("/test") String test(MyObj obj) { return obj.getContent(); diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/MyDebugController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/MyDebugController.java index a2115c209..3a60bd075 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/MyDebugController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/MyDebugController.java @@ -51,7 +51,7 @@ public ResponseEntity getWildcard(String wildcard) { // THIS ONE IS MISSING @PostMapping(value = "/debug/{*wildcard}") - public ResponseEntity postWildcard(String wildcard) { + public ResponseEntity postWildcard(String wildcard) { return new ResponseEntity<>("", HttpStatus.NO_CONTENT); } @@ -61,7 +61,7 @@ public ResponseEntity get(String simple) { } @PostMapping(value = "/debug/{simple}") - public ResponseEntity post(String simple) { + public ResponseEntity post(String simple) { return new ResponseEntity<>("", HttpStatus.NO_CONTENT); } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/SpringDocApp235Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/SpringDocApp235Test.java index ca319c40f..50d848ef1 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/SpringDocApp235Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app235/SpringDocApp235Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app235; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassOne.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassOne.java index 054d4a5f9..16154aba2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassOne.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassOne.java @@ -5,8 +5,8 @@ public class ClassOne { - @Valid - private ClassTwo description; + @Valid + private ClassTwo description; public @Valid ClassTwo getDescription() { return description; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassTwo.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassTwo.java index 86d1dd233..86446900e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassTwo.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/ClassTwo.java @@ -7,8 +7,8 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class ClassTwo { - @NotNull - private String name; + @NotNull + private String name; public @NotNull String getName() { return name; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/HelloController.java index 6cf7040bb..395b2596b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/HelloController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/HelloController.java @@ -13,13 +13,13 @@ @RestController public class HelloController { - @PostMapping(path = "/testOne", consumes = MediaType.APPLICATION_JSON_VALUE) - ResponseEntity testOne(@ParameterObject @Valid ClassOne test) { - return ResponseEntity.ok("ok"); - } + @PostMapping(path = "/testOne", consumes = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity testOne(@ParameterObject @Valid ClassOne test) { + return ResponseEntity.ok("ok"); + } - @PostMapping(path = "/testTwo", consumes = MediaType.APPLICATION_JSON_VALUE) - ResponseEntity testTwo(@RequestBody ClassOne test) { - return ResponseEntity.ok("ok"); - } + @PostMapping(path = "/testTwo", consumes = MediaType.APPLICATION_JSON_VALUE) + ResponseEntity testTwo(@RequestBody ClassOne test) { + return ResponseEntity.ok("ok"); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/SpringDocApp236Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/SpringDocApp236Test.java index 7266e0f04..00a3ac5b0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/SpringDocApp236Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app236/SpringDocApp236Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app236; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/OpenApiConfiguration.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/OpenApiConfiguration.java index ecd0a79d5..0417b857e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/OpenApiConfiguration.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/OpenApiConfiguration.java @@ -10,23 +10,23 @@ @Configuration public class OpenApiConfiguration { - public OpenApiConfiguration() { - // LocalTime support - PrimitiveType.enablePartialTime(); - } + public OpenApiConfiguration() { + // LocalTime support + PrimitiveType.enablePartialTime(); + } - private OpenAPI standardOpenApi() { - String title = getClass().getPackage().getImplementationTitle(); - String version = getClass().getPackage().getImplementationVersion(); - return new OpenAPI() - .info(new Info() - .title(title == null ? "DEV" : title) - .version(version == null ? "local" : version)); - } + private OpenAPI standardOpenApi() { + String title = getClass().getPackage().getImplementationTitle(); + String version = getClass().getPackage().getImplementationVersion(); + return new OpenAPI() + .info(new Info() + .title(title == null ? "DEV" : title) + .version(version == null ? "local" : version)); + } - @Bean - public OpenAPI devOpenApi() { - return standardOpenApi(); - } + @Bean + public OpenAPI devOpenApi() { + return standardOpenApi(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/SpringDocApp237Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/SpringDocApp237Test.java index 0e0c406c6..8589afb8d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/SpringDocApp237Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/SpringDocApp237Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app237; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/UnwrappedController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/UnwrappedController.java index 41290dc02..776155351 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/UnwrappedController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/UnwrappedController.java @@ -12,13 +12,13 @@ @RestController public class UnwrappedController { - @GetMapping("/") - @ResponseStatus(HttpStatus.OK) - @Operation(summary = "Simple get task") - @ApiResponse(responseCode = "200", description = "Task has been started") - @ApiResponse(responseCode = "404", description = "Task was not found") - @ApiResponse(responseCode = "409", description = "Task is already running") - public Example exampleGet() { - return new Example(new Example.Wrapped("Some value"), 1); - } + @GetMapping("/") + @ResponseStatus(HttpStatus.OK) + @Operation(summary = "Simple get task") + @ApiResponse(responseCode = "200", description = "Task has been started") + @ApiResponse(responseCode = "404", description = "Task was not found") + @ApiResponse(responseCode = "409", description = "Task is already running") + public Example exampleGet() { + return new Example(new Example.Wrapped("Some value"), 1); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/dto/Example.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/dto/Example.java index 2f63b07ae..ad5af973f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/dto/Example.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app237/dto/Example.java @@ -4,16 +4,16 @@ import io.swagger.v3.oas.annotations.media.Schema; public record Example( - @JsonUnwrapped - @Schema(requiredMode = Schema.RequiredMode.REQUIRED) - Wrapped unwrapped, + @JsonUnwrapped + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) + Wrapped unwrapped, - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description") - Integer number + @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description") + Integer number ) { - public record Wrapped( - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description of value") - String value - ) { - } + public record Wrapped( + @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Some description of value") + String value + ) { + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/RootModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/RootModel.java index ea8b4261f..5ca3c85ec 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/RootModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/RootModel.java @@ -4,24 +4,24 @@ public class RootModel { - private Integer rootProperty; + private Integer rootProperty; - @JsonUnwrapped - private UnwrappedModel unwrappedModel; + @JsonUnwrapped + private UnwrappedModel unwrappedModel; - public Integer getRootProperty() { - return rootProperty; - } + public Integer getRootProperty() { + return rootProperty; + } - public void setRootProperty(Integer rootProperty) { - this.rootProperty = rootProperty; - } + public void setRootProperty(Integer rootProperty) { + this.rootProperty = rootProperty; + } - public UnwrappedModel getUnwrappedModel() { - return unwrappedModel; - } + public UnwrappedModel getUnwrappedModel() { + return unwrappedModel; + } - public void setUnwrappedModel(UnwrappedModel unwrappedModel) { - this.unwrappedModel = unwrappedModel; - } + public void setUnwrappedModel(UnwrappedModel unwrappedModel) { + this.unwrappedModel = unwrappedModel; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/SpringDocApp239Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/SpringDocApp239Test.java index efa593ebc..39043b27d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/SpringDocApp239Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/SpringDocApp239Test.java @@ -24,9 +24,10 @@ package test.org.springdoc.api.v31.app239; -import org.springframework.boot.autoconfigure.SpringBootApplication; import test.org.springdoc.api.v31.AbstractSpringDocTest; +import org.springframework.boot.autoconfigure.SpringBootApplication; + public class SpringDocApp239Test extends AbstractSpringDocTest { @SpringBootApplication diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/TestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/TestController.java index 623fbaefa..4861a9ac7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/TestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/TestController.java @@ -8,8 +8,8 @@ @RequestMapping("/api") public class TestController { - @GetMapping - public RootModel getRootModel() { - return new RootModel(); - } + @GetMapping + public RootModel getRootModel() { + return new RootModel(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/UnwrappedModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/UnwrappedModel.java index ab4776f64..dfacd488c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/UnwrappedModel.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app239/UnwrappedModel.java @@ -2,13 +2,13 @@ public class UnwrappedModel { - private Integer unwrappedProperty; + private Integer unwrappedProperty; - public Integer getUnwrappedProperty() { - return unwrappedProperty; - } + public Integer getUnwrappedProperty() { + return unwrappedProperty; + } - public void setUnwrappedProperty(Integer unwrappedProperty) { - this.unwrappedProperty = unwrappedProperty; - } + public void setUnwrappedProperty(Integer unwrappedProperty) { + this.unwrappedProperty = unwrappedProperty; + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/SpringDocApp240Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/SpringDocApp240Test.java index 39e9ac2c4..e791db3e5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/SpringDocApp240Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/SpringDocApp240Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app240; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/WildcardController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/WildcardController.java index 34c01dfb8..a5008a974 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/WildcardController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app240/WildcardController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app240; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/DemoRestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/DemoRestController.java index edbc59b8f..c46a71807 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/DemoRestController.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/DemoRestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app241; @@ -47,28 +47,28 @@ @RequestMapping("/demo") public class DemoRestController { - @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE) - public Set getDemo( - @Parameter(required = false, description = "Very important description.") - @RequestParam(name = "darstellung", required = false) final Optional darstellung) { - return new HashSet<>(); - } - - @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity setDemo(@RequestBody final String str) { - return ResponseEntity.noContent().build(); - } + @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE) + public Set getDemo( + @Parameter(required = false, description = "Very important description.") + @RequestParam(name = "darstellung", required = false) final Optional darstellung) { + return new HashSet<>(); + } + + @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity setDemo(@RequestBody final String str) { + return ResponseEntity.noContent().build(); + } - @GetMapping(value = "/{vvpId}", produces = MediaType.APPLICATION_JSON_VALUE) - public String getDemo(@PathVariable("vvpId") final Long vvpId) { - return "Test"; - } + @GetMapping(value = "/{vvpId}", produces = MediaType.APPLICATION_JSON_VALUE) + public String getDemo(@PathVariable("vvpId") final Long vvpId) { + return "Test"; + } - @PatchMapping("/{vvpId}") - public ResponseEntity patchDemo(@PathVariable("vvpId") final Long idVerfahren, - @RequestBody() final String jsonPatch, - final Optional statusKinderAendern) { - return ResponseEntity.noContent().build(); - } + @PatchMapping("/{vvpId}") + public ResponseEntity patchDemo(@PathVariable("vvpId") final Long idVerfahren, + @RequestBody() final String jsonPatch, + final Optional statusKinderAendern) { + return ResponseEntity.noContent().build(); + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/OpenApiConfig.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/OpenApiConfig.java index 9cc00301d..f60639c2c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/OpenApiConfig.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app241; @@ -36,24 +36,24 @@ @Configuration public class OpenApiConfig { - @Bean - public OpenApiCustomizer openApiCustomiser() { - return openApi -> { - - }; - } - - @Bean - ServerBaseUrlCustomizer serverBaseUrlCustomizer() { - return new ServerBaseUrlCustomizer() { - - @Override - public String customize(final String serverBaseUrl, - final HttpRequest request) { - // TODO Auto-generated method stub - return null; - } - - }; - } + @Bean + public OpenApiCustomizer openApiCustomiser() { + return openApi -> { + + }; + } + + @Bean + ServerBaseUrlCustomizer serverBaseUrlCustomizer() { + return new ServerBaseUrlCustomizer() { + + @Override + public String customize(final String serverBaseUrl, + final HttpRequest request) { + // TODO Auto-generated method stub + return null; + } + + }; + } } \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/SpringDocApp241Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/SpringDocApp241Test.java index d4027b764..fdb7e15ee 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/SpringDocApp241Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app241/SpringDocApp241Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app241; @@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = "springdoc.api-docs.resolve-schema-properties=true" ) +@TestPropertySource(properties = "springdoc.api-docs.resolve-schema-properties=true") public class SpringDocApp241Test extends AbstractSpringDocTest { @SpringBootApplication diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/RootModel.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/RootModel.java new file mode 100644 index 000000000..2d8a46ea6 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/RootModel.java @@ -0,0 +1,41 @@ +package test.org.springdoc.api.v31.app242; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonUnwrapped; + +public class RootModel { + + private Integer rootProperty; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonUnwrapped + private UnwrappedModelOne unwrappedModelOne; + + private UnwrappedModelTwo unwrappedModelTwo; + + public Integer getRootProperty() { + return rootProperty; + } + + public void setRootProperty(Integer rootProperty) { + this.rootProperty = rootProperty; + } + + public UnwrappedModelOne getUnwrappedModelOne() { + return unwrappedModelOne; + } + + public void setUnwrappedModelOne(UnwrappedModelOne unwrappedModelOne) { + this.unwrappedModelOne = unwrappedModelOne; + } + + public UnwrappedModelTwo getUnwrappedModelTwo() { + return unwrappedModelTwo; + } + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @JsonUnwrapped + public void setUnwrappedModelTwo(UnwrappedModelTwo unwrappedModelTwo) { + this.unwrappedModelTwo = unwrappedModelTwo; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/SpringDocApp242Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/SpringDocApp242Test.java new file mode 100644 index 000000000..0479825a4 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/SpringDocApp242Test.java @@ -0,0 +1,35 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app242; + +import test.org.springdoc.api.v30.AbstractSpringDocV30Test; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +public class SpringDocApp242Test extends AbstractSpringDocV30Test { + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/TestController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/TestController.java new file mode 100644 index 000000000..c3ad2f7e4 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/TestController.java @@ -0,0 +1,15 @@ +package test.org.springdoc.api.v31.app242; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api") +public class TestController { + + @GetMapping + public RootModel getRootModel() { + return new RootModel(); + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/UnwrappedModelOne.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/UnwrappedModelOne.java new file mode 100644 index 000000000..a7184a701 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/UnwrappedModelOne.java @@ -0,0 +1,14 @@ +package test.org.springdoc.api.v31.app242; + +public class UnwrappedModelOne { + + private Integer unwrappedOneProperty; + + public Integer getUnwrappedOneProperty() { + return unwrappedOneProperty; + } + + public void setUnwrappedOneProperty(Integer unwrappedOneProperty) { + this.unwrappedOneProperty = unwrappedOneProperty; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/UnwrappedModelTwo.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/UnwrappedModelTwo.java new file mode 100644 index 000000000..bf17c48cb --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app242/UnwrappedModelTwo.java @@ -0,0 +1,14 @@ +package test.org.springdoc.api.v31.app242; + +public class UnwrappedModelTwo { + + private Integer unwrappedTwoProperty; + + public Integer getUnwrappedTwoProperty() { + return unwrappedTwoProperty; + } + + public void setUnwrappedTwoProperty(Integer unwrappedTwoProperty) { + this.unwrappedTwoProperty = unwrappedTwoProperty; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app243/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app243/HelloController.java new file mode 100644 index 000000000..16ea52b9a --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app243/HelloController.java @@ -0,0 +1,28 @@ +package test.org.springdoc.api.v31.app243; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.MonthDay; +import java.time.Year; +import java.time.YearMonth; + +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @PostMapping("/time1") + public TimeDtoNoAnnotations postTime1( + @RequestBody TimeDtoNoAnnotations timeDto) { + return timeDto; + } + + public record TimeDtoNoAnnotations(LocalDateTime localDateTime, + LocalDate localDate, LocalTime localTime, + YearMonth yearMonth, MonthDay monthDay, + Year year) { + } +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app243/SpringDocApp243Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app243/SpringDocApp243Test.java new file mode 100644 index 000000000..89fe8da5c --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app243/SpringDocApp243Test.java @@ -0,0 +1,37 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app243; + +import test.org.springdoc.api.v31.AbstractSpringDocTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +public class SpringDocApp243Test extends AbstractSpringDocTest { + + @SpringBootApplication + static class SpringDocTestApp {} +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app244/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app244/HelloController.java new file mode 100644 index 000000000..7e87f0ce3 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app244/HelloController.java @@ -0,0 +1,89 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app244; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.headers.Header; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/test") +public class HelloController { + + @PostMapping + @ApiResponse( + responseCode = "201", + description = "Created", + headers = { + @Header(name = "Location", required = true, schema = @Schema(type = "string")) + } + ) + public void uploadMultipartWithBody() { + } + + @GetMapping + @io.swagger.v3.oas.annotations.Parameter( + in = ParameterIn.HEADER, + name = "x-header", + examples = { + @ExampleObject(value = "AAA", name = "First"), + @ExampleObject(value = "BBB", name = "Second"), + @ExampleObject(value = "CCC", name = "Third") + }) + void nope() { + } + + @PutMapping(value = "/{id}") + @Parameter( + in = ParameterIn.PATH, + name = "id", + description = "ID of the user to update", + required = true, + content = @Content(schema = @Schema(type = "integer"))) + @Operation(summary = "Update a user by passing the entire object") + public void update( + @PathVariable("id") @NotNull final String id, + @Valid @RequestBody @NotNull final String user, + @Parameter(hidden = true) String spec) { + } + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app244/SpringDocApp244Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app244/SpringDocApp244Test.java new file mode 100644 index 000000000..0d745d6de --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app244/SpringDocApp244Test.java @@ -0,0 +1,37 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app244; + +import test.org.springdoc.api.v31.AbstractSpringDocTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +public class SpringDocApp244Test extends AbstractSpringDocTest { + + @SpringBootApplication + static class SpringDocTestApp {} +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/HelloController.java new file mode 100644 index 000000000..a146cb3e3 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/HelloController.java @@ -0,0 +1,31 @@ +package test.org.springdoc.api.v31.app245; + +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.extensions.Extension; +import io.swagger.v3.oas.annotations.extensions.ExtensionProperty; +import io.swagger.v3.oas.annotations.info.Info; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@SpringBootApplication +@OpenAPIDefinition( + info = @Info( + title = "My App", + version = "${springdoc.version}", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = "x-build-time", value = "${git.build.time}") + }) + } + ) +) +@RestController +public class HelloController { + + @GetMapping("/hello") + public String hello() { + return "hello"; + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/SpringDocApp245Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/SpringDocApp245Test.java new file mode 100644 index 000000000..c6d8a3e17 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app245/SpringDocApp245Test.java @@ -0,0 +1,32 @@ +package test.org.springdoc.api.v31.app245; + +import org.junit.jupiter.api.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.web.servlet.MockMvc; + +import static org.hamcrest.Matchers.is; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@SpringBootTest(properties = { + "springdoc.version=v1", + "git.build.time=2025-07-08T12:00:00Z" +}) +@AutoConfigureMockMvc +class SpringDocApp245Test { + + @Autowired + private MockMvc mockMvc; + + @Test + void SpringDocTestApp() throws Exception { + mockMvc.perform(get("/v3/api-docs")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.info.version", is("v1"))) + .andExpect(jsonPath("$.info.x-build-time", is("2025-07-08T12:00:00Z"))); + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/IncludedWebHookResource.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/IncludedWebHookResource.java new file mode 100644 index 000000000..c5df8a3ca --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/IncludedWebHookResource.java @@ -0,0 +1,84 @@ +package test.org.springdoc.api.v31.app246; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Webhook; +import io.swagger.v3.oas.annotations.Webhooks; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.parameters.RequestBody; +import io.swagger.v3.oas.annotations.responses.ApiResponse; + +import org.springframework.stereotype.Component; + +@Webhooks({ + @Webhook( + name = "includedPet", + operation = @Operation( + operationId = "includedPet", + requestBody = @RequestBody( + description = "Information about a new pet in the system", + content = { + @Content( + mediaType = "application/json", + schema = @Schema( + description = "Webhook Pet", + implementation = IncludedWebHookResource.RequestDto.class + ) + ) + } + ), + method = "post", + responses = @ApiResponse( + responseCode = "200", + description = "Return a 200 status to indicate that the data was received successfully" + ) + ) + ) +}) +@Component +public class IncludedWebHookResource { + + @Webhook( + name = "includedNewPet", + operation = @Operation( + operationId = "includedNewPet", + requestBody = @RequestBody( + description = "Information about a new pet in the system", + content = { + @Content( + mediaType = "application/json", + schema = @Schema( + description = "Webhook Pet", + implementation = RequestDto.class + ) + ) + } + ), + method = "post", + responses = @ApiResponse( + responseCode = "200", + description = "Return a 200 status to indicate that the data was received successfully" + ) + ) + ) + public void includedNewPet(RequestDto requestDto) { + // This method is intentionally left empty. + // The actual processing of the webhook data would be implemented here. + System.out.println("Received new pet with personal number: " + requestDto.getPersonalNumber()); + } + + public static class RequestDto { + + private String personalNumber; + + public String getPersonalNumber() { + return personalNumber; + } + + public void setPersonalNumber(String personalNumber) { + this.personalNumber = personalNumber; + } + } +} + + diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/SpringDocApp246Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/SpringDocApp246Test.java new file mode 100644 index 000000000..2c7b08319 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/SpringDocApp246Test.java @@ -0,0 +1,43 @@ +package test.org.springdoc.api.v31.app246; + +import org.junit.jupiter.api.Test; +import org.springdoc.core.utils.Constants; +import test.org.springdoc.api.v31.AbstractSpringDocV31Test; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.TestPropertySource; + +import static org.hamcrest.Matchers.is; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + + +/** + * This test class verifies the webhook filtering functionality based on package scanning. + * It ensures that only webhooks from the packages defined in {@code springdoc.packages-to-scan} + * are included in the OpenAPI specification, and webhooks from packages in + * {@code springdoc.packages-to-exclude} are correctly omitted. + */ +@SpringBootTest(classes = SpringDocApp246Test.SpringDocApp246.class) +@TestPropertySource(properties = { + "springdoc.packages-to-scan=test.org.springdoc.api.v31.app246", + "springdoc.packages-to-exclude=test.org.springdoc.api.v31.app246.excluded", + "springdoc.api-docs.version=OPENAPI_3_1" +}) +public class SpringDocApp246Test extends AbstractSpringDocV31Test { + + @SpringBootApplication + static class SpringDocApp246 { + } + + @Test + public void testApp2() throws Exception { + mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.webhooks.includedPet.post.requestBody.description", is("Information about a new pet in the system"))) + .andExpect(jsonPath("$.webhooks.includedNewPet.post.requestBody.description", is("Information about a new pet in the system"))) + .andExpect(jsonPath("$.webhooks.excludedNewPet").doesNotExist()); + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/excluded/ExcludedWebHookResource.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/excluded/ExcludedWebHookResource.java new file mode 100644 index 000000000..a383d16c4 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app246/excluded/ExcludedWebHookResource.java @@ -0,0 +1,25 @@ +package test.org.springdoc.api.v31.app246.excluded; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Webhook; +import io.swagger.v3.oas.annotations.Webhooks; +import test.org.springdoc.api.v31.app246.IncludedWebHookResource; + +import org.springframework.stereotype.Component; + +@Component +@Webhooks({ + @Webhook( + name = "excludedNewPet", + operation = @Operation( + operationId = "excludedNewPet", + method = "post", + summary = "This webhook should be ignored" + ) + ) +}) +public class ExcludedWebHookResource { + public void excludedNewPet(IncludedWebHookResource.RequestDto requestDto) { + // This method is intentionally left empty. + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app247/HelloController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app247/HelloController.java new file mode 100644 index 000000000..7454ec124 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app247/HelloController.java @@ -0,0 +1,79 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app247; + +import java.util.Map; + +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Encoding; +import io.swagger.v3.oas.annotations.media.Schema; + +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +public class HelloController { + + @PostMapping(value = "/class-works1", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String dataClass1( + @Parameter( + description = "Metadata as a concrete class", + required = true, + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = MetaData.class) + ) + ) + @RequestPart("metadata1") MetaData metadata1 + ) { + return "Received metadata: " + metadata1.name() + " = " + metadata1.value(); + } + + @PostMapping(value = "/class-works2", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String dataClass2( + @Parameter( + description = "Metadata as a concrete class", + required = true, + content = @Content(encoding = @Encoding(name = "metadata", contentType = "application/json"), + schema = @Schema(implementation = MetaData.class) + ) + ) + @RequestPart("metadata2") MetaData metadata2 + ) { + return "Received metadata: " + metadata2.name() + " = " + metadata2.value(); + } +} + +record MetaData(String name, String value, Map settings) { + public MetaData { + if (settings == null) settings = Map.of(); // default like Kotlin's = emptyMap() + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app247/SpringDocApp247Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app247/SpringDocApp247Test.java new file mode 100644 index 000000000..9682e0bbe --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app247/SpringDocApp247Test.java @@ -0,0 +1,11 @@ +package test.org.springdoc.api.v31.app247; + +import test.org.springdoc.api.v31.AbstractSpringDocTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +public class SpringDocApp247Test extends AbstractSpringDocTest { + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java index aeb3d7ea9..3d766dcb2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/ExamplesResponse.java @@ -8,12 +8,12 @@ import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED; public record ExamplesResponse( - @Schema(description = "self's user info", requiredMode = REQUIRED) - UserInfo self, - @Schema(description = "friend, deprecated, use friends instead", requiredMode = NOT_REQUIRED) - @Deprecated - UserInfo friend, - @Schema(description = "friends", requiredMode = NOT_REQUIRED) - List friends + @Schema(description = "self's user info", requiredMode = REQUIRED) + UserInfo self, + @Schema(description = "friend, deprecated, use friends instead", requiredMode = NOT_REQUIRED) + @Deprecated + UserInfo friend, + @Schema(description = "friends", requiredMode = NOT_REQUIRED) + List friends ) { } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/FooBar.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/FooBar.java index 58b43ae94..ae24a95b2 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/FooBar.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/FooBar.java @@ -6,7 +6,7 @@ @Schema(description = "the foo bar", deprecated = true) public record FooBar( - @Schema(description = "foo", requiredMode = REQUIRED, examples = {"1", "2"}) - int foo + @Schema(description = "foo", requiredMode = REQUIRED, examples = { "1", "2" }) + int foo ) { } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java index c35e6a856..8d31b6da0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java @@ -28,8 +28,8 @@ public class SpringDocApp8Test extends AbstractSpringDocTest { - @SpringBootApplication - static class SpringDocTestApp { + @SpringBootApplication + static class SpringDocTestApp { - } + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/UserInfo.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/UserInfo.java index 66174b8cf..2f21524ab 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/UserInfo.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app8/UserInfo.java @@ -6,11 +6,11 @@ @Schema(description = "user info") public record UserInfo( - @Schema(description = "The user's name", requiredMode = REQUIRED, examples = {"Madoka", "Homura"}) - String name, - @Schema(description = "The user's age", requiredMode = REQUIRED, examples = {"114", "514"}) - int age, - @Schema(description = "The user's fooBar", requiredMode = REQUIRED) - FooBar fooBar + @Schema(description = "The user's name", requiredMode = REQUIRED, examples = { "Madoka", "Homura" }) + String name, + @Schema(description = "The user's age", requiredMode = REQUIRED, examples = { "114", "514" }) + int age, + @Schema(description = "The user's fooBar", requiredMode = REQUIRED) + FooBar fooBar ) { } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java index 8eca5dc7a..51f9ec70f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java @@ -30,8 +30,8 @@ @TestPropertySource(properties = "springdoc.remove-broken-reference-definitions=false") public class SpringDocApp9Test extends AbstractSpringDocTest { - @SpringBootApplication - static class SpringDocTestApp { + @SpringBootApplication + static class SpringDocTestApp { - } + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/WebHookResource.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/WebHookResource.java index 1d28b96a0..e30142d38 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/WebHookResource.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app9/WebHookResource.java @@ -12,7 +12,7 @@ @Webhooks({ @Webhook( - name = "newPet", + name = "newPet1", operation = @Operation( requestBody = @RequestBody( description = "Information about a new pet in the system", @@ -35,7 +35,37 @@ ) }) @Component -public class WebHookResource {} +public class WebHookResource { + + @Webhook( + name = "newPet", + operation = @Operation( + requestBody = @RequestBody( + description = "Information about a new pet in the system", + content = { + @Content( + mediaType = "application/json", + schema = @Schema( + description = "Webhook Pet", + implementation = RequestDto.class + ) + ) + } + ), + method = "post", + responses = @ApiResponse( + responseCode = "200", + description = "Return a 200 status to indicate that the data was received successfully" + ) + ) + ) + public void newPet(RequestDto requestDto) { + // This method is intentionally left empty. + // The actual processing of the webhook data would be implemented here. + System.out.println("Received new pet with personal number: " + requestDto.getPersonalNumber()); + } + +} class RequestDto { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java index 9da963a94..49574ae36 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java +++ b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java @@ -92,9 +92,9 @@ public RequestMappingHandlerMapping defaultTestHandlerMapping(GreetingController @Bean(name = "openApiResource") public OpenApiWebMvcResource openApiResource(ObjectFactory openAPIBuilderObjectFactory, AbstractRequestService requestBuilder, GenericResponseService responseBuilder, - OperationService operationParser,SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { + OperationService operationParser, SpringDocConfigProperties springDocConfigProperties, SpringDocProviders springDocProviders, SpringDocCustomizers springDocCustomizers) { return new OpenApiWebMvcResource(DEFAULT_GROUP_NAME, openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, - springDocConfigProperties, springDocProviders,springDocCustomizers); + springDocConfigProperties, springDocProviders, springDocCustomizers); } @Override diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/application-212.yml b/springdoc-openapi-starter-webmvc-api/src/test/resources/application-212.yml index 4160fe61a..2ccd53f22 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/application-212.yml +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/application-212.yml @@ -1,5 +1,10 @@ springdoc: open-api: + servers: + - url: "https://api.example.com" + description: "Production Server" + - url: "https://staging.example.com" + description: "Staging Server" info: title: Api info title description: Api info description @@ -31,26 +36,32 @@ springdoc: - hello summary: Summary of Get operationId 'persons' description: Description of Get operationId 'persons' - + external-docs: + description: External docs description + url: "https://example.com/external-docs" + group-configs: - - group: apiGroupName - open-api: - info: - title: ApiGroupName info title - description: ApiGroupName info description - version: ApiGroupName info version - components: - schemas: - PersonDTO: - description: Description for PersonDTO component in ApiGroupName - properties: - name: - description: Description for 'name' property in ApiGroupName - example: Example value for 'name' property in ApiGroupName - - paths: - /persons2: - get: - summary: Summary of operationId 'persons' in ApiGroupName - description: Description of operationId 'persons' in ApiGroupName + - group: apiGroupName + open-api: + info: + title: ApiGroupName info title + description: ApiGroupName info description + version: ApiGroupName info version + components: + schemas: + PersonDTO: + description: Description for PersonDTO component in ApiGroupName + properties: + name: + description: Description for 'name' property in ApiGroupName + example: Example value for 'name' property in ApiGroupName + + paths: + /persons2: + get: + summary: Summary of operationId 'persons' in ApiGroupName + description: Description of operationId 'persons' in ApiGroupName + external-docs: + description: External docs description for ApiGroupName + url: "https://example.com/apiGroupName-external-docs" diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/application-217.yml b/springdoc-openapi-starter-webmvc-api/src/test/resources/application-217.yml index eb7a49fd5..a3f2349af 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/application-217.yml +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/application-217.yml @@ -13,14 +13,18 @@ springdoc: termsOfService: http://localhost:8080/ license: name: Apache 2.0 + servers: + - url: "https://demo.example.com" + description: "demo Server" components: - schemas: - PersonDTO: - description: Description for PersonDTO component - properties: - name: - description: Description for 'name' property - example: Example value for 'name' property + security-schemes: + auth: + type: http + scheme: bearer + bearer-format: JWT + external-docs: + description: Example External Docs demo + url: "https://example.com/external-docs-demo" - group: user display-name: User Interfaces packages-to-scan: @@ -34,6 +38,9 @@ springdoc: termsOfService: http://localhost:8080/ license: name: Apache 2.0 + servers: + - url: "https://user.example.com" + description: "user Server" components: schemas: PersonDTO: @@ -42,7 +49,15 @@ springdoc: name: description: Description for 'name' property example: Example value for 'name' property - open-api: + external-docs: + description: Example External Docs user + url: "https://example.com/external-docs-user" + open-api: + servers: + - url: "https://api.example.com" + description: "Production Server" + - url: "https://staging.example.com" + description: "Staging Server" info: title: Api info title description: Api info description diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app102.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app102.json index 0f17e72f0..1981b04bf 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app102.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app102.json @@ -32,6 +32,7 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { + "minLength": 1, "type": "string" } }, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app105-4.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app105-4.json index 76d34675f..9fe3e74ae 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app105-4.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app105-4.json @@ -35,6 +35,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json index 62f211aa2..2ccd516ac 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json @@ -17,27 +17,25 @@ } ], "paths": { - "/personByLastName": { - "get": { + "/person": { + "post": { "tags": [ "person-controller" ], - "operationId": "findByLastName", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" + "operationId": "person", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Person" + } } - } - ], + }, + "required": true + }, "responses": { - "400": { - "description": "Bad Request", + "415": { + "description": "Unsupported Media Type", "content": { "*/*": { "schema": { @@ -46,22 +44,22 @@ } } }, - "500": { - "description": "Internal Server Error", + "400": { + "description": "Bad Request", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } }, - "415": { - "description": "Unsupported Media Type", + "500": { + "description": "Internal Server Error", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } @@ -71,10 +69,7 @@ "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Person" } } } @@ -82,12 +77,12 @@ } } }, - "/person": { + "/person2": { "post": { "tags": [ - "person-controller" + "person-controller-2" ], - "operationId": "person", + "operationId": "person_1", "requestBody": { "content": { "application/json": { @@ -99,8 +94,40 @@ "required": true }, "responses": { - "400": { - "description": "Bad Request", + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/Person" + } + } + } + } + } + } + }, + "/personByLastName": { + "get": { + "tags": [ + "person-controller" + ], + "operationId": "findByLastName", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "maxLength": 10, + "minLength": 0, + "type": "string" + } + } + ], + "responses": { + "415": { + "description": "Unsupported Media Type", "content": { "*/*": { "schema": { @@ -109,22 +136,22 @@ } } }, - "500": { - "description": "Internal Server Error", + "400": { + "description": "Bad Request", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } }, - "415": { - "description": "Unsupported Media Type", + "500": { + "description": "Internal Server Error", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } @@ -134,7 +161,10 @@ "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -176,36 +206,6 @@ } } } - }, - "/person2": { - "post": { - "tags": [ - "person-controller-2" - ], - "operationId": "person_1", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Person" - } - } - }, - "required": true - }, - "responses": { - "200": { - "description": "OK", - "content": { - "*/*": { - "schema": { - "$ref": "#/components/schemas/Person" - } - } - } - } - } - } } }, "components": { @@ -257,7 +257,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json index 7143898e4..5224bc8be 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json @@ -17,34 +17,29 @@ } ], "paths": { - "/personByLastName": { - "get": { + "/person": { + "post": { "tags": [ "person-controller" ], - "operationId": "findByLastName", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" + "operationId": "person", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Person" + } } - } - ], + }, + "required": true + }, "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Person" } } } @@ -52,12 +47,12 @@ } } }, - "/person": { + "/person2": { "post": { "tags": [ - "person-controller" + "person-controller-2" ], - "operationId": "person", + "operationId": "person_1", "requestBody": { "content": { "application/json": { @@ -82,12 +77,12 @@ } } }, - "/personByLastName2": { + "/personByLastName": { "get": { "tags": [ - "person-controller-2" + "person-controller" ], - "operationId": "findByLastName_1", + "operationId": "findByLastName", "parameters": [ { "name": "lastName", @@ -117,29 +112,34 @@ } } }, - "/person2": { - "post": { + "/personByLastName2": { + "get": { "tags": [ "person-controller-2" ], - "operationId": "person_1", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Person" - } + "operationId": "findByLastName_1", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "maxLength": 10, + "minLength": 0, + "type": "string" } - }, - "required": true - }, + } + ], "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -175,7 +175,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json index 5fa3b7691..2ab571756 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json @@ -17,34 +17,29 @@ } ], "paths": { - "/personByLastName": { - "get": { + "/person": { + "post": { "tags": [ "person-controller" ], - "operationId": "findByLastName", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" + "operationId": "person", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Person" + } } - } - ], + }, + "required": true + }, "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Person" } } } @@ -52,12 +47,12 @@ } } }, - "/person": { + "/person2": { "post": { "tags": [ - "person-controller" + "person-controller-2" ], - "operationId": "person", + "operationId": "person_1", "requestBody": { "content": { "application/json": { @@ -69,38 +64,16 @@ "required": true }, "responses": { - "200": { - "description": "OK", + "415": { + "description": "Unsupported Media Type", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "$ref": "#/components/schemas/ErrorMessage" } } } - } - } - } - }, - "/personByLastName2": { - "get": { - "tags": [ - "person-controller-2" - ], - "operationId": "findByLastName_1", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" - } - } - ], - "responses": { + }, "400": { "description": "Bad Request", "content": { @@ -121,16 +94,38 @@ } } }, - "415": { - "description": "Unsupported Media Type", + "200": { + "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Person" } } } - }, + } + } + } + }, + "/personByLastName": { + "get": { + "tags": [ + "person-controller" + ], + "operationId": "findByLastName", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "maxLength": 10, + "minLength": 0, + "type": "string" + } + } + ], + "responses": { "200": { "description": "OK", "content": { @@ -147,25 +142,27 @@ } } }, - "/person2": { - "post": { + "/personByLastName2": { + "get": { "tags": [ "person-controller-2" ], - "operationId": "person_1", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Person" - } + "operationId": "findByLastName_1", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "maxLength": 10, + "minLength": 0, + "type": "string" } - }, - "required": true - }, + } + ], "responses": { - "400": { - "description": "Bad Request", + "415": { + "description": "Unsupported Media Type", "content": { "*/*": { "schema": { @@ -174,22 +171,22 @@ } } }, - "500": { - "description": "Internal Server Error", + "400": { + "description": "Bad Request", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } }, - "415": { - "description": "Unsupported Media Type", + "500": { + "description": "Internal Server Error", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } @@ -199,7 +196,10 @@ "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -257,7 +257,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json index 05aae2c64..82ae0ddf5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app115.json @@ -23,8 +23,7 @@ "content": { "application/json": { "schema": { - "type": "string", - "properties": {} + "type": "string" } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app121.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app121.json index 9375efe11..2390ac67c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app121.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app121.json @@ -32,6 +32,7 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { + "minLength": 1, "type": "string" } }, @@ -182,6 +183,7 @@ } }, "childParam": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app14.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app14.json index 9bd24ef37..235e0fe82 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app14.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app14.json @@ -50,6 +50,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-GB.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-GB.json index 90ea79632..978d6dd12 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-GB.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-GB.json @@ -49,6 +49,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-US.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-US.json index d65b8eca2..7e6decf59 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-US.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-en-US.json @@ -49,6 +49,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-fr-FR.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-fr-FR.json index d10b56632..4c7e59f54 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-fr-FR.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app171-fr-FR.json @@ -49,6 +49,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app18.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app18.json index 52c543602..66a05b228 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app18.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app18.json @@ -11,19 +11,19 @@ } ], "paths": { - "/persons3": { + "/persons": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons3", + "operationId": "persons", "parameters": [ { "name": "name", "in": "query", - "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -42,21 +42,21 @@ } } }, - "/persons5": { + "/persons6": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons5", + "operationId": "persons6", "parameters": [ { - "name": "age", + "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { - "maximum": 0, - "type": "integer", - "format": "int32" + "minLength": 1, + "type": "string" } } ], @@ -74,19 +74,19 @@ } } }, - "/persons4": { + "/persons5": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons4", + "operationId": "persons5", "parameters": [ { "name": "age", "in": "query", "required": true, "schema": { - "minimum": 0, + "maximum": 0, "type": "integer", "format": "int32" } @@ -106,20 +106,21 @@ } } }, - "/persons2": { + "/persons4": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons2", + "operationId": "persons4", "parameters": [ { - "name": "name", + "name": "age", "in": "query", - "description": "persons name", "required": true, "schema": { - "type": "string" + "minimum": 0, + "type": "integer", + "format": "int32" } } ], @@ -137,12 +138,12 @@ } } }, - "/persons6": { + "/persons3": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons6", + "operationId": "persons3", "parameters": [ { "name": "name", @@ -150,6 +151,7 @@ "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -168,18 +170,20 @@ } } }, - "/persons": { + "/persons2": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons", + "operationId": "persons2", "parameters": [ { "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app19.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app19.json index c96b10c50..5cbef60a5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app19.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app19.json @@ -11,22 +11,21 @@ } ], "paths": { - "/persons3": { + "/persons": { "post": { "tags": [ "hello-controller" ], - "operationId": "persons3", + "operationId": "persons", "requestBody": { - "description": "requestBody inside operation annotation", + "description": "requestBody description as parameter", "content": { "application/json": { "schema": { "type": "string" } } - }, - "required": true + } }, "responses": { "200": { @@ -42,21 +41,23 @@ } } }, - "/persons2": { + "/persons3": { "post": { "tags": [ "hello-controller" ], - "operationId": "persons2", + "operationId": "persons3", "requestBody": { - "description": "requestBody description outside", + "description": "requestBody inside operation annotation", "content": { "application/json": { "schema": { + "minLength": 1, "type": "string" } } - } + }, + "required": true }, "responses": { "200": { @@ -72,14 +73,14 @@ } } }, - "/persons": { + "/persons2": { "post": { "tags": [ "hello-controller" ], - "operationId": "persons", + "operationId": "persons2", "requestBody": { - "description": "requestBody description as parameter", + "description": "requestBody description outside", "content": { "application/json": { "schema": { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app193-1.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app193-1.json index e3a0dfd38..b9f431ea7 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app193-1.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app193-1.json @@ -69,13 +69,10 @@ }, "components": { "schemas": { - "Book": - { + "Book": { "type": "object", - "properties": - { - "title": - { + "properties": { + "title": { "type": "string" } }, @@ -94,12 +91,10 @@ "empty": { "type": "boolean" }, - "first": - { + "first": { "$ref": "#/components/schemas/Book" }, - "last": - { + "last": { "$ref": "#/components/schemas/Book" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app209.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app209.json index 52c543602..b93993fbf 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app209.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app209.json @@ -11,19 +11,19 @@ } ], "paths": { - "/persons3": { + "/persons": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons3", + "operationId": "persons", "parameters": [ { "name": "name", "in": "query", - "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -42,21 +42,21 @@ } } }, - "/persons5": { + "/persons6": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons5", + "operationId": "persons6", "parameters": [ { - "name": "age", + "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { - "maximum": 0, - "type": "integer", - "format": "int32" + "minLength": 1, + "type": "string" } } ], @@ -74,19 +74,19 @@ } } }, - "/persons4": { + "/persons5": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons4", + "operationId": "persons5", "parameters": [ { "name": "age", "in": "query", "required": true, "schema": { - "minimum": 0, + "maximum": 0, "type": "integer", "format": "int32" } @@ -106,20 +106,21 @@ } } }, - "/persons2": { + "/persons4": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons2", + "operationId": "persons4", "parameters": [ { - "name": "name", + "name": "age", "in": "query", - "description": "persons name", "required": true, "schema": { - "type": "string" + "minimum": 0, + "type": "integer", + "format": "int32" } } ], @@ -137,12 +138,12 @@ } } }, - "/persons6": { + "/persons3": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons6", + "operationId": "persons3", "parameters": [ { "name": "name", @@ -150,6 +151,7 @@ "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -168,18 +170,20 @@ } } }, - "/persons": { + "/persons2": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons", + "operationId": "persons2", "parameters": [ { "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -201,3 +205,4 @@ }, "components": {} } + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app21.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app21.json index 2d53bffbf..db5cde3ab 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app21.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app21.json @@ -24,6 +24,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212-grouped.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212-grouped.json index 3021de061..c47feecfd 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212-grouped.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212-grouped.json @@ -7,8 +7,12 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://api.example.com", + "description": "Production Server" + }, + { + "url": "https://staging.example.com", + "description": "Staging Server" } ], "security": [ @@ -123,5 +127,9 @@ "bearerFormat": "JWT" } } + }, + "externalDocs": { + "description": "External docs description for ApiGroupName", + "url": "https://example.com/apiGroupName-external-docs" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212.json index 12339f3e8..d3824d3eb 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app212.json @@ -7,8 +7,12 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://api.example.com", + "description": "Production Server" + }, + { + "url": "https://staging.example.com", + "description": "Staging Server" } ], "security": [ @@ -121,5 +125,9 @@ "bearerFormat": "JWT" } } + }, + "externalDocs": { + "description": "External docs description", + "url": "https://example.com/external-docs" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-1.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-1.json index f0fcd6734..edd8b64cb 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-1.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-1.json @@ -11,8 +11,8 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://demo.example.com", + "description": "demo Server" } ], "paths": { @@ -50,6 +50,17 @@ }, "description": "Description for PersonDTO component" } + }, + "securitySchemes": { + "auth": { + "type": "http", + "scheme": "bearer", + "bearerFormat": "JWT" + } } + }, + "externalDocs": { + "description": "Example External Docs demo", + "url": "https://example.com/external-docs-demo" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-2.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-2.json index 80b4a8390..e77943fbe 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-2.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217-2.json @@ -11,8 +11,8 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://user.example.com", + "description": "user Server" } ], "paths": { @@ -51,5 +51,9 @@ "description": "Description for PersonDTO component" } } + }, + "externalDocs": { + "description": "Example External Docs user", + "url": "https://example.com/external-docs-user" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217.json index f0162bf7f..3d056661f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app217.json @@ -7,8 +7,12 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://api.example.com", + "description": "Production Server" + }, + { + "url": "https://staging.example.com", + "description": "Staging Server" } ], "paths": { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app219.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app219.json index 70b2fb8d5..2e2df9f21 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app219.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app219.json @@ -16,20 +16,45 @@ "tags": [ "hello-controller" ], - "operationId": "testpost", + "operationId": "postWithProducesAndConsumes", "requestBody": { "content": { - "application/json": { + "application/json;charset=UTF-8": { "schema": { "$ref": "#/components/schemas/TestObject" } }, - "application/json;charset=UTF-8": { + "application/json; charset=UTF-8": { "schema": { "$ref": "#/components/schemas/TestObject" } - }, - "application/json; charset=UTF-8": { + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + } + } + } + } + }, + "/api/testpost2": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "postWithConsumes", + "requestBody": { + "content": { + "application/json;charset=UTF-8": { "schema": { "$ref": "#/components/schemas/TestObject" } @@ -45,7 +70,32 @@ "schema": { "$ref": "#/components/schemas/TestObject" } - }, + } + } + } + } + } + }, + "/api/testpost3": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "postWithProduces", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { "application/json": { "schema": { "$ref": "#/components/schemas/TestObject" @@ -55,6 +105,36 @@ } } } + }, + "/api/testpost4": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "post", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + } + } + } + } } }, "components": { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app23.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app23.json index 22902fadc..4cb10bb74 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app23.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app23.json @@ -24,6 +24,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-en-US.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-en-US.json index d65b8eca2..7e6decf59 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-en-US.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-en-US.json @@ -49,6 +49,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-fr-CA.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-fr-CA.json index d10b56632..4c7e59f54 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-fr-CA.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-fr-CA.json @@ -49,6 +49,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-zh-CN.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-zh-CN.json index d65b8eca2..7e6decf59 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-zh-CN.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app238-zh-CN.json @@ -49,6 +49,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app24.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app24.json index 885b7d457..181e3bf01 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app24.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app24.json @@ -30,6 +30,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app242.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app242.json new file mode 100644 index 000000000..2fcfa9cab --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app242.json @@ -0,0 +1,56 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api": { + "get": { + "tags": [ + "test-controller" + ], + "operationId": "getRootModel", + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/RootModel" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "RootModel": { + "type": "object", + "properties": { + "rootProperty": { + "type": "integer", + "format": "int32" + }, + "unwrappedOneProperty": { + "type": "integer", + "format": "int32" + }, + "unwrappedTwoProperty": { + "type": "integer", + "format": "int32" + } + } + } + } + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app243.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app243.json new file mode 100644 index 000000000..edb12ee9d --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app243.json @@ -0,0 +1,90 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/parent": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "parentEndpoint", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SuperClass" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + } + }, + "components": { + "schemas": { + "Image": { + "required": [ + "type" + ], + "type": "object", + "properties": { + "type": { + "type": "string" + } + } + }, + "Mail": { + "required": [ + "type" + ], + "type": "object", + "properties": { + "type": { + "type": "string" + } + } + }, + "SuperClass": { + "required": [ + "type" + ], + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "discriminator": { + "propertyName": "type", + "mapping": { + "Image": "#/components/schemas/Image", + "Mail": "#/components/schemas/Mail" + } + }, + "oneOf": [ + { + "$ref": "#/components/schemas/Image" + }, + { + "$ref": "#/components/schemas/Mail" + } + ] + } + } + } +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app52.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app52.json index 351bef514..09f4f2d88 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app52.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app52.json @@ -11,6 +11,54 @@ } ], "paths": { + "/test4": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "createTest4", + "requestBody": { + "content": { + "multipart/form-data": { + "schema": { + "required": [ + "map", + "multipartFiles" + ], + "type": "object", + "properties": { + "multipartFiles": { + "type": "array", + "items": { + "type": "string", + "format": "binary" + } + }, + "map": { + "type": "object", + "additionalProperties" : { + "type": "string" + } + } + } + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + }, "/test3": { "post": { "tags": [ diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app1.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app1.json index 27d5cdfab..27106c79d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app1.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app1.json @@ -87,10 +87,6 @@ "content": { "application/x-www-form-urlencoded": { "schema": { - "required": [ - "firstName", - "lastName" - ], "type": "object", "properties": { "firstName": { @@ -101,7 +97,11 @@ "type": "string", "description": "Last Name" } - } + }, + "required": [ + "firstName", + "lastName" + ] } } } @@ -210,9 +210,9 @@ "in": "query", "required": true, "schema": { + "type": "string", "maxLength": 6, - "minLength": 4, - "type": "string" + "minLength": 4 } }, { @@ -220,10 +220,10 @@ "in": "query", "required": true, "schema": { - "maximum": 6, - "minimum": 4, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 6, + "minimum": 4 } }, { @@ -340,9 +340,9 @@ "description": "number of records to skip for pagination", "required": true, "schema": { - "minimum": 0, "type": "integer", - "format": "int32" + "format": "int32", + "minimum": 0 } }, { @@ -351,10 +351,10 @@ "description": "maximum number of records to return", "required": true, "schema": { - "maximum": 50, - "minimum": 0, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 50, + "minimum": 0 } } ], @@ -439,6 +439,48 @@ } } }, + "/api/test": { + "post": { + "tags": [ + "people" + ], + "operationId": "postSingleParameter", + "requestBody": { + "content": { + "application/x-www-form-urlencoded": { + "schema": { + "type": "object", + "properties": { + "test_id": { + "type": "string", + "format": "uuid" + } + }, + "required": [ + "test_id" + ] + } + } + }, + "required": true + }, + "responses": { + "500": { + "description": "Internal Server Error", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorMessage" + } + } + } + }, + "200": { + "description": "OK" + } + } + } + }, "/people": { "get": { "tags": [ @@ -567,12 +609,6 @@ } }, "InventoryItem": { - "required": [ - "id", - "manufacturer", - "name", - "releaseDate" - ], "type": "object", "properties": { "id": { @@ -591,12 +627,15 @@ "manufacturer": { "$ref": "#/components/schemas/Manufacturer" } - } + }, + "required": [ + "id", + "manufacturer", + "name", + "releaseDate" + ] }, "Manufacturer": { - "required": [ - "name" - ], "type": "object", "properties": { "name": { @@ -611,7 +650,10 @@ "type": "string", "example": "408-867-5309" } - } + }, + "required": [ + "name" + ] }, "ItemDTO": { "type": "object", diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app102.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app102.json index 35eeb5ea9..ed29774ae 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app102.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app102.json @@ -32,7 +32,8 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } }, { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app104.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app104.json index a93c0b114..87da1e17b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app104.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app104.json @@ -71,9 +71,7 @@ }, "components": { "schemas": { - "Design": { - "type": "object" - } + "Design": {} } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app105-4.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app105-4.json index f393a5154..ccf0baf41 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app105-4.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app105-4.json @@ -35,7 +35,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app108.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app108.json index e25da4126..fcb0e4523 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app108.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app108.json @@ -47,9 +47,7 @@ "ActionResultVoid": { "type": "object", "properties": { - "value": { - "type": "object" - }, + "value": {}, "success": { "type": "boolean" }, @@ -59,9 +57,7 @@ "message": { "type": "string" }, - "errorValue": { - "type": "object" - }, + "errorValue": {}, "targetUrl": { "type": "string" } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json index afb60ad05..1acc67b40 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json @@ -17,47 +17,45 @@ } ], "paths": { - "/personByLastName": { - "get": { + "/person": { + "post": { "tags": [ "person-controller" ], - "operationId": "findByLastName", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" + "operationId": "person", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Person" + } } - } - ], + }, + "required": true + }, "responses": { - "400": { - "description": "Bad Request", + "500": { + "description": "Internal Server Error", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } }, - "500": { - "description": "Internal Server Error", + "415": { + "description": "Unsupported Media Type", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } }, - "415": { - "description": "Unsupported Media Type", + "400": { + "description": "Bad Request", "content": { "*/*": { "schema": { @@ -71,10 +69,7 @@ "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Person" } } } @@ -82,12 +77,12 @@ } } }, - "/person": { + "/person2": { "post": { "tags": [ - "person-controller" + "person-controller-2" ], - "operationId": "person", + "operationId": "person_1", "requestBody": { "content": { "application/json": { @@ -99,16 +94,38 @@ "required": true }, "responses": { - "400": { - "description": "Bad Request", + "200": { + "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Person" } } } - }, + } + } + } + }, + "/personByLastName": { + "get": { + "tags": [ + "person-controller" + ], + "operationId": "findByLastName", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "type": "string", + "maxLength": 10, + "minLength": 0 + } + } + ], + "responses": { "500": { "description": "Internal Server Error", "content": { @@ -129,12 +146,25 @@ } } }, + "400": { + "description": "Bad Request", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/ErrorMessage" + } + } + } + }, "200": { "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -154,9 +184,9 @@ "in": "query", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], @@ -176,51 +206,10 @@ } } } - }, - "/person2": { - "post": { - "tags": [ - "person-controller-2" - ], - "operationId": "person_1", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Person" - } - } - }, - "required": true - }, - "responses": { - "200": { - "description": "OK", - "content": { - "*/*": { - "schema": { - "$ref": "#/components/schemas/Person" - } - } - } - } - } - } } }, "components": { "schemas": { - "ErrorMessage": { - "type": "object", - "properties": { - "errors": { - "type": "array", - "items": { - "type": "string" - } - } - } - }, "Problem": { "type": "object", "properties": { @@ -232,10 +221,18 @@ } } }, + "ErrorMessage": { + "type": "object", + "properties": { + "errors": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "Person": { - "required": [ - "lastName" - ], "type": "object", "properties": { "id": { @@ -243,32 +240,36 @@ "format": "int64" }, "firstName": { + "type": "string", "maxLength": 2147483647, - "minLength": 2, - "type": "string" + "minLength": 2 }, "lastName": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 }, "email": { - "pattern": ".+@.+\\..+", - "type": "string" + "type": "string", + "pattern": ".+@.+\\..+" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { - "maximum": 30, - "minimum": 18, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 30, + "minimum": 18 }, "creditCardNumber": { "type": "string" } - } + }, + "required": [ + "lastName" + ] } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json index 1ea58db5d..3bb738f98 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json @@ -17,34 +17,29 @@ } ], "paths": { - "/personByLastName": { - "get": { + "/person": { + "post": { "tags": [ "person-controller" ], - "operationId": "findByLastName", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" + "operationId": "person", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Person" + } } - } - ], + }, + "required": true + }, "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Person" } } } @@ -52,12 +47,12 @@ } } }, - "/person": { + "/person2": { "post": { "tags": [ - "person-controller" + "person-controller-2" ], - "operationId": "person", + "operationId": "person_1", "requestBody": { "content": { "application/json": { @@ -82,21 +77,21 @@ } } }, - "/personByLastName2": { + "/personByLastName": { "get": { "tags": [ - "person-controller-2" + "person-controller" ], - "operationId": "findByLastName_1", + "operationId": "findByLastName", "parameters": [ { "name": "lastName", "in": "query", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], @@ -117,29 +112,34 @@ } } }, - "/person2": { - "post": { + "/personByLastName2": { + "get": { "tags": [ "person-controller-2" ], - "operationId": "person_1", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Person" - } + "operationId": "findByLastName_1", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "type": "string", + "maxLength": 10, + "minLength": 0 } - }, - "required": true - }, + } + ], "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -151,9 +151,6 @@ "components": { "schemas": { "Person": { - "required": [ - "lastName" - ], "type": "object", "properties": { "id": { @@ -161,32 +158,36 @@ "format": "int64" }, "firstName": { + "type": "string", "maxLength": 2147483647, - "minLength": 2, - "type": "string" + "minLength": 2 }, "lastName": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 }, "email": { - "pattern": ".+@.+\\..+", - "type": "string" + "type": "string", + "pattern": ".+@.+\\..+" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { - "maximum": 30, - "minimum": 18, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 30, + "minimum": 18 }, "creditCardNumber": { "type": "string" } - } + }, + "required": [ + "lastName" + ] } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json index 7ac383dcc..e98203f8e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json @@ -17,34 +17,29 @@ } ], "paths": { - "/personByLastName": { - "get": { + "/person": { + "post": { "tags": [ "person-controller" ], - "operationId": "findByLastName", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" + "operationId": "person", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Person" + } } - } - ], + }, + "required": true + }, "responses": { "200": { "description": "OK", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Person" } } } @@ -52,12 +47,12 @@ } } }, - "/person": { + "/person2": { "post": { "tags": [ - "person-controller" + "person-controller-2" ], - "operationId": "person", + "operationId": "person_1", "requestBody": { "content": { "application/json": { @@ -69,40 +64,18 @@ "required": true }, "responses": { - "200": { - "description": "OK", + "500": { + "description": "Internal Server Error", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "$ref": "#/components/schemas/Problem" } } } - } - } - } - }, - "/personByLastName2": { - "get": { - "tags": [ - "person-controller-2" - ], - "operationId": "findByLastName_1", - "parameters": [ - { - "name": "lastName", - "in": "query", - "required": true, - "schema": { - "maxLength": 10, - "minLength": 0, - "type": "string" - } - } - ], - "responses": { - "400": { - "description": "Bad Request", + }, + "415": { + "description": "Unsupported Media Type", "content": { "*/*": { "schema": { @@ -111,26 +84,48 @@ } } }, - "500": { - "description": "Internal Server Error", + "400": { + "description": "Bad Request", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } }, - "415": { - "description": "Unsupported Media Type", + "200": { + "description": "OK", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Person" } } } - }, + } + } + } + }, + "/personByLastName": { + "get": { + "tags": [ + "person-controller" + ], + "operationId": "findByLastName", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "type": "string", + "maxLength": 10, + "minLength": 0 + } + } + ], + "responses": { "200": { "description": "OK", "content": { @@ -147,45 +142,47 @@ } } }, - "/person2": { - "post": { + "/personByLastName2": { + "get": { "tags": [ "person-controller-2" ], - "operationId": "person_1", - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Person" - } + "operationId": "findByLastName_1", + "parameters": [ + { + "name": "lastName", + "in": "query", + "required": true, + "schema": { + "type": "string", + "maxLength": 10, + "minLength": 0 } - }, - "required": true - }, + } + ], "responses": { - "400": { - "description": "Bad Request", + "500": { + "description": "Internal Server Error", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } }, - "500": { - "description": "Internal Server Error", + "415": { + "description": "Unsupported Media Type", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } }, - "415": { - "description": "Unsupported Media Type", + "400": { + "description": "Bad Request", "content": { "*/*": { "schema": { @@ -199,7 +196,10 @@ "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -210,17 +210,6 @@ }, "components": { "schemas": { - "ErrorMessage": { - "type": "object", - "properties": { - "errors": { - "type": "array", - "items": { - "type": "string" - } - } - } - }, "Problem": { "type": "object", "properties": { @@ -232,10 +221,18 @@ } } }, + "ErrorMessage": { + "type": "object", + "properties": { + "errors": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "Person": { - "required": [ - "lastName" - ], "type": "object", "properties": { "id": { @@ -243,32 +240,36 @@ "format": "int64" }, "firstName": { + "type": "string", "maxLength": 2147483647, - "minLength": 2, - "type": "string" + "minLength": 2 }, "lastName": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 }, "email": { - "pattern": ".+@.+\\..+", - "type": "string" + "type": "string", + "pattern": ".+@.+\\..+" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { - "maximum": 30, - "minimum": 18, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 30, + "minimum": 18 }, "creditCardNumber": { "type": "string" } - } + }, + "required": [ + "lastName" + ] } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app119.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app119.json index beaf56a5e..2553e2780 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app119.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app119.json @@ -11,6 +11,55 @@ } ], "paths": { + "/uploadFileWithJson2": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "uploadFileWithJson", + "requestBody": { + "description": "toto", + "content": { + "multipart/form-data": { + "schema": { + "type": "object", + "properties": { + "file": { + "type": "string", + "format": "binary", + "description": "file" + }, + "jsonRequest": { + "$ref": "#/components/schemas/JsonRequest" + } + }, + "required": [ + "file", + "jsonRequest" + ] + }, + "encoding": { + "jsonRequest": { + "contentType": "application/json" + } + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, "/multi": { "post": { "tags": [ @@ -22,25 +71,25 @@ "content": { "multipart/form-data": { "schema": { - "required": [ - "params" - ], "type": "object", "properties": { + "params": { + "$ref": "#/components/schemas/JsonRequest" + }, "file1": { "type": "string", - "description": "This is file1", - "format": "binary" + "format": "binary", + "description": "This is file1" }, "file2": { "type": "string", - "description": "This is file2", - "format": "binary" - }, - "params": { - "$ref": "#/components/schemas/JsonRequest" + "format": "binary", + "description": "This is file2" } - } + }, + "required": [ + "params" + ] }, "encoding": { "params": { @@ -69,12 +118,12 @@ "schemas": { "JsonRequest": { "type": "object", + "description": "This is the configuration", "properties": { "name": { "type": "string" } - }, - "description": "This is the configuration" + } } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app121.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app121.json index 372afd5c5..c184ff2da 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app121.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app121.json @@ -32,7 +32,8 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } }, { @@ -147,9 +148,6 @@ } }, "InheritedRequestParams": { - "required": [ - "childParam" - ], "type": "object", "properties": { "stringParam": { @@ -182,9 +180,13 @@ } }, "childParam": { - "type": "string" + "type": "string", + "minLength": 1 } - } + }, + "required": [ + "childParam" + ] } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app124.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app124.json index 092050ac2..b19f00a7b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app124.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app124.json @@ -37,23 +37,23 @@ } ], "responses": { + "404": { + "description": "Not here" + }, "502": { "description": "Bad Gateway", "content": { - "*/*": { + "application/problem+json": { "schema": { - "type": "object" + "$ref": "#/components/schemas/ProblemDetail" } } } }, - "404": { - "description": "Not here" - }, "418": { "description": "I'm a teapot", "content": { - "*/*": { + "application/json": { "schema": { "type": "object" } @@ -64,5 +64,35 @@ } } }, - "components": {} + "components": { + "schemas": { + "ProblemDetail": { + "type": "object", + "properties": { + "type": { + "type": "string", + "format": "uri" + }, + "title": { + "type": "string" + }, + "status": { + "type": "integer", + "format": "int32" + }, + "detail": { + "type": "string" + }, + "instance": { + "type": "string", + "format": "uri" + }, + "properties": { + "type": "object", + "additionalProperties": {} + } + } + } + } + } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app126.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app126.json index be22bf20b..41b170ffd 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app126.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app126.json @@ -58,19 +58,17 @@ }, "parameters": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, - "title": { - "type": "string" + "status": { + "type": "integer", + "format": "int32" }, "detail": { "type": "string" }, - "status": { - "type": "integer", - "format": "int32" + "title": { + "type": "string" } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app129.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app129.json index d6e5547d1..45758749f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app129.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app129.json @@ -56,6 +56,52 @@ } } } + }, + "/api/test2": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "update2", + "parameters": [ + { + "name": "userId", + "in": "header", + "schema": { + "type": "string" + } + }, + { + "name": "registrationId", + "in": "header", + "schema": { + "type": "string" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ActualReturnedEntity" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/OperationResponseActualReturnedEntity" + } + } + } + } + } + } } }, "components": { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app14.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app14.json index e2bb2165d..141b2f485 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app14.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app14.json @@ -50,7 +50,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app150.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app150.json index 87be08a80..a3051bd37 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app150.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app150.json @@ -24,7 +24,8 @@ "required": false, "schema": { "type": "string", - "format": "date" + "format": "date", + "default": "2021-03-08" } } ], @@ -48,13 +49,13 @@ "required": false, "schema": { "type": "array", - "items": { - "type": "string" - }, "default": [ "users", "123" - ] + ], + "items": { + "type": "string" + } } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-GB.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-GB.json index f84f883a3..3c110703e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-GB.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-GB.json @@ -49,7 +49,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -63,3 +64,4 @@ }, "components": {} } + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-US.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-US.json index e32639950..e36a4f0f6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-US.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-en-US.json @@ -49,7 +49,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-fr-FR.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-fr-FR.json index 37e48614e..ffc7ce523 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-fr-FR.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app171-fr-FR.json @@ -49,7 +49,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -63,3 +64,4 @@ }, "components": {} } + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app18.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app18.json index 7381cc07d..8cb518c8f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app18.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app18.json @@ -11,20 +11,20 @@ } ], "paths": { - "/persons3": { + "/persons": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons3", + "operationId": "persons", "parameters": [ { "name": "name", "in": "query", - "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -42,21 +42,21 @@ } } }, - "/persons5": { + "/persons6": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons5", + "operationId": "persons6", "parameters": [ { - "name": "age", + "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { - "maximum": 0, - "type": "integer", - "format": "int32" + "type": "string", + "minLength": 1 } } ], @@ -74,21 +74,21 @@ } } }, - "/persons4": { + "/persons5": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons4", + "operationId": "persons5", "parameters": [ { "name": "age", "in": "query", "required": true, "schema": { - "minimum": 0, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 0 } } ], @@ -106,20 +106,21 @@ } } }, - "/persons2": { + "/persons4": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons2", + "operationId": "persons4", "parameters": [ { - "name": "name", + "name": "age", "in": "query", - "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "integer", + "format": "int32", + "minimum": 0 } } ], @@ -137,12 +138,12 @@ } } }, - "/persons6": { + "/persons3": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons6", + "operationId": "persons3", "parameters": [ { "name": "name", @@ -150,7 +151,8 @@ "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -168,19 +170,21 @@ } } }, - "/persons": { + "/persons2": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons", + "operationId": "persons2", "parameters": [ { "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app180.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app180.json index 2596d5e9a..bb6457b04 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app180.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app180.json @@ -79,7 +79,6 @@ "Body": { "type": "object", "additionalProperties": { - "type": "object", "description": "Body", "example": { "key": "value" diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app188.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app188.json index 600c11506..cb0b51795 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app188.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app188.json @@ -89,9 +89,7 @@ }, "data": { "type": "object", - "additionalProperties": { - "type": "object" - }, + "additionalProperties": {}, "example": { "param1": "val1", "param2": "val2" diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app19.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app19.json index c67f34545..3114a411b 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app19.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app19.json @@ -11,22 +11,21 @@ } ], "paths": { - "/persons3": { + "/persons": { "post": { "tags": [ "hello-controller" ], - "operationId": "persons3", + "operationId": "persons", "requestBody": { - "description": "requestBody inside operation annotation", + "description": "requestBody description as parameter", "content": { "application/json": { "schema": { "type": "string" } } - }, - "required": true + } }, "responses": { "200": { @@ -42,21 +41,23 @@ } } }, - "/persons2": { + "/persons3": { "post": { "tags": [ "hello-controller" ], - "operationId": "persons2", + "operationId": "persons3", "requestBody": { - "description": "requestBody description outside", + "description": "requestBody inside operation annotation", "content": { "application/json": { "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } - } + }, + "required": true }, "responses": { "200": { @@ -72,14 +73,14 @@ } } }, - "/persons": { + "/persons2": { "post": { "tags": [ "hello-controller" ], - "operationId": "persons", + "operationId": "persons2", "requestBody": { - "description": "requestBody description as parameter", + "description": "requestBody description outside", "content": { "application/json": { "schema": { @@ -104,4 +105,4 @@ } }, "components": {} -} +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193-1.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193-1.json index 85c860f06..d9097123f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193-1.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193-1.json @@ -25,11 +25,12 @@ "content": { "*/*": { "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/Books" + "type": "object", + "properties": { + "test.org.springdoc.api.v31.app193.Knowledge": { + "$ref": "#/components/schemas/Knowledge" } - ] + } } } } @@ -51,14 +52,12 @@ "content": { "*/*": { "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/Cat" - }, - { - "$ref": "#/components/schemas/Dog" + "type": "object", + "properties": { + "Animal": { + "$ref": "#/components/schemas/Animal" } - ] + } } } } @@ -101,11 +100,9 @@ "description": "Represents a list of Books." }, "Knowledge": { - "type": "object", "description": "Represents the knowledge." }, "Animal": { - "type": "object", "description": "Represents an Animal class." }, "Cat": { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193.json index a4d76d380..221943c56 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app193.json @@ -70,8 +70,6 @@ "components": { "schemas": { "Books": { - "type": "array", - "description": "Represents a list of Books.", "allOf": [ { "$ref": "#/components/schemas/Knowledge" @@ -84,7 +82,8 @@ } } } - ] + ], + "description": "Represents a list of Books." }, "Knowledge": { "type": "object", @@ -95,8 +94,6 @@ "description": "Represents an Animal class." }, "Cat": { - "type": "object", - "description": "Represents a Cat class.", "allOf": [ { "$ref": "#/components/schemas/Animal" @@ -110,11 +107,10 @@ } } } - ] + ], + "description": "Represents a Cat class." }, "Dog": { - "type": "object", - "description": "Represents a Dog class.", "allOf": [ { "$ref": "#/components/schemas/Animal" @@ -131,7 +127,8 @@ } } } - ] + ], + "description": "Represents a Dog class." } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app197.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app197.json index e16e5789c..e510d4be3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app197.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app197.json @@ -18,9 +18,6 @@ ], "operationId": "index", "responses": { - "200": { - "description": "OK" - }, "400": { "description": "Bad Request", "content": { @@ -37,12 +34,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } + }, + "200": { + "description": "OK" } } } @@ -54,9 +52,6 @@ ], "operationId": "index_1", "responses": { - "200": { - "description": "OK" - }, "404": { "description": "Not Found", "content": { @@ -73,12 +68,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } + }, + "200": { + "description": "OK" } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app2.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app2.json index e368e60b3..cc0794af3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app2.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app2.json @@ -56,9 +56,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -130,9 +128,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -165,9 +161,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -208,9 +202,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -260,9 +252,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -306,9 +296,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -347,9 +335,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -388,9 +374,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -425,9 +409,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -477,15 +459,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } }, - "404": { - "description": "Pet not found", + "200": { + "description": "successful operation", "content": { "application/xml": { "schema": { @@ -499,8 +479,8 @@ } } }, - "200": { - "description": "successful operation", + "404": { + "description": "Pet not found", "content": { "application/xml": { "schema": { @@ -565,9 +545,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -618,9 +596,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -671,17 +647,17 @@ "content": { "multipart/form-data": { "schema": { - "required": [ - "file" - ], "type": "object", "properties": { "file": { "type": "string", - "description": "file detail", - "format": "binary" + "format": "binary", + "description": "file detail" } - } + }, + "required": [ + "file" + ] } } } @@ -693,9 +669,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -735,9 +709,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -782,9 +754,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -821,10 +791,10 @@ "description": "ID of pet that needs to be fetched", "required": true, "schema": { - "maximum": 5, - "minimum": 1, "type": "integer", - "format": "int64" + "format": "int64", + "maximum": 5, + "minimum": 1 } } ], @@ -835,15 +805,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } }, - "404": { - "description": "Order not found", + "200": { + "description": "successful operation", "content": { "application/xml": { "schema": { @@ -857,8 +825,8 @@ } } }, - "200": { - "description": "successful operation", + "404": { + "description": "Order not found", "content": { "application/xml": { "schema": { @@ -898,9 +866,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -926,9 +892,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -983,9 +947,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -1051,9 +1013,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -1120,8 +1080,8 @@ }, "userStatus": { "type": "integer", - "description": "User Status", - "format": "int32" + "format": "int32", + "description": "User Status" } } }, @@ -1138,10 +1098,6 @@ } }, "Pet": { - "required": [ - "name", - "photoUrls" - ], "type": "object", "properties": { "id": { @@ -1176,7 +1132,11 @@ "sold" ] } - } + }, + "required": [ + "name", + "photoUrls" + ] }, "Tag": { "type": "object", diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app202.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app202.json index e16e5789c..e510d4be3 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app202.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app202.json @@ -18,9 +18,6 @@ ], "operationId": "index", "responses": { - "200": { - "description": "OK" - }, "400": { "description": "Bad Request", "content": { @@ -37,12 +34,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } + }, + "200": { + "description": "OK" } } } @@ -54,9 +52,6 @@ ], "operationId": "index_1", "responses": { - "200": { - "description": "OK" - }, "404": { "description": "Not Found", "content": { @@ -73,12 +68,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } + }, + "200": { + "description": "OK" } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app206.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app206.json index 17534ca8c..23b4eb775 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app206.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app206.json @@ -40,9 +40,9 @@ "in": "query", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } }, { @@ -81,12 +81,6 @@ "components": { "schemas": { "PersonResponse": { - "required": [ - "age", - "email", - "firstName", - "lastName" - ], "type": "object", "properties": { "id": { @@ -94,9 +88,9 @@ "format": "int64" }, "firstName": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 }, "lastName": { "type": "string" @@ -108,7 +102,13 @@ "type": "integer", "format": "int32" } - } + }, + "required": [ + "age", + "email", + "firstName", + "lastName" + ] } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app207.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app207.json index 85f77be51..2bcf58e78 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app207.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app207.json @@ -98,12 +98,8 @@ }, "components": { "schemas": { - "SysUser": { - "type": "object" - }, - "SuperEntityObject": { - "type": "object" - } + "SysUser": {}, + "SuperEntityObject": {} } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app209.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app209.json index 7381cc07d..8cb518c8f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app209.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app209.json @@ -11,20 +11,20 @@ } ], "paths": { - "/persons3": { + "/persons": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons3", + "operationId": "persons", "parameters": [ { "name": "name", "in": "query", - "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -42,21 +42,21 @@ } } }, - "/persons5": { + "/persons6": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons5", + "operationId": "persons6", "parameters": [ { - "name": "age", + "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { - "maximum": 0, - "type": "integer", - "format": "int32" + "type": "string", + "minLength": 1 } } ], @@ -74,21 +74,21 @@ } } }, - "/persons4": { + "/persons5": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons4", + "operationId": "persons5", "parameters": [ { "name": "age", "in": "query", "required": true, "schema": { - "minimum": 0, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 0 } } ], @@ -106,20 +106,21 @@ } } }, - "/persons2": { + "/persons4": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons2", + "operationId": "persons4", "parameters": [ { - "name": "name", + "name": "age", "in": "query", - "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "integer", + "format": "int32", + "minimum": 0 } } ], @@ -137,12 +138,12 @@ } } }, - "/persons6": { + "/persons3": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons6", + "operationId": "persons3", "parameters": [ { "name": "name", @@ -150,7 +151,8 @@ "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -168,19 +170,21 @@ } } }, - "/persons": { + "/persons2": { "get": { "tags": [ "hello-controller" ], - "operationId": "persons", + "operationId": "persons2", "parameters": [ { "name": "name", "in": "query", + "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app21.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app21.json index 136b34d94..75fb1e617 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app21.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app21.json @@ -24,7 +24,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212-grouped.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212-grouped.json index 95f7c4f06..cf3bd1551 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212-grouped.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212-grouped.json @@ -7,8 +7,12 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://api.example.com", + "description": "Production Server" + }, + { + "url": "https://staging.example.com", + "description": "Staging Server" } ], "security": [ @@ -106,14 +110,14 @@ "schemas": { "PersonDTO": { "type": "object", + "description": "Description for PersonDTO component in ApiGroupName", "properties": { "name": { "type": "string", "description": "Description for 'name' property in ApiGroupName", "example": "Example value for 'name' property in ApiGroupName" } - }, - "description": "Description for PersonDTO component in ApiGroupName" + } } }, "securitySchemes": { @@ -123,5 +127,9 @@ "bearerFormat": "JWT" } } + }, + "externalDocs": { + "description": "External docs description for ApiGroupName", + "url": "https://example.com/apiGroupName-external-docs" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212.json index 94b7a3348..7195d2ce0 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app212.json @@ -7,8 +7,12 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://api.example.com", + "description": "Production Server" + }, + { + "url": "https://staging.example.com", + "description": "Staging Server" } ], "security": [ @@ -104,14 +108,14 @@ "schemas": { "PersonDTO": { "type": "object", + "description": "Description for PersonDTO component", "properties": { "name": { "type": "string", "description": "Description for 'name' property", "example": "Example value for 'name' property" } - }, - "description": "Description for PersonDTO component" + } } }, "securitySchemes": { @@ -121,5 +125,9 @@ "bearerFormat": "JWT" } } + }, + "externalDocs": { + "description": "External docs description", + "url": "https://example.com/external-docs" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app213.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app213.json index d8ac4d797..0824236e5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app213.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app213.json @@ -5,7 +5,7 @@ "description": "This API exposes endpoints for testing anything", "termsOfService": "https://www.test.ca/terms", "version": "1.0", - "x-amazon-apigateway-integration": { + "x-x-amazon-apigateway-integration": { "passthroughBehavior": "when_no_match", "connectionId": "1rqafw", "type": "http_proxy", @@ -47,7 +47,7 @@ } } }, - "x-amazon-apigateway-integration": { + "x-x-amazon-apigateway-integration": { "passthroughBehavior": "when_no_match", "connectionId": "1rqafw", "type": "http_proxy", diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-1.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-1.json index 837008658..8be7e9b4a 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-1.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-1.json @@ -11,8 +11,8 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://demo.example.com", + "description": "demo Server" } ], "paths": { @@ -41,15 +41,26 @@ "schemas": { "PersonDTO": { "type": "object", + "description": "Description for PersonDTO component", "properties": { "name": { "type": "string", "description": "Description for 'name' property", "example": "Example value for 'name' property" } - }, - "description": "Description for PersonDTO component" + } + } + }, + "securitySchemes": { + "auth": { + "type": "http", + "scheme": "bearer", + "bearerFormat": "JWT" } } + }, + "externalDocs": { + "description": "Example External Docs demo", + "url": "https://example.com/external-docs-demo" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-2.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-2.json index 0406d93f7..3da610fa5 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-2.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217-2.json @@ -11,8 +11,8 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://user.example.com", + "description": "user Server" } ], "paths": { @@ -41,15 +41,19 @@ "schemas": { "PersonDTO": { "type": "object", + "description": "Description for PersonDTO component", "properties": { "name": { "type": "string", "description": "Description for 'name' property", "example": "Example value for 'name' property" } - }, - "description": "Description for PersonDTO component" + } } } + }, + "externalDocs": { + "description": "Example External Docs user", + "url": "https://example.com/external-docs-user" } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217.json index d43e54b96..e3fc59716 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app217.json @@ -7,8 +7,12 @@ }, "servers": [ { - "url": "http://localhost", - "description": "Generated server url" + "url": "https://api.example.com", + "description": "Production Server" + }, + { + "url": "https://staging.example.com", + "description": "Staging Server" } ], "paths": { @@ -37,14 +41,14 @@ "schemas": { "PersonDTO": { "type": "object", + "description": "Description for PersonDTO component", "properties": { "name": { "type": "string", "description": "Description for 'name' property", "example": "Example value for 'name' property" } - }, - "description": "Description for PersonDTO component" + } } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app219.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app219.json index 6d81662c2..f76cc3e0a 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app219.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app219.json @@ -16,20 +16,45 @@ "tags": [ "hello-controller" ], - "operationId": "testpost", + "operationId": "postWithProducesAndConsumes", "requestBody": { "content": { - "application/json": { + "application/json;charset=UTF-8": { "schema": { "$ref": "#/components/schemas/TestObject" } }, - "application/json;charset=UTF-8": { + "application/json; charset=UTF-8": { "schema": { "$ref": "#/components/schemas/TestObject" } - }, - "application/json; charset=UTF-8": { + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + } + } + } + } + }, + "/api/testpost2": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "postWithConsumes", + "requestBody": { + "content": { + "application/json;charset=UTF-8": { "schema": { "$ref": "#/components/schemas/TestObject" } @@ -45,7 +70,32 @@ "schema": { "$ref": "#/components/schemas/TestObject" } - }, + } + } + } + } + } + }, + "/api/testpost3": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "postWithProduces", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { "application/json": { "schema": { "$ref": "#/components/schemas/TestObject" @@ -55,6 +105,36 @@ } } } + }, + "/api/testpost4": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "post", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/TestObject" + } + } + } + } + } + } } }, "components": { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app220.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app220.json index 9cbd404b2..7873b77bb 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app220.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app220.json @@ -110,7 +110,6 @@ ] }, "Superclass": { - "type": "object", "discriminator": { "propertyName": "@type" }, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app222.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app222.json index 8c39e0b28..5cd2f920f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app222.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app222.json @@ -65,7 +65,6 @@ ] }, "SecondHierarchy": { - "type": "object", "discriminator": { "propertyName": "@type" }, @@ -91,7 +90,6 @@ } }, "FirstHierarchy": { - "type": "object", "discriminator": { "propertyName": "@type" }, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app23.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app23.json index 25d752698..7f16dc76e 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app23.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app23.json @@ -24,7 +24,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-en-US.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-en-US.json index e32639950..e36a4f0f6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-en-US.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-en-US.json @@ -49,7 +49,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-fr-CA.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-fr-CA.json index 37e48614e..222aa1548 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-fr-CA.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-fr-CA.json @@ -49,7 +49,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-zh-CN.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-zh-CN.json index e32639950..e36a4f0f6 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-zh-CN.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app238-zh-CN.json @@ -49,7 +49,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app24.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app24.json index fd8082586..5ca1729ba 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app24.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app24.json @@ -30,7 +30,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app242.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app242.json new file mode 100644 index 000000000..91ab35ea8 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app242.json @@ -0,0 +1,56 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api": { + "get": { + "tags": [ + "test-controller" + ], + "operationId": "getRootModel", + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/RootModel" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "RootModel": { + "type": "object", + "properties": { + "rootProperty": { + "type": "integer", + "format": "int32" + }, + "unwrappedOneProperty": { + "type": "integer", + "format": "int32" + }, + "unwrappedTwoProperty": { + "type": "integer", + "format": "int32" + } + } + } + } + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json new file mode 100644 index 000000000..f332ddaea --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app243.json @@ -0,0 +1,74 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/time1": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "postTime1", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TimeDtoNoAnnotations" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/TimeDtoNoAnnotations" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "TimeDtoNoAnnotations": { + "type": "object", + "properties": { + "localDateTime": { + "type": "string", + "format": "date-time" + }, + "localDate": { + "type": "string", + "format": "date" + }, + "localTime": { + "type": "string" + }, + "yearMonth": { + "type": "string" + }, + "monthDay": { + "type": "string" + }, + "year": { + "type": "string" + } + } + } + } + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app244.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app244.json new file mode 100644 index 000000000..351a43501 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app244.json @@ -0,0 +1,108 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/test/{id}": { + "put": { + "tags": [ + "hello-controller" + ], + "summary": "Update a user by passing the entire object", + "operationId": "update", + "parameters": [ + { + "name": "id", + "in": "path", + "description": "ID of the user to update", + "required": true, + "content": { + "*/*": { + "schema": { + "type": "integer" + } + } + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "type": "string" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/test": { + "get": { + "tags": [ + "hello-controller" + ], + "operationId": "nope", + "parameters": [ + { + "name": "x-header", + "in": "header", + "examples": { + "First": { + "description": "First", + "value": "AAA" + }, + "Second": { + "description": "Second", + "value": "BBB" + }, + "Third": { + "description": "Third", + "value": "CCC" + } + } + } + ], + "responses": { + "200": { + "description": "OK" + } + } + }, + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "uploadMultipartWithBody", + "responses": { + "201": { + "description": "Created", + "headers": { + "Location": { + "required": true, + "style": "simple", + "schema": { + "type": "string" + } + } + } + } + } + } + } + }, + "components": {} +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app246.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app246.json new file mode 100644 index 000000000..fbe41dd73 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app246.json @@ -0,0 +1,70 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": {}, + "webhooks": { + "includedPet": { + "post": { + "operationId": "includedPet", + "requestBody": { + "description": "Information about a new pet in the system", + "content": { + "application/json": { + "schema": { + "description": "Webhook Pet", + "$ref": "#/components/schemas/RequestDto" + } + } + } + }, + "responses": { + "200": { + "description": "Return a 200 status to indicate that the data was received successfully" + } + } + } + }, + "includedNewPet": { + "post": { + "operationId": "includedNewPet", + "requestBody": { + "description": "Information about a new pet in the system", + "content": { + "application/json": { + "schema": { + "description": "Webhook Pet", + "$ref": "#/components/schemas/RequestDto" + } + } + } + }, + "responses": { + "200": { + "description": "Return a 200 status to indicate that the data was received successfully" + } + } + } + } + }, + "components": { + "schemas": { + "RequestDto": { + "type": "object", + "properties": { + "personalNumber": { + "type": "string" + } + } + } + } + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app247.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app247.json new file mode 100644 index 000000000..e0237413f --- /dev/null +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app247.json @@ -0,0 +1,121 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/class-works2": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "dataClass2", + "requestBody": { + "content": { + "multipart/form-data": { + "schema": { + "type": "object", + "properties": { + "metadata2": { + "$ref": "#/components/schemas/MetaData" + } + }, + "required": [ + "metadata2" + ] + }, + "encoding": { + "metadata": { + "contentType": "application/json" + } + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + }, + "/class-works1": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "dataClass1", + "requestBody": { + "content": { + "multipart/form-data": { + "schema": { + "type": "object", + "properties": { + "metadata1": { + "$ref": "#/components/schemas/MetaData" + } + }, + "required": [ + "metadata1" + ] + }, + "encoding": { + "metadata1": { + "contentType": "application/json" + } + } + } + } + }, + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "MetaData": { + "type": "object", + "description": "Metadata as a concrete class", + "properties": { + "name": { + "type": "string" + }, + "value": { + "type": "string" + }, + "settings": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + } + } + } +} diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json index 626e35c37..e6b09672d 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app26.json @@ -64,7 +64,6 @@ "type": "object", "properties": { "thing": { - "type": "object", "description": "Hello", "oneOf": [ { diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app51.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app51.json index 280eab52e..1c0ef542f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app51.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app51.json @@ -22,9 +22,7 @@ "application/json": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -37,9 +35,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app60.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app60.json index e613245c1..d239d9164 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app60.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app60.json @@ -11,18 +11,18 @@ } ], "paths": { - "/hello1": { + "/hello2": { "get": { "tags": [ "hello-controller" ], - "summary": "summary1", - "operationId": "list1", + "summary": "summary2", + "operationId": "list2", "parameters": [ { "name": "page", "in": "query", - "description": "The page", + "description": "desc page from Annotated interface", "required": true, "schema": { "type": "string" @@ -31,7 +31,16 @@ { "name": "size", "in": "query", - "description": "The size", + "description": "desc page from Annotated interface", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "sort", + "in": "query", + "description": "desc sort from Annotated interface", "required": true, "schema": { "type": "string" @@ -45,9 +54,7 @@ "*/*": { "schema": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -55,18 +62,18 @@ } } }, - "/hello2": { + "/hello1": { "get": { "tags": [ "hello-controller" ], - "summary": "summary2", - "operationId": "list2", + "summary": "summary1", + "operationId": "list1", "parameters": [ { "name": "page", "in": "query", - "description": "desc page from Annotated interface", + "description": "The page", "required": true, "schema": { "type": "string" @@ -75,16 +82,7 @@ { "name": "size", "in": "query", - "description": "desc page from Annotated interface", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "sort", - "in": "query", - "description": "desc sort from Annotated interface", + "description": "The size", "required": true, "schema": { "type": "string" @@ -98,9 +96,7 @@ "*/*": { "schema": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app75.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app75.json index fb2f9393f..e5f8d00ae 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app75.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app75.json @@ -11,14 +11,14 @@ } ], "paths": { - "/test1/{uuid}": { + "/test3/{uuid}": { "post": { "tags": [ "hello-controller" ], "summary": "Example api that realize an ECHO operation", "description": "The result of the echo is the input value of the api", - "operationId": "postMyRequestBody1", + "operationId": "postMyRequestBody3", "parameters": [ { "name": "uuid", @@ -33,11 +33,12 @@ ], "responses": { "200": { - "description": "Successful Operation", + "description": "OK", "content": { - "application/json": { + "*/*": { "schema": { - "$ref": "#/components/schemas/PersonDTO" + "type": "array", + "items": {} } } } @@ -99,14 +100,14 @@ } } }, - "/test3/{uuid}": { + "/test1/{uuid}": { "post": { "tags": [ "hello-controller" ], "summary": "Example api that realize an ECHO operation", "description": "The result of the echo is the input value of the api", - "operationId": "postMyRequestBody3", + "operationId": "postMyRequestBody1", "parameters": [ { "name": "uuid", @@ -121,14 +122,11 @@ ], "responses": { "200": { - "description": "OK", + "description": "Successful Operation", "content": { - "*/*": { + "application/json": { "schema": { - "type": "array", - "items": { - "type": "object" - } + "$ref": "#/components/schemas/PersonDTO" } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app87.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app87.json index d460805eb..6545bd5bc 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app87.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app87.json @@ -200,9 +200,7 @@ }, "components": { "schemas": { - "Item": { - "type": "object" - } + "Item": {} } } } diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app9.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app9.json index 1ee84bb45..ceeef8a8f 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app9.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app9.json @@ -24,6 +24,26 @@ } }, "webhooks": { + "newPet1": { + "post": { + "requestBody": { + "description": "Information about a new pet in the system", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RequestDto", + "description": "Webhook Pet" + } + } + } + }, + "responses": { + "200": { + "description": "Return a 200 status to indicate that the data was received successfully" + } + } + } + }, "newPet": { "post": { "requestBody": { diff --git a/springdoc-openapi-starter-webmvc-scalar/.gitignore b/springdoc-openapi-starter-webmvc-scalar/.gitignore new file mode 100644 index 000000000..ab21548c1 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/.gitignore @@ -0,0 +1,144 @@ +###################### +# Project Specific +###################### +/target/www/** +/src/test/javascript/coverage/ + +###################### +# Node +###################### +/node/ +node_tmp/ +node_modules/ +npm-debug.log.* +/.awcache/* +/.cache-loader/* + +###################### +# SASS +###################### +.sass-cache/ + +###################### +# Eclipse +###################### +*.pydevproject +.project +.metadata +tmp/ +tmp/**/* +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath +.factorypath +/src/main/resources/rebel.xml + +# External tool builders +.externalToolBuilders/** + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + +###################### +# Intellij +###################### +.idea/ +*.iml +*.iws +*.ipr +*.ids +*.orig +classes/ +out/ + +###################### +# Visual Studio Code +###################### +.vscode/ + +###################### +# Maven +###################### +/log/ +/target/ + +###################### +# Gradle +###################### +.gradle/ +/build/ + +###################### +# Package Files +###################### +*.jar +*.war +*.ear +*.db + +###################### +# Windows +###################### +# Windows image file caches +Thumbs.db + +# Folder config file +Desktop.ini + +###################### +# Mac OSX +###################### +.DS_Store +.svn + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +###################### +# Directories +###################### +/bin/ +/deploy/ + +###################### +# Logs +###################### +*.log* + +###################### +# Others +###################### +*.class +*.*~ +*~ +.merge_file* + +###################### +# Gradle Wrapper +###################### +!gradle/wrapper/gradle-wrapper.jar + +###################### +# Maven Wrapper +###################### +!.mvn/wrapper/maven-wrapper.jar + +###################### +# ESLint +###################### +.eslintcache \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/pom.xml b/springdoc-openapi-starter-webmvc-scalar/pom.xml new file mode 100644 index 000000000..2c4fcdec8 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/pom.xml @@ -0,0 +1,52 @@ + + 4.0.0 + + org.springdoc + springdoc-openapi + 2.8.13 + + springdoc-openapi-starter-webmvc-scalar + ${project.artifactId} + + + org.springdoc + springdoc-openapi-starter-webmvc-api + ${project.version} + + + com.scalar.maven + scalar + + + jakarta.servlet + jakarta.servlet-api + provided + + + org.springframework.boot + spring-boot-actuator-autoconfigure + true + + + org.apache.tomcat.embed + tomcat-embed-core + test + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.springdoc.openapi.webmvc.scalar + + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarActuatorController.java b/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarActuatorController.java new file mode 100644 index 000000000..7ea602b14 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarActuatorController.java @@ -0,0 +1,88 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.webmvc.scalar; + +import java.io.IOException; + +import com.scalar.maven.webjar.ScalarProperties; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletRequest; +import org.springdoc.scalar.AbstractScalarController; + +import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpoint; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; + +import static org.springdoc.core.utils.Constants.DEFAULT_API_DOCS_ACTUATOR_URL; +import static org.springdoc.scalar.ScalarConstants.DEFAULT_SCALAR_ACTUATOR_PATH; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +/** + * The type Swagger actuator welcome. + */ +@ControllerEndpoint(id = DEFAULT_SCALAR_ACTUATOR_PATH) +public class ScalarActuatorController extends AbstractScalarController { + + /** + * The Web endpoint properties. + */ + private final WebEndpointProperties webEndpointProperties; + + /** + * Instantiates a new Scalar actuator controller. + * + * @param scalarProperties the scalar properties + * @param webEndpointProperties the web endpoint properties + */ + protected ScalarActuatorController(ScalarProperties scalarProperties, WebEndpointProperties webEndpointProperties) { + super(scalarProperties); + this.webEndpointProperties = webEndpointProperties; + } + + @Operation(hidden = true) + @GetMapping(DEFAULT_PATH_SEPARATOR) + public ResponseEntity getDocs(HttpServletRequest request) throws IOException { + return super.getDocs(request.getRequestURL().toString()); + } + + @Operation(hidden = true) + @GetMapping(DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME) + public ResponseEntity getScalarJs() throws IOException { + return super.getScalarJs(); + } + + public String buildApiDocsUrl(String requestUrl) { + return buildApiDocsUrl(requestUrl, DEFAULT_PATH_SEPARATOR + DEFAULT_API_DOCS_ACTUATOR_URL); + } + + public String buildJsBundleUrl(String requestUrl) { + String scalarPath = webEndpointProperties.getBasePath() + scalarProperties.getPath(); + return buildJsBundleUrl(requestUrl, scalarPath); + } +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarConfiguration.java b/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarConfiguration.java new file mode 100644 index 000000000..938a2ba58 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarConfiguration.java @@ -0,0 +1,117 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.webmvc.scalar; + +import com.scalar.maven.webjar.ScalarProperties; +import org.springdoc.core.configuration.SpringDocConfiguration; +import org.springdoc.core.properties.SpringDocConfigProperties; + +import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort; +import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType; +import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.filter.ForwardedHeaderFilter; + +import static org.springdoc.core.utils.Constants.SPRINGDOC_SWAGGER_UI_ENABLED; +import static org.springdoc.core.utils.Constants.SPRINGDOC_USE_MANAGEMENT_PORT; + +/** + * The type Scalar configuration. + * + * @author bnasslahsen + */ +@Lazy(false) +@Configuration(proxyBeanMethods = false) +@ConditionalOnProperty(name = SPRINGDOC_SWAGGER_UI_ENABLED, matchIfMissing = true) +@ConditionalOnWebApplication(type = Type.SERVLET) +@ConditionalOnBean(SpringDocConfiguration.class) +@EnableConfigurationProperties(ScalarProperties.class) +@ConditionalOnProperty(prefix = "scalar", name = "enabled", havingValue = "true", matchIfMissing = true) +public class ScalarConfiguration { + + /** + * Scalar web mvc controller scalar web mvc controller. + * + * @param scalarProperties the scalar properties + * @param springDocConfigProperties the spring doc config properties + * @return the scalar web mvc controller + */ + @Bean + @ConditionalOnProperty(name = SPRINGDOC_USE_MANAGEMENT_PORT, havingValue = "false", matchIfMissing = true) + @ConditionalOnMissingBean + @Lazy(false) + ScalarWebMvcController scalarWebMvcController(ScalarProperties scalarProperties, SpringDocConfigProperties springDocConfigProperties) { + return new ScalarWebMvcController(scalarProperties,springDocConfigProperties); + } + + /** + * Forwarded header filter filter registration bean. + * + * @return the filter registration bean + */ + @Bean + @ConditionalOnMissingBean + @Lazy(false) + public FilterRegistrationBean forwardedHeaderFilter() { + return new FilterRegistrationBean<>(new ForwardedHeaderFilter()); + } + + /** + * The type Swagger actuator welcome configuration. + */ + @ConditionalOnProperty(SPRINGDOC_USE_MANAGEMENT_PORT) + @ConditionalOnClass(WebMvcEndpointHandlerMapping.class) + @ConditionalOnManagementPort(ManagementPortType.DIFFERENT) + static class SwaggerActuatorWelcomeConfiguration { + + /** + * Scalar actuator controller scalar actuator controller. + * + * @param properties the properties + * @param webEndpointProperties the web endpoint properties + * @return the scalar actuator controller + */ + @Bean + @ConditionalOnMissingBean + @Lazy(false) + ScalarActuatorController scalarActuatorController(ScalarProperties properties, WebEndpointProperties webEndpointProperties) { + return new ScalarActuatorController(properties,webEndpointProperties); + } + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarWebMvcController.java b/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarWebMvcController.java new file mode 100644 index 000000000..f357970a1 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/main/java/org/springdoc/webmvc/scalar/ScalarWebMvcController.java @@ -0,0 +1,89 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package org.springdoc.webmvc.scalar; + +import java.io.IOException; + +import com.scalar.maven.webjar.ScalarProperties; +import jakarta.servlet.http.HttpServletRequest; +import org.springdoc.core.properties.SpringDocConfigProperties; +import org.springdoc.scalar.AbstractScalarController; + +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +/** + * The type Scalar web mvc controller. + * + * @author bnasslahsen + */ +@Controller +@RequestMapping("${scalar.path:" + SCALAR_DEFAULT_PATH + "}") +public class ScalarWebMvcController extends AbstractScalarController { + + /** + * The Spring doc config properties. + */ + private final SpringDocConfigProperties springDocConfigProperties; + + /** + * Instantiates a new Scalar web mvc controller. + * + * @param scalarProperties the scalar properties + * @param springDocConfigProperties the spring doc config properties + */ + protected ScalarWebMvcController(ScalarProperties scalarProperties, SpringDocConfigProperties springDocConfigProperties) { + super(scalarProperties); + this.springDocConfigProperties = springDocConfigProperties; + } + + @GetMapping + public ResponseEntity getDocs(HttpServletRequest request) throws IOException { + return super.getDocs(request.getRequestURL().toString()); + } + + @GetMapping({DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME, SCALAR_JS_FILENAME}) + public ResponseEntity getScalarJs() throws IOException { + return super.getScalarJs(); + } + + public String buildApiDocsUrl(String requestUrl) { + String apiDocsPath = springDocConfigProperties.getApiDocs().getPath(); + return buildApiDocsUrl(requestUrl, apiDocsPath); + } + + public String buildJsBundleUrl(String requestUrl) { + String scalarPath = scalarProperties.getPath(); + return buildJsBundleUrl(requestUrl, scalarPath); + } +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-webmvc-scalar/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..5da33ec31 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springdoc.webmvc.scalar.ScalarConfiguration diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/AbstractCommonTest.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/AbstractCommonTest.java new file mode 100644 index 000000000..96cc74da3 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/AbstractCommonTest.java @@ -0,0 +1,148 @@ +package test.org.springdoc.webmvc.scalar; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +@AutoConfigureMockMvc +@ActiveProfiles("test") +@SpringBootTest +public abstract class AbstractCommonTest { + + @Autowired + protected MockMvc mockMvc; + + protected String className = getClass().getSimpleName(); + + protected String getContent(String fileName) { + try { + Path path = Paths.get(AbstractCommonTest.class.getClassLoader().getResource(fileName).toURI()); + List lines = Files.readAllLines(path, StandardCharsets.UTF_8); + StringBuilder sb = new StringBuilder(); + for (String line : lines) { + sb.append(line).append("\n"); + } + return sb.toString(); + } + catch (Exception e) { + throw new RuntimeException("Failed to read file: " + fileName, e); + } + } + + + protected void checkContent(String requestPath) throws Exception { + String expected = getResultFile(); + String scalarJsPath = getScalarJsPath(requestPath); + + mockMvc.perform(get(requestPath)) + .andExpect(status().isOk()) + .andExpect(MockMvcResultMatchers.header().string(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML_VALUE)) + .andExpect(content().string(containsString(scalarJsPath))) + .andExpect(content().string(equalTo(expected))); + mockMvc.perform(get(scalarJsPath)) + .andExpect(status().isOk()); + } + + protected void checkContent(String requestPath, Map headers, String resultFile) throws Exception { + String expected = getContent(resultFile); + String scalarJsPath = getScalarJsPath(requestPath); + + // build the request with headers + MockHttpServletRequestBuilder requestBuilder = get(requestPath); + if (headers != null) { + for (Map.Entry entry : headers.entrySet()) { + requestBuilder.header(entry.getKey(), entry.getValue()); + } + } + + mockMvc.perform(requestBuilder) + .andExpect(status().isOk()) + .andExpect(MockMvcResultMatchers.header().string(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML_VALUE)) + .andExpect(content().string(containsString(scalarJsPath))) + .andExpect(content().string(equalTo(expected))); + + // build the scalar.js request with headers + MockHttpServletRequestBuilder scalarRequestBuilder = get(scalarJsPath); + if (headers != null) { + for (Map.Entry entry : headers.entrySet()) { + scalarRequestBuilder.header(entry.getKey(), entry.getValue()); + } + } + + mockMvc.perform(scalarRequestBuilder) + .andExpect(status().isOk()); + } + + + protected void checkContent(String requestPath, String contextPath) throws Exception { + String expected = getResultFile(); + String scalarJsPath = getScalarJsPath(requestPath); + + mockMvc.perform(get(requestPath).contextPath(contextPath)) + .andExpect(status().isOk()) + .andExpect(MockMvcResultMatchers.header().string(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML_VALUE)) + .andExpect(content().string(containsString(scalarJsPath))) + .andExpect(content().string(equalTo(expected))); + mockMvc.perform(get(scalarJsPath).contextPath(contextPath)) + .andExpect(status().isOk()); + } + + protected void checkContent(String requestPath, String contextPath, String servletPath) throws Exception { + String expected = getResultFile(); + String scalarJsPath = getScalarJsPath(requestPath); + contextPath = sanitizePath(contextPath); + servletPath = sanitizePath(servletPath); + + mockMvc.perform(get(requestPath).contextPath(contextPath).servletPath(servletPath)) + .andExpect(status().isOk()) + .andExpect(MockMvcResultMatchers.header().string(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML_VALUE)) + .andExpect(content().string(containsString(scalarJsPath))) + .andExpect(content().string(equalTo(expected))); + mockMvc.perform(get(scalarJsPath).contextPath(contextPath).servletPath(servletPath)) + .andExpect(status().isOk()); + } + + protected String getResultFile() { + String testNumber = className.replaceAll("[^0-9]", ""); + return getContent("results/app" + testNumber); + } + + private String sanitizePath(String path) { + if (path == null) { + return null; + } + return path.endsWith("/") + ? path.substring(0, path.length() - 1) + : path; + } + + protected static String getScalarJsPath(String requestPath) { + String scalarJsPath; + if(!requestPath.endsWith(DEFAULT_PATH_SEPARATOR)) + scalarJsPath = requestPath + DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME; + else + scalarJsPath = requestPath + SCALAR_JS_FILENAME; + return scalarJsPath; + } +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/AbstractSpringDocActuatorTest.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/AbstractSpringDocActuatorTest.java new file mode 100644 index 000000000..dd22cd5f2 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/AbstractSpringDocActuatorTest.java @@ -0,0 +1,85 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webmvc.scalar; + + +import java.net.http.HttpClient; + +import jakarta.annotation.PostConstruct; + +import org.springframework.boot.test.web.server.LocalManagementPort; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.client.JdkClientHttpRequestFactory; +import org.springframework.web.client.RestClient; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public abstract class AbstractSpringDocActuatorTest extends AbstractCommonTest { + + protected RestClient actuatorRestClient; + + @LocalManagementPort + private int managementPort; + + @PostConstruct + void init() { + HttpClient jdkClient = HttpClient.newBuilder() + .followRedirects(HttpClient.Redirect.NORMAL) + .build(); + this.actuatorRestClient = RestClient.builder() + .requestFactory(new JdkClientHttpRequestFactory(jdkClient)) + .baseUrl("http://localhost:" + managementPort) + .build(); + } + + protected void checkContent(String requestPath) throws Exception { + String scalarJsPath = getScalarJsPath(requestPath); + String contentAsString = actuatorRestClient.get().uri(requestPath).retrieve().body(String.class); + assert contentAsString != null; + assertTrue(contentAsString.contains(scalarJsPath)); + checkHtmlResult(contentAsString); + HttpStatusCode status = actuatorRestClient.get() + .uri(scalarJsPath) + .retrieve() + .toBodilessEntity() + .getStatusCode(); + assertThat(status).isEqualTo(HttpStatus.OK); + } + + protected void checkHtmlResult(String htmlResult) { + String testNumber = className.replaceAll("[^0-9]", ""); + String fileName = "results/app" + testNumber; + checkHtmlResult( fileName, htmlResult); + } + + protected void checkHtmlResult(String fileName, String htmlResult) { + assertTrue(htmlResult.contains("Scalar API Reference")); + assertEquals(this.getContent(fileName), htmlResult.replace("\r", "")); + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app1/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app1/HelloController.java new file mode 100644 index 000000000..243cca1f2 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app1/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app1; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app1/SpringDocApp1Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app1/SpringDocApp1Test.java new file mode 100644 index 000000000..4421fb588 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app1/SpringDocApp1Test.java @@ -0,0 +1,38 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app1; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +public class SpringDocApp1Test extends AbstractCommonTest { + + @Test + void checkContent() throws Exception { + checkContent(SCALAR_DEFAULT_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app10/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app10/HelloController.java new file mode 100644 index 000000000..5525a5bda --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app10/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app10; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app10/SpringDocApp10Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app10/SpringDocApp10Test.java new file mode 100644 index 000000000..4190b7804 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app10/SpringDocApp10Test.java @@ -0,0 +1,55 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app10; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", "springdoc.use-management-port=true", + "management.server.port=9492", "management.endpoints.web.base-path="+ SpringDocApp10Test.ACTUATOR_BASE_PATH }) +class SpringDocApp10Test extends AbstractSpringDocActuatorTest { + + static final String ACTUATOR_BASE_PATH = "/application"; + static final String REQUEST_PATH = ACTUATOR_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkNotFound() throws Exception { + mockMvc.perform(get(SCALAR_DEFAULT_PATH)) + .andExpect(status().isNotFound()); + } + + @Test + void checkContent() throws Exception { + super.checkContent(REQUEST_PATH); + } + + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app11/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app11/HelloController.java new file mode 100644 index 000000000..3e4fc2dd1 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app11/HelloController.java @@ -0,0 +1,46 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app11; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; +import org.springdoc.core.models.GroupedOpenApi; + +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + + @Bean + public GroupedOpenApi userOpenApi() { + return GroupedOpenApi.builder() + .group("users") + .packagesToScan("test.org.springdoc.api.v30.app145") + .build(); + } +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app11/SpringDocApp11Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app11/SpringDocApp11Test.java new file mode 100644 index 000000000..f3e5ee3b4 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app11/SpringDocApp11Test.java @@ -0,0 +1,46 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app11; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", "springdoc.use-management-port=true", + "management.server.port=9493", "management.endpoints.web.base-path="+ SpringDocApp11Test.ACTUATOR_BASE_PATH }) +class SpringDocApp11Test extends AbstractSpringDocActuatorTest { + + static final String ACTUATOR_BASE_PATH = "/application"; + static final String REQUEST_PATH = ACTUATOR_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void testIndex() throws Exception { + super.checkContent(REQUEST_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app12/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app12/HelloController.java new file mode 100644 index 000000000..1000a96d8 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app12/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app12; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app12/SpringDocApp12Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app12/SpringDocApp12Test.java new file mode 100644 index 000000000..61f3f39bf --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app12/SpringDocApp12Test.java @@ -0,0 +1,58 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app12; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", + "springdoc.use-management-port=true", + "management.server.port=9494", + "management.server.base-path="+ SpringDocApp12Test.BASE_PATH, + "management.endpoints.web.base-path="+ SpringDocApp12Test.ACTUATOR_BASE_PATH }) +class SpringDocApp12Test extends AbstractSpringDocActuatorTest { + + static final String BASE_PATH = "/test"; + static final String ACTUATOR_BASE_PATH = "/application"; + static final String REQUEST_PATH = BASE_PATH + ACTUATOR_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkNotFound() throws Exception { + mockMvc.perform(get(ACTUATOR_BASE_PATH + SCALAR_DEFAULT_PATH)) + .andExpect(status().isNotFound()); + } + + @Test + void checkContent() throws Exception { + super.checkContent(REQUEST_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app13/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app13/HelloController.java new file mode 100644 index 000000000..2cfeff0a6 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app13/HelloController.java @@ -0,0 +1,45 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app13; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; +import org.springdoc.core.models.GroupedOpenApi; + +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + + @Bean + public GroupedOpenApi userOpenApi() { + return GroupedOpenApi.builder() + .group("users") + .packagesToScan("test.org.springdoc.api.v30.app145") + .build(); + } +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app13/SpringDocApp13Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app13/SpringDocApp13Test.java new file mode 100644 index 000000000..cd8a2e856 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app13/SpringDocApp13Test.java @@ -0,0 +1,50 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app13; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", + "springdoc.use-management-port=true", + "management.server.port=9495", + "management.server.base-path=/test", + "management.endpoints.web.base-path=/application" }) +class SpringDocApp13Test extends AbstractSpringDocActuatorTest { + + static final String BASE_PATH = "/test"; + static final String ACTUATOR_BASE_PATH = "/application"; + static final String REQUEST_PATH = BASE_PATH + ACTUATOR_BASE_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkContent() throws Exception { + super.checkContent(REQUEST_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app14/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app14/HelloController.java new file mode 100644 index 000000000..2fe3d1e4f --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app14/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app14; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app14/SpringDocApp14Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app14/SpringDocApp14Test.java new file mode 100644 index 000000000..b6f3620bd --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app14/SpringDocApp14Test.java @@ -0,0 +1,66 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app14; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpStatus; +import org.springframework.web.client.HttpClientErrorException; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.fail; +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "management.endpoints.web.exposure.include=*", + "springdoc.show-actuator=true", + "management.server.port=9496", + "server.servlet.context-path=/sample", + "management.server.base-path=/test", + "management.endpoints.web.base-path=/application" }) +class SpringDocApp14Test extends AbstractSpringDocActuatorTest { + + static final String ACTUATOR_BASE_PATH = "/test"; + static final String CONTEXT_PATH = "/sample"; + static final String MANAGEMENT_BASE_PATH = "/application"; + static final String REQUEST_PATH = CONTEXT_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkContent() throws Exception { + checkContent( REQUEST_PATH, CONTEXT_PATH); + } + + @Test + void checkNotFound() throws Exception { + try { + actuatorRestClient.get().uri(ACTUATOR_BASE_PATH + MANAGEMENT_BASE_PATH + SCALAR_DEFAULT_PATH).retrieve().body(String.class);; + fail("Expected 404 Not Found"); + } catch (HttpClientErrorException e) { + assertThat(e.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app15/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app15/HelloController.java new file mode 100644 index 000000000..a21f9e962 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app15/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app15; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app15/SpringDocApp15Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app15/SpringDocApp15Test.java new file mode 100644 index 000000000..d46be38ff --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app15/SpringDocApp15Test.java @@ -0,0 +1,46 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app15; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + +@TestPropertySource(properties = { + "server.servlet.context-path=" + SpringDocApp15Test.CONTEXT_PATH, + "spring.mvc.servlet.path=" + SpringDocApp15Test.SERVLET_PATH +}) +public class SpringDocApp15Test extends AbstractCommonTest { + + static final String CONTEXT_PATH = "/"; + static final String SERVLET_PATH = "/"; + + @Test + void checkContent() throws Exception { + checkContent( SCALAR_DEFAULT_PATH, CONTEXT_PATH, SERVLET_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app16/SpringDocApp16Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app16/SpringDocApp16Test.java new file mode 100644 index 000000000..58d0f03a3 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app16/SpringDocApp16Test.java @@ -0,0 +1,87 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app16; + +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.stream.IntStream; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.hamcrest.Matchers.containsString; +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springdoc.scalar.ScalarConstants.SCALAR_JS_FILENAME; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR; + +@TestPropertySource(properties = { + "server.forward-headers-strategy=framework" +}) +public class SpringDocApp16Test extends AbstractCommonTest { + + private static final String X_FORWARD_PREFIX = "/path/prefix"; + + @Test + void checkContent() throws Exception { + checkContent(SCALAR_DEFAULT_PATH); + } + + @Test + void checkContentForwardedPrefix() throws Exception { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX); + checkContent(SCALAR_DEFAULT_PATH, headers,"results/app16-1" ); + } + + @Test + void checkContentForwardedPrefixHostProto() throws Exception { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX, + "X-Forwarded-Proto", "https", "X-Forwarded-Host", "proxy-host" ); + checkContent(SCALAR_DEFAULT_PATH, headers,"results/app16-2" ); + } + + @Test + void shouldReturnCorrectInitializerJSWhenChangingForwardedPrefixHeader() throws Exception { + var tasks = IntStream.range(0, 10).mapToObj(i -> CompletableFuture.runAsync(() -> { + try { + mockMvc.perform(get(SCALAR_DEFAULT_PATH) + .header("X-Forwarded-Prefix", X_FORWARD_PREFIX + i)) + .andExpect(status().isOk()) + .andExpect(content().string( + containsString(X_FORWARD_PREFIX + i + SCALAR_DEFAULT_PATH) + )) + .andExpect(content().string( + containsString(X_FORWARD_PREFIX + i + SCALAR_DEFAULT_PATH + DEFAULT_PATH_SEPARATOR + SCALAR_JS_FILENAME ) + )); + } + catch (Exception e) { + throw new RuntimeException(e); + } + })).toArray(CompletableFuture[]::new); + CompletableFuture.allOf(tasks).join(); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app17/SpringDocApp17Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app17/SpringDocApp17Test.java new file mode 100644 index 000000000..3aae106f1 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app17/SpringDocApp17Test.java @@ -0,0 +1,62 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app17; + +import java.util.Map; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + +@TestPropertySource(properties = { + "server.forward-headers-strategy=framework", + "scalar.path="+ SpringDocApp17Test.SCALAR_PATH + +}) +public class SpringDocApp17Test extends AbstractCommonTest { + + static final String PREFIX = "/documentation"; + static final String X_FORWARD_PREFIX = "/path/prefix"; + static final String SCALAR_PATH = PREFIX + SCALAR_DEFAULT_PATH; + + @Test + void checkContent() throws Exception { + checkContent(SCALAR_PATH); + } + + @Test + void checkContentForwardedPrefix() throws Exception { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX); + checkContent(SCALAR_PATH, headers,"results/app17-1" ); + } + + @Test + void checkContentForwardedPrefixHostProto() throws Exception { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX, + "X-Forwarded-Proto", "https", "X-Forwarded-Host", "proxy-host" ); + checkContent(SCALAR_PATH, headers,"results/app17-2" ); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app18/SpringDocApp18Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app18/SpringDocApp18Test.java new file mode 100644 index 000000000..b91e6e0f2 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app18/SpringDocApp18Test.java @@ -0,0 +1,74 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webmvc.scalar.app18; + +import java.util.Map; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static test.org.springdoc.webmvc.scalar.app18.SpringDocApp18Test.SCALAR_PATH; + +@TestPropertySource(properties = { + "server.forward-headers-strategy=framework", + "scalar.path="+SCALAR_PATH, + "springdoc.api-docs.path=/bar/openapi/v3" +}) +public class SpringDocApp18Test extends AbstractCommonTest { + + private static final String X_FORWARD_PREFIX = "/path/prefix"; + + private static final String API_DOCS_URL = "/bar/openapi/v3"; + + static final String SCALAR_PATH = "/foo/documentation/scalar"; + + @Test + void checkContent() throws Exception { + checkContent(SCALAR_PATH); + } + + @Test + void shouldServeOpenapiJsonUnderCustomPath() throws Exception { + mockMvc.perform(get(API_DOCS_URL) + .header("X-Forwarded-Prefix", X_FORWARD_PREFIX)) + .andExpect(status().isOk()); + } + + @Test + void checkContentBehindProxy() throws Exception { + Map headers = Map.of("X-Forwarded-Prefix", X_FORWARD_PREFIX); + checkContent(SCALAR_PATH, headers,"results/app18-1" ); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app19/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app19/HelloController.java new file mode 100644 index 000000000..bf5686f47 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app19/HelloController.java @@ -0,0 +1,45 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webmvc.scalar.app19; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app19/SpringDocApp19Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app19/SpringDocApp19Test.java new file mode 100644 index 000000000..eaf0bcac3 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app19/SpringDocApp19Test.java @@ -0,0 +1,48 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.webmvc.scalar.app19; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +@TestPropertySource(properties = "scalar.path="+ SpringDocApp19Test.SCALAR_PATH) +public class SpringDocApp19Test extends AbstractCommonTest { + + static final String SCALAR_PATH = "/" ; + + @Test + void checkContent() throws Exception { + checkContent(SCALAR_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app2/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app2/HelloController.java new file mode 100644 index 000000000..9c1f1b0b7 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app2/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app2; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app2/SpringDocApp2Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app2/SpringDocApp2Test.java new file mode 100644 index 000000000..905b33aa2 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app2/SpringDocApp2Test.java @@ -0,0 +1,47 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app2; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.core.utils.Constants.DEFAULT_API_DOCS_URL; +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + +@TestPropertySource(properties = { + "scalar.path="+ SpringDocApp2Test.SCALAR_PATH, + "springdoc.api-docs.path="+ SpringDocApp2Test.PREFIX + DEFAULT_API_DOCS_URL, +}) +public class SpringDocApp2Test extends AbstractCommonTest { + + static final String PREFIX = "/documentation"; + static final String SCALAR_PATH = PREFIX + SCALAR_DEFAULT_PATH; + + @Test + void checkContent() throws Exception { + checkContent(SCALAR_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app3/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app3/HelloController.java new file mode 100644 index 000000000..d32b81219 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app3/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app3; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app3/SpringDocApp3Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app3/SpringDocApp3Test.java new file mode 100644 index 000000000..b74a2661d --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app3/SpringDocApp3Test.java @@ -0,0 +1,48 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app3; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +@TestPropertySource(properties = { + "spring.mvc.pathmatch.matching-strategy=ant_path_matcher", + "scalar.path="+ SpringDocApp3Test.SCALAR_PATH, + "server.servlet.context-path="+ SpringDocApp3Test.CONTEXT_PATH, + "spring.mvc.servlet.path="+ SpringDocApp3Test.SERVLET_PATH +}) +public class SpringDocApp3Test extends AbstractCommonTest { + + static final String CONTEXT_PATH = "/context-path"; + static final String SERVLET_PATH = "/servlet-path"; + static final String SCALAR_PATH = "/test/scalar"; + static final String REQUEST_PATH = CONTEXT_PATH + SERVLET_PATH + SCALAR_PATH; + + @Test + void checkContent() throws Exception { + checkContent( REQUEST_PATH, CONTEXT_PATH, SERVLET_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp { + } +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app4/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app4/HelloController.java new file mode 100644 index 000000000..28964d93d --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app4/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app4; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app4/SpringDocApp4Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app4/SpringDocApp4Test.java new file mode 100644 index 000000000..0d2f81a7b --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app4/SpringDocApp4Test.java @@ -0,0 +1,60 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app4; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractSpringDocActuatorTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + + +@DirtiesContext +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { "spring.jackson.property-naming-strategy=UPPER_CAMEL_CASE", "springdoc.show-actuator=true", + "management.endpoints.web.base-path=/management", + "server.servlet.context-path="+ SpringDocApp4Test.CONTEXT_PATH, "management.server.port=9401", "management.server.base-path="+ SpringDocApp4Test.CONTEXT_PATH }) +public class SpringDocApp4Test extends AbstractSpringDocActuatorTest { + + static final String CONTEXT_PATH = "/demo/api"; + static final String REQUEST_PATH = CONTEXT_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkContent() throws Exception { + checkContent(REQUEST_PATH, CONTEXT_PATH); + } + + @Test + void checkApi() throws Exception { + mockMvc.perform(get("/demo/api/v3/api-docs/springdocDefault").contextPath("/demo/api")) + .andExpect(status().isOk()); + mockMvc.perform(get("/demo/api/v3/api-docs/x-actuator").contextPath("/demo/api")) + .andExpect(status().isOk()); + } + + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app5/SpringDocApp5Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app5/SpringDocApp5Test.java new file mode 100644 index 000000000..43c0d2908 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app5/SpringDocApp5Test.java @@ -0,0 +1,38 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app5; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static test.org.springdoc.webmvc.scalar.app5.SpringDocApp5Test.API_DOCS_URL; + +@TestPropertySource(properties = "scalar.url=" + API_DOCS_URL) +public class SpringDocApp5Test extends AbstractCommonTest { + + static final String API_DOCS_URL = "http://myserver:8080/v3/api-docs"; + + @Test + void checkContent() throws Exception { + checkContent(SCALAR_DEFAULT_PATH); + } +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app5/SpringDocTestApp.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app5/SpringDocTestApp.java new file mode 100644 index 000000000..7965cb75e --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app5/SpringDocTestApp.java @@ -0,0 +1,53 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app5; + + +import org.springdoc.core.models.GroupedOpenApi; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class SpringDocTestApp { + + public static void main(String[] args) { + SpringApplication.run(SpringDocTestApp.class, args); + } + + @Bean + public GroupedOpenApi storeOpenApi() { + String paths[] = { "/store/**" }; + return GroupedOpenApi.builder() + .group("stores") + .pathsToMatch(paths) + .build(); + } + + @Bean + public GroupedOpenApi groupOpenApi() { + String paths[] = { "/pet/**" }; + return GroupedOpenApi.builder() + .group("pets") + .pathsToMatch(paths) + .build(); + } + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app6/SpringDocApp6Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app6/SpringDocApp6Test.java new file mode 100644 index 000000000..239e03c83 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app6/SpringDocApp6Test.java @@ -0,0 +1,42 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app6; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + +@TestPropertySource(properties = "server.servlet.context-path=" + SpringDocApp6Test.CONTEXT_PATH) +public class SpringDocApp6Test extends AbstractCommonTest { + + static final String CONTEXT_PATH = "/context-path"; + static final String REQUEST_PATH = CONTEXT_PATH + SCALAR_DEFAULT_PATH; + + @Test + void checkContent() throws Exception { + checkContent(REQUEST_PATH, CONTEXT_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app7/SpringDocApp7Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app7/SpringDocApp7Test.java new file mode 100644 index 000000000..439fdca7e --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app7/SpringDocApp7Test.java @@ -0,0 +1,46 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app7; + +import java.util.Map; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; + +@TestPropertySource(properties = { "server.forward-headers-strategy=framework" }) +public class SpringDocApp7Test extends AbstractCommonTest { + + @Test + void checkContent() throws Exception { + Map headers = Map.of("X-Forwarded-Proto", "https", "X-Forwarded-Host", "host1"); + checkContent(SCALAR_DEFAULT_PATH, headers,"results/app7-1" ); + headers = Map.of("X-Forwarded-Proto", "http", "X-Forwarded-Host", "host2:8080"); + checkContent(SCALAR_DEFAULT_PATH, headers,"results/app7-2" ); + } + + @SpringBootApplication + static class SpringDocTestApp { + } + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app8/SpringApp8Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app8/SpringApp8Test.java new file mode 100644 index 000000000..d1c2fac15 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app8/SpringApp8Test.java @@ -0,0 +1,46 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app8; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +@TestPropertySource(properties = { + "spring.mvc.pathmatch.matching-strategy=ant_path_matcher", + "scalar.path="+ SpringApp8Test.SCALAR_PATH, + "spring.mvc.servlet.path="+ SpringApp8Test.SERVLET_PATH +}) +public class SpringApp8Test extends AbstractCommonTest { + + static final String CONTEXT_PATH = "/context-path"; + static final String SERVLET_PATH = "/servlet-path"; + static final String SCALAR_PATH = "/test/scalar"; + static final String REQUEST_PATH = CONTEXT_PATH + SERVLET_PATH + SCALAR_PATH; + + @Test + void checkContent() throws Exception { + checkContent(REQUEST_PATH, CONTEXT_PATH, SERVLET_PATH); + } + + @SpringBootApplication + static class SpringDocTestApp {} +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app9/HelloController.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app9/HelloController.java new file mode 100644 index 000000000..e1cf21877 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app9/HelloController.java @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app9; + + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @GetMapping(value = "/persons") + public void persons(@Valid @RequestParam @Size(min = 4, max = 6) String name) { + + } + +} diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app9/SpringDocApp9Test.java b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app9/SpringDocApp9Test.java new file mode 100644 index 000000000..834c2b6b0 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/java/test/org/springdoc/webmvc/scalar/app9/SpringDocApp9Test.java @@ -0,0 +1,43 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.webmvc.scalar.app9; + +import org.junit.jupiter.api.Test; +import test.org.springdoc.webmvc.scalar.AbstractCommonTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.scalar.ScalarConstants.SCALAR_DEFAULT_PATH; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@TestPropertySource(properties = "scalar.enabled=false") +public class SpringDocApp9Test extends AbstractCommonTest { + + @Test + void checkNotFound() throws Exception { + mockMvc.perform(get(SCALAR_DEFAULT_PATH)) + .andExpect(status().isNotFound()); + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/application-test.yml b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/application-test.yml new file mode 100644 index 000000000..4cff35ff8 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/application-test.yml @@ -0,0 +1,4 @@ +spring: + main: + banner-mode: "off" + lazy-initialization: true diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/logback-test.xml b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/logback-test.xml new file mode 100644 index 000000000..608cb302d --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/logback-test.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app1 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app1 new file mode 100644 index 000000000..19e300d37 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app1 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app10 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app10 new file mode 100644 index 000000000..f5c061728 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app10 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app11 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app11 new file mode 100644 index 000000000..8b67f74a0 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app11 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app12 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app12 new file mode 100644 index 000000000..143bdbe0d --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app12 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app13 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app13 new file mode 100644 index 000000000..35f039756 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app13 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app14 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app14 new file mode 100644 index 000000000..4c16125c7 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app14 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app15 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app15 new file mode 100644 index 000000000..19e300d37 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app15 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16 new file mode 100644 index 000000000..19e300d37 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16-1 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16-1 new file mode 100644 index 000000000..9501a81ca --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16-1 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16-2 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16-2 new file mode 100644 index 000000000..b3de119ee --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app16-2 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17 new file mode 100644 index 000000000..283140e4d --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17-1 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17-1 new file mode 100644 index 000000000..54c4dbde7 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17-1 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17-2 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17-2 new file mode 100644 index 000000000..f57db2773 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app17-2 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app18 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app18 new file mode 100644 index 000000000..5a8152f2d --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app18 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app18-1 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app18-1 new file mode 100644 index 000000000..58a9afb5c --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app18-1 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app19 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app19 new file mode 100644 index 000000000..5d3ff1550 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app19 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app2 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app2 new file mode 100644 index 000000000..0b10a2dde --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app2 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app3 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app3 new file mode 100644 index 000000000..fdc75a528 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app3 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app4 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app4 new file mode 100644 index 000000000..f62a9805b --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app4 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app5 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app5 new file mode 100644 index 000000000..ae093c742 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app5 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app6 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app6 new file mode 100644 index 000000000..de88d5e88 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app6 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app7-1 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app7-1 new file mode 100644 index 000000000..4966e1084 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app7-1 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app7-2 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app7-2 new file mode 100644 index 000000000..13dfec43b --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app7-2 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app8 b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app8 new file mode 100644 index 000000000..b84405624 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-scalar/src/test/resources/results/app8 @@ -0,0 +1,25 @@ + + + + Scalar API Reference + + + + + +
+ + + + + + + + \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-ui/pom.xml b/springdoc-openapi-starter-webmvc-ui/pom.xml index a02c5f0e4..b134b667d 100644 --- a/springdoc-openapi-starter-webmvc-ui/pom.xml +++ b/springdoc-openapi-starter-webmvc-ui/pom.xml @@ -3,9 +3,10 @@ org.springdoc springdoc-openapi - 2.8.5 + 2.8.13 springdoc-openapi-starter-webmvc-ui + ${project.artifactId} @@ -35,7 +36,7 @@ org.springframework.boot - spring-boot-starter-actuator + spring-boot-actuator-autoconfigure true @@ -60,4 +61,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java index 8d5eb953c..4593187a0 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; @@ -135,7 +135,7 @@ SwaggerUiHome swaggerUiHome() { @Bean @ConditionalOnMissingBean @Lazy(false) - SwaggerIndexTransformer indexPageTransformer(SwaggerUiConfigProperties swaggerUiConfig, SwaggerUiOAuthProperties swaggerUiOAuthProperties, + SwaggerIndexTransformer indexPageTransformer(SwaggerUiConfigProperties swaggerUiConfig, SwaggerUiOAuthProperties swaggerUiOAuthProperties, SwaggerWelcomeCommon swaggerWelcomeCommon, ObjectMapperProvider objectMapperProvider) { return new SwaggerIndexPageTransformer(swaggerUiConfig, swaggerUiOAuthProperties, swaggerWelcomeCommon, objectMapperProvider); } @@ -189,7 +189,7 @@ static class SwaggerActuatorWelcomeConfiguration { @Bean @ConditionalOnMissingBean @Lazy(false) - SwaggerWelcomeActuator swaggerActuatorWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, WebEndpointProperties webEndpointProperties) { + SwaggerWelcomeActuator swaggerActuatorWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, WebEndpointProperties webEndpointProperties) { return new SwaggerWelcomeActuator(swaggerUiConfig, springDocConfigProperties, webEndpointProperties); } } diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfigResource.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfigResource.java index fb442976b..6afa04e74 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfigResource.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerConfigResource.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexPageTransformer.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexPageTransformer.java index 18355a4fd..585eaaad7 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexPageTransformer.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexPageTransformer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; @@ -74,7 +74,7 @@ public Resource transform(HttpServletRequest request, Resource resource, ResourceTransformerChain transformerChain) throws IOException { SwaggerUiConfigParameters swaggerUiConfigParameters = new SwaggerUiConfigParameters(swaggerUiConfig); swaggerWelcomeCommon.buildFromCurrentContextPath(swaggerUiConfigParameters, request); - + final AntPathMatcher antPathMatcher = new AntPathMatcher(); boolean isIndexFound = antPathMatcher.match("**/swagger-ui/**/" + SWAGGER_INITIALIZER_JS, resource.getURL().toString()); diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexTransformer.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexTransformer.java index 1463a8f04..7531334f4 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexTransformer.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerIndexTransformer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerResourceResolver.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerResourceResolver.java index 0be64bcb5..2956ed7ff 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerResourceResolver.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerResourceResolver.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; @@ -64,7 +64,7 @@ public SwaggerResourceResolver(SwaggerUiConfigProperties swaggerUiConfigProperti @Override protected String findWebJarResourcePath(String pathStr) { String resourcePath = super.findWebJarResourcePath(pathStr); - if(resourcePath == null) + if (resourcePath == null) return findSwaggerResourcePath(pathStr, swaggerUiConfigProperties.getVersion()); return resourcePath; } diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerUiHome.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerUiHome.java index e7f0bc825..1eebe5201 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerUiHome.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerUiHome.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWebMvcConfigurer.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWebMvcConfigurer.java index 1399e0857..981eb4205 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWebMvcConfigurer.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWebMvcConfigurer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeActuator.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeActuator.java index 769911e61..d4b7077e7 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeActuator.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeActuator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; @@ -69,7 +69,7 @@ public class SwaggerWelcomeActuator extends SwaggerWelcomeCommon { * @param springDocConfigProperties the swagger ui config parameters * @param webEndpointProperties the web endpoint properties */ - public SwaggerWelcomeActuator(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties,WebEndpointProperties webEndpointProperties) { + public SwaggerWelcomeActuator(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, WebEndpointProperties webEndpointProperties) { super(swaggerUiConfig, springDocConfigProperties); this.webEndpointProperties = webEndpointProperties; } diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeCommon.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeCommon.java index f202d6c5d..7fa79368a 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeCommon.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeCommon.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; @@ -102,10 +102,10 @@ protected void calculateOauth2RedirectUrl(SwaggerUiConfigParameters swaggerUiCon * @param swaggerUiConfigParameters the swagger ui config parameters * @param request the request */ - void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, HttpServletRequest request) { + void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, HttpServletRequest request) { super.init(swaggerUiConfigParameters); swaggerUiConfigParameters.setContextPath(request.getContextPath()); buildConfigUrl(swaggerUiConfigParameters, ServletUriComponentsBuilder.fromCurrentContextPath()); } - + } diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeWebMvc.java b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeWebMvc.java index 00f485938..a6be3f41e 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeWebMvc.java +++ b/springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeWebMvc.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package org.springdoc.webmvc.ui; @@ -75,14 +75,14 @@ public SwaggerWelcomeWebMvc(SwaggerUiConfigProperties swaggerUiConfig, SpringDoc super(swaggerUiConfig, springDocConfigProperties); this.springWebProvider = springWebProvider; } - + @Operation(hidden = true) @GetMapping(SWAGGER_UI_PATH) @Override public ResponseEntity redirectToUi(HttpServletRequest request) { return super.redirectToUi(request); } - + @Override protected void calculateUiRootPath(SwaggerUiConfigParameters swaggerUiConfigParameters, StringBuilder... sbUrls) { StringBuilder sbUrl = new StringBuilder(); @@ -90,14 +90,14 @@ protected void calculateUiRootPath(SwaggerUiConfigParameters swaggerUiConfigPara sbUrl.append(mvcServletPath); calculateUiRootCommon(swaggerUiConfigParameters, sbUrl, sbUrls); } - + @Override protected String buildUrl(String contextPath, final String docsUrl) { if (SpringDocUtils.isValidPath(mvcServletPath)) contextPath += mvcServletPath; return super.buildUrl(contextPath, docsUrl); } - + @Override protected void buildApiDocUrl(SwaggerUiConfigParameters swaggerUiConfigParameters) { swaggerUiConfigParameters.setApiDocsUrl(buildUrlWithContextPath(swaggerUiConfigParameters, springDocConfigProperties.getApiDocs().getPath())); @@ -109,7 +109,7 @@ protected String buildUrlWithContextPath(SwaggerUiConfigParameters swaggerUiConf swaggerUiConfigParameters.setPathPrefix(springWebProvider.findPathPrefix(springDocConfigProperties)); return buildUrl(swaggerUiConfigParameters.getContextPath() + swaggerUiConfigParameters.getPathPrefix(), swaggerUiUrl); } - + @Override protected void buildSwaggerConfigUrl(SwaggerUiConfigParameters swaggerUiConfigParameters) { swaggerUiConfigParameters.setConfigUrl(swaggerUiConfigParameters.getApiDocsUrl() + DEFAULT_PATH_SEPARATOR + SWAGGER_CONFIG_FILE); diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java index 768ace84f..1fc6b9609 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java @@ -14,7 +14,7 @@ @AutoConfigureMockMvc @ActiveProfiles("test") -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractCommonTest { @Autowired diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java index a6cd22a4a..ef13652f4 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java @@ -35,21 +35,21 @@ public abstract class AbstractSpringDocTest extends AbstractCommonTest { public static String className; protected void checkJS(String fileName, String uri, String contextPath) throws Exception { - MvcResult mvcResult = mockMvc.perform(get(contextPath+uri).contextPath(contextPath)).andExpect(status().isOk()).andReturn(); + MvcResult mvcResult = mockMvc.perform(get(contextPath + uri).contextPath(contextPath)).andExpect(status().isOk()).andReturn(); String transformedIndex = mvcResult.getResponse().getContentAsString(); assertTrue(transformedIndex.contains("window.ui")); assertEquals("no-store", mvcResult.getResponse().getHeader("Cache-Control")); assertEquals(this.getContent(fileName), transformedIndex.replace("\r", "")); } - protected void chekJS(String fileName,String contextPath) throws Exception { - checkJS(fileName, Constants.SWAGGER_INITIALIZER_URL,contextPath); + protected void chekJS(String fileName, String contextPath) throws Exception { + checkJS(fileName, Constants.SWAGGER_INITIALIZER_URL, contextPath); } protected void chekJS(String contextPath) throws Exception { className = getClass().getSimpleName(); String testNumber = className.replaceAll("[^0-9]", ""); - checkJS("results/app" + testNumber, Constants.SWAGGER_INITIALIZER_URL,contextPath); + checkJS("results/app" + testNumber, Constants.SWAGGER_INITIALIZER_URL, contextPath); } protected void chekJS() throws Exception { diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocSwaggerConfigWithBothFileGeneratedSpecsTest.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocSwaggerConfigWithBothFileGeneratedSpecsTest.java index 69cbf8726..642c806c6 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocSwaggerConfigWithBothFileGeneratedSpecsTest.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocSwaggerConfigWithBothFileGeneratedSpecsTest.java @@ -42,7 +42,7 @@ "server.servlet.context-path=/demo/api", "management.server.port=9302", "management.server.base-path=/demo/api", "springdoc.swagger-ui.urls[0].url=/api-docs/xxx/v1/openapi.yml", "springdoc.swagger-ui.urls[0].name=toto", -}) + }) public class SpringDocSwaggerConfigWithBothFileGeneratedSpecsTest extends AbstractSpringDocActuatorTest { @Test diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app3/WebConfig.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app3/WebConfig.java index 6c00a18a9..ef0d399cb 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app3/WebConfig.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app3/WebConfig.java @@ -21,7 +21,7 @@ package test.org.springdoc.ui.app3; /** - * @author bnasslashen + * */ import org.springframework.context.annotation.Configuration; diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java index 7d4e99c67..29170fccc 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app32/SpringDocBehindProxyTest.java @@ -92,7 +92,8 @@ void shouldReturnCorrectInitializerJSWhenChangingForwardedPrefixHeader() throws .andExpect(content().string( containsString("\"configUrl\" : \"/path/prefix" + i + "/v3/api-docs/swagger-config\",") )); - } catch (Exception e) { + } + catch (Exception e) { throw new RuntimeException(e); } })).toArray(CompletableFuture[]::new); @@ -113,14 +114,15 @@ void shouldCalculateUrlsBehindProxyWhenChangingForwardedPrefixHeader() { .andExpect(jsonPath("configUrl", equalTo("/path/prefix" + i + "/v3/api-docs/swagger-config") )); - } catch (Exception e) { + } + catch (Exception e) { throw new RuntimeException(e); } })).toArray(CompletableFuture[]::new); CompletableFuture.allOf(tasks).join(); } - + @SpringBootApplication static class SpringDocTestApp {} } diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java index 505002f44..8f6cb5f1a 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app34/SpringDocApp34Test.java @@ -41,7 +41,7 @@ void test() throws Exception { super.chekJS(); } - + @SpringBootApplication static class SpringDocTestApp {} diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app35/SpringDocApp35Test.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app35/SpringDocApp35Test.java index bca32be6e..ef2276732 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app35/SpringDocApp35Test.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app35/SpringDocApp35Test.java @@ -41,7 +41,7 @@ void test() throws Exception { super.chekJS(); } - + @SpringBootApplication static class SpringDocTestApp {} diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocApp5Test.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocApp5Test.java index 4f30b091e..ae1db6d27 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocApp5Test.java @@ -30,14 +30,14 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static test.org.springdoc.ui.app5.SpringDocApp5Test.CONTEXT_PATH; -@TestPropertySource(properties = "server.servlet.context-path="+CONTEXT_PATH) +@TestPropertySource(properties = "server.servlet.context-path=" + CONTEXT_PATH) public class SpringDocApp5Test extends AbstractSpringDocTest { public static final String CONTEXT_PATH = "/context-path"; @Test void oauth2_redirect_url_calculated_with_context_path() throws Exception { - mockMvc.perform(get(CONTEXT_PATH+"/v3/api-docs/swagger-config").contextPath("/context-path")) + mockMvc.perform(get(CONTEXT_PATH + "/v3/api-docs/swagger-config").contextPath("/context-path")) .andExpect(status().isOk()) .andExpect(jsonPath("oauth2RedirectUrl", equalTo("http://localhost/context-path/swagger-ui/oauth2-redirect.html"))); super.chekJS(CONTEXT_PATH); diff --git a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app8/SpringDocApp8MultipleUrlsSeveralParallelRequestsTest.java b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app8/SpringDocApp8MultipleUrlsSeveralParallelRequestsTest.java index fb077b093..77919360c 100644 --- a/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app8/SpringDocApp8MultipleUrlsSeveralParallelRequestsTest.java +++ b/springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app8/SpringDocApp8MultipleUrlsSeveralParallelRequestsTest.java @@ -66,7 +66,7 @@ void swagger_config_for_multiple_groups_and_many_parallel_requests() { mockMvc.perform(get("/v3/api-docs/swagger-config")) .andExpect(status().isOk()) .andExpect(jsonPath("configUrl", equalTo("/servlet-path/v3/api-docs/swagger-config"))) - .andExpect(jsonPath("url").doesNotExist()) + .andExpect(jsonPath("url").doesNotExist()) .andExpect(jsonPath("urls.length()", equalTo(3))) .andExpect(jsonPath("urls[0].url", equalTo("/servlet-path/api-docs.yaml"))) .andExpect(jsonPath("urls[0].name", equalTo("first-user-list"))) @@ -74,7 +74,8 @@ void swagger_config_for_multiple_groups_and_many_parallel_requests() { .andExpect(jsonPath("urls[1].name", equalTo("second-user-list"))) .andExpect(jsonPath("urls[2].url", equalTo("/servlet-path/api-docs.yaml"))) .andExpect(jsonPath("urls[2].name", equalTo("third-user-list"))); - } catch (Exception e) { + } + catch (Exception e) { throw new RuntimeException(e); } })) diff --git a/springdoc-openapi-tests/pom.xml b/springdoc-openapi-tests/pom.xml index 9c8e6964b..0da1b2a86 100644 --- a/springdoc-openapi-tests/pom.xml +++ b/springdoc-openapi-tests/pom.xml @@ -2,13 +2,18 @@ springdoc-openapi org.springdoc - 2.8.5 + 2.8.13 pom 4.0.0 springdoc-openapi-tests + ${project.artifactId} + + true + + springdoc-openapi-security-tests springdoc-openapi-groovy-tests @@ -35,4 +40,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/pom.xml index aec25732c..759913046 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/pom.xml @@ -2,11 +2,12 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-actuator-webflux-tests + ${project.artifactId} @@ -26,12 +27,6 @@ reactor-netty-http test - - io.netty - netty-resolver-dns-native-macos - osx-aarch_64 - test - - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java index a9ca71da1..277bb0704 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -46,7 +46,7 @@ @AutoConfigureWebTestClient(timeout = "3600000") @ActiveProfiles("test") -@TestPropertySource(properties = { "management.endpoints.enabled-by-default=false" , "springdoc.api-docs.version=openapi_3_0" }) +@TestPropertySource(properties = { "management.endpoints.enabled-by-default=false", "springdoc.api-docs.version=openapi_3_0" }) public abstract class AbstractCommonTest { protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class); @@ -65,10 +65,10 @@ protected String getContent(String fileName) { } } - protected void testApp(String testId, String groupName) throws Exception{ + protected void testApp(String testId, String groupName) throws Exception { String result = null; try { - EntityExchangeResult getResult = webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + "/" + groupName).exchange() + EntityExchangeResult getResult = webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + "/" + groupName).exchange() .expectStatus().isOk().expectBody().returnResult(); result = new String(getResult.getResponseBody()); String expected = getContent("results/3.0.1/app" + testId + ".json"); diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java index 9cf22257e..2684acc75 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -48,12 +48,12 @@ void init() { .build(); } - protected void testWithWebClient(String testId, String uri) throws Exception{ + protected void testWithWebClient(String testId, String uri) throws Exception { String result = null; try { result = webClient.get().uri(uri).retrieve() .bodyToMono(String.class).block(); - String expected = getContent("results/3.0.1/app"+testId+".json"); + String expected = getContent("results/3.0.1/app" + testId + ".json"); assertEquals(expected, result, true); } catch (AssertionError e) { diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index e48725728..d41e7dfb3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java index d47194eb5..d3242be6d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java @@ -45,12 +45,12 @@ public class SpringDocApp148Test extends AbstractSpringDocActuatorTest { @Test void testApp() throws Exception { - super.testWithWebClient("148-1","/test/application/openapi/users"); + super.testWithWebClient("148-1", "/test/application/openapi/users"); } @Test void testApp2() throws Exception { - super.testWithWebClient("148-2","/test/application/openapi/x-actuator"); + super.testWithWebClient("148-2", "/test/application/openapi/x-actuator"); } @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java index 72fdba6df..68d085e65 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; @@ -65,10 +65,10 @@ protected String getContent(String fileName) { } } - protected void testApp(String testId, String groupName) throws Exception{ + protected void testApp(String testId, String groupName) throws Exception { String result = null; try { - EntityExchangeResult getResult = webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + "/" + groupName).exchange() + EntityExchangeResult getResult = webTestClient.get().uri(Constants.DEFAULT_API_DOCS_URL + "/" + groupName).exchange() .expectStatus().isOk().expectBody().returnResult(); result = new String(getResult.getResponseBody()); String expected = getContent("results/3.1.0/app" + testId + ".json"); diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java index f6c67f5be..bca2f653a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; @@ -48,12 +48,12 @@ void init() { .build(); } - protected void testWithWebClient(String testId, String uri) throws Exception{ + protected void testWithWebClient(String testId, String uri) throws Exception { String result = null; try { result = webClient.get().uri(uri).retrieve() .bodyToMono(String.class).block(); - String expected = getContent("results/3.1.0/app"+testId+".json"); + String expected = getContent("results/3.1.0/app" + testId + ".json"); assertEquals(expected, result, true); } catch (AssertionError e) { diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index f2b629759..f2399e0fa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java index bc6a1a27d..74bd9f010 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webflux-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java @@ -45,12 +45,12 @@ public class SpringDocApp148Test extends AbstractSpringDocActuatorTest { @Test void testApp() throws Exception { - super.testWithWebClient("148-1","/test/application/openapi/users"); + super.testWithWebClient("148-1", "/test/application/openapi/users"); } @Test void testApp2() throws Exception { - super.testWithWebClient("148-2","/test/application/openapi/x-actuator"); + super.testWithWebClient("148-2", "/test/application/openapi/x-actuator"); } @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/pom.xml index c7eaa8f48..ee0ba5beb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/pom.xml @@ -2,11 +2,12 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-actuator-webmvc-tests + ${project.artifactId} @@ -28,4 +29,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java index f3e9a665e..5ee550fd6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -39,7 +39,7 @@ @AutoConfigureMockMvc @ActiveProfiles("test") -@TestPropertySource(properties = { "management.endpoints.enabled-by-default=false" , "springdoc.api-docs.version=openapi_3_0" }) +@TestPropertySource(properties = { "management.endpoints.enabled-by-default=false", "springdoc.api-docs.version=openapi_3_0" }) public abstract class AbstractCommonTest { @Autowired diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java index 9884a05b8..f2303a4b1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocActuatorTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index a4e6f57e5..b1aeae72e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/HelloController.java index 5431305c5..5e9e8101b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app128; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/SpringDocApp128Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/SpringDocApp128Test.java index b1febbe53..bddef855f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/SpringDocApp128Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app128/SpringDocApp128Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app128; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java index 7723a6703..18fa2c940 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app148/SpringDocApp148Test.java @@ -47,12 +47,12 @@ public class SpringDocApp148Test extends AbstractSpringDocActuatorTest { @Test void testApp() throws Exception { - super.testWithRestTemplate("148-1","/test/application/openapi/users"); + super.testWithRestTemplate("148-1", "/test/application/openapi/users"); } @Test void testApp2() throws Exception { - super.testWithRestTemplate("148-2","/test/application/openapi/x-actuator"); + super.testWithRestTemplate("148-2", "/test/application/openapi/x-actuator"); } @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app187/SpringDocApp187Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app187/SpringDocApp187Test.java new file mode 100644 index 000000000..571dc3131 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app187/SpringDocApp187Test.java @@ -0,0 +1,51 @@ +/* + * + * * + * * * + * * * * + * * * * * Copyright 2019-2024 the original author or authors. + * * * * * + * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * you may not use this file except in compliance with the License. + * * * * * You may obtain a copy of the License at + * * * * * + * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * + * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * See the License for the specific language governing permissions and + * * * * * limitations under the License. + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v30.app187; + +import org.junit.jupiter.api.AfterAll; +import test.org.springdoc.api.v30.AbstractSpringDocTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +@TestPropertySource(properties = { "springdoc.show-actuator=true", + "management.endpoints.web.exposure.include=*", + "management.endpoints.enabled-by-default=true", + "management.endpoints.web.exposure.exclude=functions, shutdown" }) +public class SpringDocApp187Test extends AbstractSpringDocTest { + + static { + io.swagger.v3.core.jackson.ModelResolver.enumsAsRef = true; + } + + @AfterAll + static void restore() { + io.swagger.v3.core.jackson.ModelResolver.enumsAsRef = false; + } + + @SpringBootApplication + static class SpringDocTestApp {} + +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/HelloController.java index 513fcfb32..8e1230aea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java index b7f92e0a9..8617d8d54 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/CustomizedOperation.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/CustomizedOperation.java index d3bbb4377..2ec4601c6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/CustomizedOperation.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/CustomizedOperation.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java index 59736e946..da8e908d8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocApp68Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocConfiguration.java index 0e9507d2d..f95d5056e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/SpringDocConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68; @@ -50,9 +50,6 @@ @Configuration public class SpringDocConfiguration { - @SpringBootApplication - static class SpringDocTestApp {} - @Bean public GroupedOpenApi storeOpenApi() { return GroupedOpenApi.builder() @@ -111,7 +108,6 @@ public GroupedOpenApi groupOpenApi() { .build(); } - @Bean public OpenAPI customOpenAPI() { return new OpenAPI() @@ -122,4 +118,7 @@ public OpenAPI customOpenAPI() { .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } + + @SpringBootApplication + static class SpringDocTestApp {} } diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ApiUtil.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ApiUtil.java index 60e24fdae..d4e23829b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ApiUtil.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ApiUtil.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ExceptionTranslator.java index cdb1592e2..13beef4db 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/HomeController.java index 91fabfb4e..75728a51d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApi.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApi.java index 95665ae15..63b6fef85 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiController.java index e3923c258..0fa32114b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegate.java index 0846d81bc..b903d08d1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegateImpl.java index 4eb2fccc7..526660a0f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/pet/PetApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApi.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApi.java index 2f3cea9ab..d7cfa831b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiController.java index 13da99064..703ec0afc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegate.java index 17cb050b3..c682324f1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegateImpl.java index 1eb776ad8..aad49d747 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/store/StoreApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApi.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApi.java index 5545f62b3..1c71c0869 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiController.java index 2e58ecb3a..e56b90737 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegate.java index b16423c01..7ee11a290 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegateImpl.java index 864b26523..ed3154c33 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserClient.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserClient.java index 381c1656e..45bf8ea44 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserClient.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/api/user/UserClient.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body.java index b97ad69b9..ac524ed87 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body1.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body1.java index ac8663f5e..b1422cd92 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body1.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Body1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Category.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Category.java index 832005c87..2150806bf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Category.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Category.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/ModelApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/ModelApiResponse.java index 6412dee05..469937dde 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/ModelApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/ModelApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Order.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Order.java index 55c58ab09..9234afb1f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Order.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Order.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Pet.java index 68e05dbb6..5d6d9c448 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Tag.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Tag.java index 795b7445b..7f0587cac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Tag.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/Tag.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/User.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/User.java index ed63e6134..94e2aaa7d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app68/model/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java index e9ec70e8d..62928cdfd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java index 3dd7c0012..744bf1d65 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java index 05e9fb181..36654117d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java index fde99f3fb..6d0e196e4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; @@ -39,7 +39,7 @@ @AutoConfigureMockMvc @ActiveProfiles("test") -@TestPropertySource(properties = { "management.endpoints.enabled-by-default=false"}) +@TestPropertySource(properties = { "management.endpoints.enabled-by-default=false" }) public abstract class AbstractCommonTest { @Autowired diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java index aed753fc1..cfbce68e3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocActuatorTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index 959c70cac..cdf7ff5d0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/HelloController.java index a60a93147..ed017b5b1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app128; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/SpringDocApp128Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/SpringDocApp128Test.java index 9f186b54f..2f557333c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/SpringDocApp128Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app128/SpringDocApp128Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app128; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java index 740c1951f..6232ca977 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app148/SpringDocApp148Test.java @@ -47,12 +47,12 @@ public class SpringDocApp148Test extends AbstractSpringDocActuatorTest { @Test void testApp() throws Exception { - super.testWithRestTemplate("148-1","/test/application/openapi/users"); + super.testWithRestTemplate("148-1", "/test/application/openapi/users"); } @Test void testApp2() throws Exception { - super.testWithRestTemplate("148-2","/test/application/openapi/x-actuator"); + super.testWithRestTemplate("148-2", "/test/application/openapi/x-actuator"); } @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/HelloController.java index b44dd6ba2..667e23018 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java index 4ea433bf2..2de46e22d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/CustomizedOperation.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/CustomizedOperation.java index 79d64bb21..e067e6473 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/CustomizedOperation.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/CustomizedOperation.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java index 0c45fcf17..8c2419f5e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocApp68Test.java @@ -21,13 +21,20 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68; +import java.util.Optional; + +import io.swagger.v3.core.converter.ModelConverter; +import io.swagger.v3.core.converter.ModelConverters; +import io.swagger.v3.oas.models.media.Schema; import org.hamcrest.Matchers; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; +import org.springdoc.core.converters.OAS31ModelConverter; import org.springdoc.core.utils.Constants; import test.org.springdoc.api.v31.AbstractSpringDocTest; @@ -37,14 +44,24 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; +import static org.springdoc.core.utils.Constants.SPRINGDOC_EXPLICIT_OBJECT_SCHEMA; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@TestPropertySource(properties = { "management.endpoints.enabled-by-default=true", "springdoc.show-actuator=true" }) +@TestPropertySource(properties = { SPRINGDOC_EXPLICIT_OBJECT_SCHEMA + "=true", "management.endpoints.enabled-by-default=true", "springdoc.show-actuator=true" }) public class SpringDocApp68Test extends AbstractSpringDocTest { + @AfterAll + public static void reset() { + System.setProperty(Schema.EXPLICIT_OBJECT_SCHEMA_PROPERTY, "false"); + ModelConverters instance = ModelConverters.getInstance(true); + Optional oas31ModelConverter = + instance.getConverters() + .stream().filter(modelConverter -> modelConverter instanceof OAS31ModelConverter).findAny(); + oas31ModelConverter.ifPresent(instance::removeConverter); + } @Test protected void testApp() throws Exception { diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocConfiguration.java index 8265a1f94..7393d6588 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/SpringDocConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68; @@ -50,9 +50,6 @@ @Configuration public class SpringDocConfiguration { - @SpringBootApplication - static class SpringDocTestApp {} - @Bean public GroupedOpenApi storeOpenApi() { return GroupedOpenApi.builder() @@ -111,7 +108,6 @@ public GroupedOpenApi groupOpenApi() { .build(); } - @Bean public OpenAPI customOpenAPI() { return new OpenAPI() @@ -122,4 +118,7 @@ public OpenAPI customOpenAPI() { .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } + + @SpringBootApplication + static class SpringDocTestApp {} } diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ApiUtil.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ApiUtil.java index a225320c3..29266d234 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ApiUtil.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ApiUtil.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ExceptionTranslator.java index 0d9c3513b..dc4b5c297 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/HomeController.java index 911050848..e2f0c2177 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApi.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApi.java index 40ef935aa..c3ec2dc91 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiController.java index 7a5089d2c..28669b82a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegate.java index 665775682..913a72bb4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegateImpl.java index 24d1da938..5601af587 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/pet/PetApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApi.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApi.java index 9c89eec98..15f46b809 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiController.java index 40929f9a6..4702590e8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegate.java index 5d181918d..6633df318 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegateImpl.java index e2f1b8787..8bfa4c21f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/store/StoreApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApi.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApi.java index b4eddbc31..23f13c670 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiController.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiController.java index 26f8d55d0..828de9667 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegate.java index 08d4d25f2..2342cfdd1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegateImpl.java index f533ac10f..56e25f7c9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserClient.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserClient.java index 5c644c4ed..045648d6b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserClient.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/api/user/UserClient.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body.java index dc3c20294..28e4c5e2f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body1.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body1.java index 93e2f621b..b946685f1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body1.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Body1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Category.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Category.java index e22f47224..370abe37d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Category.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Category.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/ModelApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/ModelApiResponse.java index 09dbc8b62..4a36736eb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/ModelApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/ModelApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Order.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Order.java index 9fc6753f5..c01c18378 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Order.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Order.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Pet.java index d6bb64560..8085439b5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Tag.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Tag.java index 01a25f667..db60c81a1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Tag.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/Tag.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/User.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/User.java index 878ce721a..d7810247b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app68/model/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app68.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java index 891be31f3..01fabe069 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java index 488aa20aa..b5b979d4b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java index c425f0be6..1b50b3a8f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.0.1/app187.json b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.0.1/app187.json new file mode 100644 index 000000000..570e9ddce --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.0.1/app187.json @@ -0,0 +1,894 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "tags": [ + { + "name": "Actuator", + "description": "Monitor and interact", + "externalDocs": { + "description": "Spring Boot Actuator Web API Documentation", + "url": "https://docs.spring.io/spring-boot/docs/current/actuator-api/html/" + } + } + ], + "paths": { + "/actuator/loggers/{name}": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'loggers-name'", + "operationId": "loggerLevels", + "parameters": [ + { + "name": "name", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + }, + "post": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'loggers-name'", + "operationId": "configureLogLevel", + "parameters": [ + { + "name": "name", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LogLevel" + } + } + } + }, + "responses": { + "204": { + "description": "No Content" + }, + "400": { + "description": "Bad Request" + } + } + } + }, + "/actuator": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator root web endpoint", + "operationId": "links", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } + } + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } + } + } + }, + "application/json": { + "schema": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } + } + } + } + } + } + } + } + }, + "/actuator/threaddump": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'threaddump'", + "operationId": "threadDump", + "responses": { + "200": { + "description": "OK", + "content": { + "text/plain;charset=UTF-8": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/scheduledtasks": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'scheduledtasks'", + "operationId": "scheduledTasks", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/sbom": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'sbom'", + "operationId": "sboms", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/sbom/{id}": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'sbom-id'", + "operationId": "sbom", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/octet-stream": { + "schema": { + "type": "object" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + } + }, + "/actuator/metrics": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'metrics'", + "operationId": "listNames", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/metrics/{requiredMetricName}": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'metrics-requiredMetricName'", + "operationId": "metric", + "parameters": [ + { + "name": "requiredMetricName", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "tag", + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + } + }, + "/actuator/mappings": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'mappings'", + "operationId": "mappings", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/loggers": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'loggers'", + "operationId": "loggers", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/info": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'info'", + "operationId": "info", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/heapdump": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'heapdump'", + "operationId": "heapDump", + "parameters": [ + { + "name": "live", + "in": "query", + "schema": { + "type": "boolean" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/octet-stream": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/health": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'health'", + "operationId": "health", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/env": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'env'", + "operationId": "environment", + "parameters": [ + { + "name": "pattern", + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/env/{toMatch}": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'env-toMatch'", + "operationId": "environmentEntry", + "parameters": [ + { + "name": "toMatch", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + } + }, + "/actuator/configprops": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'configprops'", + "operationId": "configurationProperties", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/configprops/{prefix}": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'configprops-prefix'", + "operationId": "configurationPropertiesWithPrefix", + "parameters": [ + { + "name": "prefix", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + } + }, + "/actuator/conditions": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'conditions'", + "operationId": "conditions", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/actuator/caches": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'caches'", + "operationId": "caches", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + }, + "delete": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'caches'", + "operationId": "clearCaches", + "responses": { + "204": { + "description": "No Content" + } + } + } + }, + "/actuator/caches/{cache}": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'caches-cache'", + "operationId": "cache", + "parameters": [ + { + "name": "cache", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "cacheManager", + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + }, + "404": { + "description": "Not Found" + } + } + }, + "delete": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'caches-cache'", + "operationId": "clearCache", + "parameters": [ + { + "name": "cache", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "cacheManager", + "in": "query", + "schema": { + "type": "string" + } + } + ], + "responses": { + "204": { + "description": "No Content" + }, + "404": { + "description": "Not Found" + } + } + } + }, + "/actuator/beans": { + "get": { + "tags": [ + "Actuator" + ], + "summary": "Actuator web endpoint 'beans'", + "operationId": "beans", + "responses": { + "200": { + "description": "OK", + "content": { + "application/vnd.spring-boot.actuator.v3+json": { + "schema": { + "type": "object" + } + }, + "application/vnd.spring-boot.actuator.v2+json": { + "schema": { + "type": "object" + } + }, + "application/json": { + "schema": { + "type": "object" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "LogLevel": { + "type": "string", + "enum": [ + "TRACE", + "DEBUG", + "INFO", + "WARN", + "ERROR", + "FATAL", + "OFF" + ] + }, + "Link": { + "type": "object", + "properties": { + "href": { + "type": "string" + }, + "templated": { + "type": "boolean" + } + } + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.0.1/app68-4.json b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.0.1/app68-4.json index 76d34675f..9fe3e74ae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.0.1/app68-4.json +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.0.1/app68-4.json @@ -35,6 +35,7 @@ "in": "query", "required": true, "schema": { + "minLength": 1, "type": "string" } } diff --git a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.1.0/app68-4.json b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.1.0/app68-4.json index f393a5154..ccf0baf41 100644 --- a/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.1.0/app68-4.json +++ b/springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/resources/results/3.1.0/app68-4.json @@ -35,7 +35,8 @@ "in": "query", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/pom.xml index 689cce0c5..b1cb96630 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/pom.xml @@ -2,10 +2,11 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-data-rest-tests + ${project.artifactId} @@ -34,11 +35,5 @@ h2 test - - org.projectlombok - lombok - test - - - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index 53b6057d9..5b16ec13c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -51,7 +51,7 @@ @ActiveProfiles("test") @SpringBootTest @AutoConfigureMockMvc -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractSpringDocTest { public static String className; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Account.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Account.java index c45a4ac37..76667ac9d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Account.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Account.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/AccountRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/AccountRepository.java index 62c75c379..6ca113254 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/AccountRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/AccountRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -35,7 +35,6 @@ /** * Repository to manage {@link Account} instances. - * */ @RepositoryRestResource public interface AccountRepository extends CrudRepository { diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Customer.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Customer.java index df93bf4f9..e23f23c1c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Customer.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/Customer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/CustomerRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/CustomerRepository.java index fb0da38ec..163df25c5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/CustomerRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/CustomerRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java index 8c5fcfe37..2d63fcc4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/Person.java index b57168bb8..2c1732f07 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/PersonRepository.java index 78c0abc04..51edb5cfb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java index 65bb4c97c..c86e9d87a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java index 87be5b190..29a1c4802 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java index 5132651a4..97e296a5d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java index c094b330d..00adf66f2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java index 5a417e784..22fde9343 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java index 31e790770..f14af4511 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java index 6252302f6..332cd4efb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/PersonDTO.java index e7633340a..0042393d9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java index d3fa04045..44c5b47e3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java index f487167be..66a271f47 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/PersonDTO.java index 3b80ef331..9da98eae7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java index 5d267a330..69d00863b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Account.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Account.java index 201cc5439..985c5087d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Account.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Account.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/AccountRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/AccountRepository.java index 1d5397ed1..bad1adf95 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/AccountRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/AccountRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; @@ -38,7 +38,6 @@ /** * Repository to manage {@link Account} instances. - * */ @RepositoryRestResource @Tag(name = "The account Repository") diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Customer.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Customer.java index 434784ed8..27283dec4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Customer.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/Customer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/CustomerRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/CustomerRepository.java index 17fcc6020..0615c0505 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/CustomerRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/CustomerRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/OpenApiConfig.java index d17b975a4..b867fa1f4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java index 17526d688..501b6fd9c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildProperty.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildProperty.java index 0a2e9911a..4c152e047 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildProperty.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildProperty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app17; @@ -30,11 +30,9 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Data; @Entity -public @Data -class ChildProperty { +public class ChildProperty { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildPropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildPropertyRepository.java index fdcfb3183..9023695a2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildPropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/ChildPropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/Property.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/Property.java index af3c3d6d1..e811710d4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/Property.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/Property.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app17; @@ -32,11 +32,9 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import lombok.Data; @Entity -public @Data -class Property { +public class Property { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/PropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/PropertyRepository.java index cc44d08a1..21edc1a26 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/PropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/PropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java index a59e54168..19f34fb66 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java index 9b02113f5..387d90541 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloWorldModel.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloWorldModel.java index c1071d5e9..d73037498 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloWorldModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloWorldModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java index e1145bc6a..650569070 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/Application.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/Application.java index a353b9266..a861850e9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/Application.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/Application.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app19; @@ -38,12 +38,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; -import lombok.Data; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -@Data @Entity @Table(schema = "application", name = "application") @Schema(description = "app") @@ -103,4 +101,76 @@ public enum AppType { INNER, EXTERNAL } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public AppType getType() { + return type; + } + + public void setType(AppType type) { + this.type = type; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public AuditStatus getAuditStatus() { + return auditStatus; + } + + public void setAuditStatus(AuditStatus auditStatus) { + this.auditStatus = auditStatus; + } + + public LocalDateTime getAuditTime() { + return auditTime; + } + + public void setAuditTime(LocalDateTime auditTime) { + this.auditTime = auditTime; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/ApplicationPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/ApplicationPredicate.java index a8b5332ff..9eb83cba3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/ApplicationPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/ApplicationPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/GreetingController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/GreetingController.java index 63e3a4d20..944554039 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/GreetingController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/GreetingController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/QApplication.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/QApplication.java index 627cbf229..e4de3a242 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/QApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/QApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java index 5e64cbbe3..437293b15 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java index d44c34b07..0c139c895 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/PersonDTO.java index 407f38b21..d93a4990a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java index e6eeb44a1..e92d5b5c1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/Bank.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/Bank.java index 9a7ad78b7..6d7667475 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/Bank.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/Bank.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/BankRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/BankRepository.java index 223623480..095be7bb5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/BankRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/BankRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/CodeLookupRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/CodeLookupRepository.java index d25471fca..03555e966 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/CodeLookupRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/CodeLookupRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; @@ -30,7 +30,7 @@ import org.springframework.data.repository.query.Param; @NoRepositoryBean -public interface CodeLookupRepository { +public interface CodeLookupRepository { EntityT findOneByCode(@Param("code") KeyT code); Long countByCode(KeyT code); diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/DemoApplication.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/DemoApplication.java index 2cc632c6c..0bd4b553d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/DemoApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/DemoApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/EntityDefinition.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/EntityDefinition.java index 458a0813a..5952b604d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/EntityDefinition.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/EntityDefinition.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java index de6c59de5..3d975c4ef 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/Person.java index d1312f8db..2bd3d1fb8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/PersonRepository.java index 95d1dc9c9..aa9fc98c6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java index 090988903..0adeb4498 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/Person.java index 952b6b375..d9b8f5282 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonApi.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonApi.java index 949483d9f..468ba234c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonRepository.java index aea57b358..9ba31f65e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java index 40b3741e9..24c5b0ac7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Clinic.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Clinic.java index b9879fe5c..c6531be7d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Clinic.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Clinic.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app23; @@ -32,18 +32,8 @@ import jakarta.persistence.Id; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -@Data @Entity -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@Builder public class Clinic { @Id @@ -54,4 +44,28 @@ public class Clinic { @NotBlank private String name; + public Clinic(Long id, String name) { + this.id = id; + this.name = name; + } + + public Clinic() { + + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/ClinicRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/ClinicRepo.java index 84e92aa31..a8eb61185 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/ClinicRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/ClinicRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Doctor.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Doctor.java index ec3465d9f..41d1d2796 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Doctor.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/Doctor.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app23; @@ -37,18 +37,8 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -@Data @Entity -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@Builder public class Doctor { @Id @@ -63,4 +53,29 @@ public class Doctor { accessMode = AccessMode.WRITE_ONLY )) private Set clinics; + + public Doctor(Long id, Set clinics) { + this.id = id; + this.clinics = clinics; + } + + public Doctor() { + + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Set getClinics() { + return clinics; + } + + public void setClinics(Set clinics) { + this.clinics = clinics; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/DoctorRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/DoctorRepo.java index b041e5894..67ab355e6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/DoctorRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/DoctorRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java index 7a17c9f5b..9e2298f2c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/QUser.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/QUser.java index 0af0989e2..1057c9043 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/QUser.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/QUser.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java index c9db43749..2cba1f08c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/TesteResource.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/TesteResource.java index 34417ce12..585291213 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/TesteResource.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/TesteResource.java @@ -21,13 +21,12 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; import com.querydsl.core.types.Predicate; -import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -37,7 +36,6 @@ @RestController -@AllArgsConstructor public class TesteResource { @GetMapping("/") diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/User.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/User.java index f0402de53..194b87dfb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; @@ -30,12 +30,8 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Getter; -import lombok.Setter; @Entity -@Getter -@Setter public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -46,5 +42,37 @@ public class User { private String lastName; private String email; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/UserPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/UserPredicate.java index bfca2ed00..786cd386f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/UserPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app24/UserPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java index 7cbac719a..3cd5b17dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Address.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Address.java index 1edaa1bbb..5eebc7dac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Address.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Address.java @@ -21,22 +21,14 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; import jakarta.persistence.Embeddable; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; @Embeddable -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Address { private String name; @@ -51,4 +43,63 @@ public class Address { private String country; + public Address(String name, String street, String number, String zipcode, String city, String country) { + this.name = name; + this.street = street; + this.number = number; + this.zipcode = zipcode; + this.city = city; + this.country = country; + } + + public Address() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public String getZipcode() { + return zipcode; + } + + public void setZipcode(String zipcode) { + this.zipcode = zipcode; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/BaseEntity.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/BaseEntity.java index e9ab93ee2..0f924aa77 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/BaseEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/BaseEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; @@ -31,15 +31,9 @@ import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.PrePersist; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.type.SqlTypes; -@Getter -@Setter -@NoArgsConstructor @MappedSuperclass public abstract class BaseEntity { @@ -53,4 +47,15 @@ private void generateId() { id = UUID.randomUUID(); } + public BaseEntity(UUID id) { + this.id = id; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Cat.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Cat.java index a863cdb3c..8839d874d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Cat.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Cat.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; @@ -29,26 +29,26 @@ import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Cat extends Pet { @Enumerated(EnumType.STRING) private CoatType coat; - @Builder - public Cat(String name, Owner owner, CoatType coat) { - super(name, owner); + public Cat(CoatType coat) { + this.coat = coat; + } + + public Cat() { + super(); + } + + public CoatType getCoat() { + return coat; + } + + public void setCoat(CoatType coat) { this.coat = coat; } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Clinic.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Clinic.java index 4bd47fdbf..3312211dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Clinic.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Clinic.java @@ -21,29 +21,20 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; import java.util.Set; +import java.util.UUID; import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Clinic extends BaseEntity { @NotNull @@ -53,4 +44,33 @@ public class Clinic extends BaseEntity { @ElementCollection private Set
addresses; + public Clinic(UUID id) { + super(id); + } + + public Clinic(UUID id, String name, Set
addresses) { + super(id); + this.name = name; + this.addresses = addresses; + } + + public Clinic() { + super(UUID.randomUUID()); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set
getAddresses() { + return addresses; + } + + public void setAddresses(Set
addresses) { + this.addresses = addresses; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Doctor.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Doctor.java index 406528d9a..0d4a6833c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Doctor.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Doctor.java @@ -21,12 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; import java.util.Set; +import java.util.UUID; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -34,18 +35,8 @@ import jakarta.persistence.ManyToMany; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Doctor extends BaseEntity { @NotNull @@ -61,4 +52,47 @@ public class Doctor extends BaseEntity { @ManyToMany private Set clinics; + public Doctor(String firstname, String lastname, Specialty specialty, Set clinics) { + super(UUID.randomUUID()); + this.firstname = firstname; + this.lastname = lastname; + this.specialty = specialty; + this.clinics = clinics; + } + + public Doctor() { + super(UUID.randomUUID()); + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public Specialty getSpecialty() { + return specialty; + } + + public void setSpecialty(Specialty specialty) { + this.specialty = specialty; + } + + public Set getClinics() { + return clinics; + } + + public void setClinics(Set clinics) { + this.clinics = clinics; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Dog.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Dog.java index 337537a75..b0447ce01 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Dog.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Dog.java @@ -21,38 +21,44 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; +import java.util.UUID; + import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor public class Dog extends Pet { @Enumerated(EnumType.STRING) private CoatType coat; - @Builder - public Dog(String name, Owner owner, CoatType coat) { - super(name, owner); + public Dog(UUID id, CoatType coat) { + super(id); + this.coat = coat; + } + + public Dog(CoatType coat) { this.coat = coat; } + public Dog() { + } + public static enum CoatType { SMOOTH, SHORT, COMBINATION, DOUBLE, HEAVY, SILKY, LONG, CURLY, WIRE, HAIRLESS } + public CoatType getCoat() { + return coat; + } + + public void setCoat(CoatType coat) { + this.coat = coat; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Owner.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Owner.java index a8d12436f..32b2592b2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Owner.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Owner.java @@ -21,30 +21,21 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; import java.util.Set; +import java.util.UUID; import jakarta.persistence.CascadeType; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.OneToMany; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Owner extends BaseEntity { private String firstname; @@ -56,8 +47,54 @@ public class Owner extends BaseEntity { @Embedded private Address addresses; - @EqualsAndHashCode.Exclude @OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL }) private Set pets; + public Owner(UUID id) { + super(id); + } + + public Owner(UUID id, String firstname, String lastname, Address addresses, Set pets) { + super(id); + this.firstname = firstname; + this.lastname = lastname; + this.addresses = addresses; + this.pets = pets; + } + + public Owner() { + super(UUID.randomUUID()); + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public Address getAddresses() { + return addresses; + } + + public void setAddresses(Address addresses) { + this.addresses = addresses; + } + + public Set getPets() { + return pets; + } + + public void setPets(Set pets) { + this.pets = pets; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Pet.java index 77a59719c..4fab042f2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Pet.java @@ -21,11 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -34,21 +36,9 @@ import jakarta.persistence.InheritanceType; import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; @Entity - -@EqualsAndHashCode(callSuper = false) @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) - -@Data -@NoArgsConstructor -@RequiredArgsConstructor - @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, @@ -59,12 +49,33 @@ }) public class Pet extends BaseEntity { - @NonNull @NotNull private String name; - @NonNull @ManyToOne private Owner owner; + public Pet(UUID id) { + super(id); + } + + public Pet() { + super(UUID.randomUUID()); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Owner getOwner() { + return owner; + } + + public void setOwner(Owner owner) { + this.owner = owner; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Specialty.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Specialty.java index 56428ba4a..0dde66325 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Specialty.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/model/Specialty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/ClinicRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/ClinicRepo.java index b7a65d114..1f1f417ff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/ClinicRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/ClinicRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/DoctorRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/DoctorRepo.java index f4155fb8c..84788916e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/DoctorRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/DoctorRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/OwnerRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/OwnerRepo.java index 5c864c484..99a5d5d58 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/OwnerRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/OwnerRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/PetRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/PetRepo.java index 0a924fae1..4c0b856b1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/PetRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app25/repo/PetRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/Person.java index 617ceabd2..0bed1bea3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/PersonRepository.java index 8e5c48f15..8dc50b5ad 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java index f0381cb6c..5d587e28b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringRestConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringRestConfiguration.java index a4a40475f..e88e6427f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringRestConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringRestConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java index 58f687835..6e27894be 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/PersonDTO.java index 9cc882f67..f3802ae7c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java index 3278e2960..5db2059a6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageable.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageable.java index 2de642529..df923fa02 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageable.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageable.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageableReplacement.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageableReplacement.java index 9e8b38341..368492c2e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageableReplacement.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/ExamplePageableReplacement.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app28; @@ -38,7 +38,8 @@ public class ExamplePageableReplacement extends Pageable { /** * Instantiates a new Pageable. - * @param page the page + * + * @param page the page * @param size the size * @param sort the sort */ diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java index 93e341856..9801079c1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java index 72b8d027f..b6d755451 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/Person.java index c824d6dc1..282c0c66a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonApi.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonApi.java index 04f46a79a..35d31e6d8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonRepository.java index b1dbd3b8f..d3ece98f9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java index 77f9d091b..24692a484 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java index 106024df3..2304baf2a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java index a2df76273..f395fc35e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java index b729ce0b6..f3250f478 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/QUser.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/QUser.java index f80b57bc5..9fff7c5aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/QUser.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/QUser.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java index 1620b2c1b..e88afdf3c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/User.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/User.java index a6f2f5f10..956977b67 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app30; @@ -31,12 +31,8 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Getter; -import lombok.Setter; @Entity -@Getter -@Setter public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -47,4 +43,36 @@ public class User { private String lastName; private String email; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/UserPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/UserPredicate.java index 6b5531387..16d61544d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/UserPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app30/UserPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/Person.java index c41696aae..cb37c6019 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app301; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonApi.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonApi.java index 42ea14b32..36e29249b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app301; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonRepository.java index e1ceb492f..da5d62981 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app301; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/SpringDocApp301Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/SpringDocApp301Test.java index 183533b06..4536369b0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/SpringDocApp301Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app301/SpringDocApp301Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app301; @@ -57,7 +57,7 @@ void init() throws IllegalAccessException { Map> _localMixIns = (Map>) FieldUtils.readDeclaredField(_mixIns, "_localMixIns", true); Iterator>> it = _localMixIns.entrySet().iterator(); while (it.hasNext()) { - Map.Entry> entry = it.next(); + Entry> entry = it.next(); if (entry.getKey().toString().startsWith("org.springframework")) { springMixins.put(entry.getKey(), entry.getValue()); it.remove(); diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java index dc7df05e6..3e356af1e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/PersonDTO.java index a995fd804..d90e4e7ca 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java index 10b68f470..c96babf21 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java index c3f80c35b..47581a084 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/PersonDTO.java index 0919022b3..215a1f9e7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java index 6b4113423..322bf51c2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSort.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSort.java index 59e928a3e..3f183eb7a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSort.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSort.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSortReplacement.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSortReplacement.java index 6c48b9b2b..68b686e44 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSortReplacement.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/ExampleSortReplacement.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app33; @@ -38,6 +38,7 @@ public class ExampleSortReplacement extends Sort { /** * Instantiates a new Sort. + * * @param sort the sort */ public ExampleSortReplacement(List sort) { diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java index 1b495fe92..70b539dc7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java index 4eddf485d..a3889693e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Account.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Account.java index 79ed96068..8be609029 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Account.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Account.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/AccountRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/AccountRepository.java index 320f1a7fa..999eaf74d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/AccountRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/AccountRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; @@ -38,7 +38,6 @@ /** * Repository to manage {@link Account} instances. - * */ @RepositoryRestResource @Tag(name = "The account Repository") diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Customer.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Customer.java index e11557c67..5b5c6bcf6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Customer.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/Customer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/CustomerRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/CustomerRepository.java index 1c09702dd..839c46d92 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/CustomerRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/CustomerRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/OpenApiConfig.java index e1b2b1b10..0115657ec 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java index a853bd3d4..f59b71ff0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringRestConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringRestConfiguration.java index 4fcc3a20d..7e866ccaf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringRestConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringRestConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildProperty.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildProperty.java index 4e1f5f2c4..ff065fd13 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildProperty.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildProperty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app35; @@ -31,11 +31,9 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Data; @Entity -public @Data -class ChildProperty { +public class ChildProperty { @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -58,4 +56,6 @@ public String getName() { public void setName(String name) { this.name = name; } + + } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildPropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildPropertyRepository.java index 81bbfebe1..f67c188c4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildPropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/ChildPropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/Property.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/Property.java index 4eeb7aae3..15ac04bc9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/Property.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/Property.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app35; @@ -33,11 +33,10 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import lombok.Data; + @Entity -public @Data -class Property { +public class Property { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/PropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/PropertyRepository.java index ab06524bd..a6f677ba9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/PropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/PropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java index 8c045f8b8..c8d731317 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolder.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolder.java index 13d50ffde..ac9e81bad 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolder.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app36; @@ -33,12 +33,6 @@ @Entity public class EnumFieldHolder { - public enum EnumField { - - FOO, BAR; - - } - @Id @GeneratedValue private Long id; @@ -57,4 +51,10 @@ public void setEnumField(EnumField enumField) { this.enumField = enumField; } + public enum EnumField { + + FOO, BAR; + + } + } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolderRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolderRepository.java index 9de06794b..e044123dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolderRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/EnumFieldHolderRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java index c112fed6d..7dfd39c67 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app36/SpringDocApp36Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/BaseEntity.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/BaseEntity.java index 29236f1b9..d87c2e14f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/BaseEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/BaseEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; @@ -33,9 +33,6 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -43,18 +40,19 @@ * @author bnasslahsen */ -@Data @MappedSuperclass -@DynamicInsert(true) -@DynamicUpdate(true) -@SuperBuilder(toBuilder = true) -@NoArgsConstructor +@DynamicInsert +@DynamicUpdate public abstract class BaseEntity implements Serializable { - /** SVUDI */ + /** + * SVUDI + */ private static final long serialVersionUID = 1L; - /** 数据库中的ID */ + /** + * 数据库中的ID + */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", unique = true, nullable = false, insertable = false, updatable = false) @@ -67,4 +65,19 @@ public abstract class BaseEntity implements Serializable { * @return 是否合法 */ public abstract boolean isValid(); + + public BaseEntity(Long id) { + this.id = id; + } + + public BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductEntity.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductEntity.java index c95da374c..028cd95e9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; @@ -33,41 +33,37 @@ import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.SuperBuilder; /** * @author bnasslahsen */ -@Getter -@Setter -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = false) @Entity @Table(name = "PRODUCT_ENTITY") -@SuperBuilder(toBuilder = true) -@NoArgsConstructor public class ProductEntity extends BaseEntity implements Comparable { - /** SVUDI */ + /** + * SVUDI + */ private static final long serialVersionUID = 1L; - /** 名字. */ + /** + * 名字. + */ @NotNull @Column(nullable = false) private String name; - /** 单价. */ + /** + * 单价. + */ @NotNull @Column(nullable = false) private BigDecimal price; - /** 日期. */ + /** + * 日期. + */ @NotNull @Column(nullable = false) private LocalDate date; @@ -77,7 +73,33 @@ public boolean isValid() { return name != null && price != null && date != null; } - /** 根据日期排序 */ + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; + } + + /** + * 根据日期排序 + */ @Override public int compareTo(ProductEntity oProduct) { return this.getDate().compareTo(oProduct.getDate()); diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductRepository.java index 93dd0ecb3..6fa77ba82 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/ProductRepository.java @@ -21,13 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; /** - * @author bnasslahsen + * */ import java.math.BigDecimal; @@ -51,13 +51,14 @@ @RepositoryRestResource(path = "product") public interface ProductRepository extends JpaRepository { - List findByPrice( @Parameter( + List findByPrice(@Parameter( name = "price", description = "test desc", in = ParameterIn.QUERY, required = true ) @Param("price") BigDecimal price); + /** * 根据商品名称查询商品信息 * @@ -110,6 +111,6 @@ List findByDateBefore( */ List findByNameContainingIgnoreCaseAndDateBefore( @Parameter(name = "name2", required = true) String name, - @Parameter(name = "end2", required = true) @DateTimeFormat(pattern = DateTokenConverter.DEFAULT_DATE_PATTERN) @Param("end") LocalDate end); + @Parameter(name = "end2", required = true) @DateTimeFormat(pattern = DateTokenConverter.DEFAULT_DATE_PATTERN) @Param("end") LocalDate end); } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java index f7cc2471a..957382919 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/DefaultFlatParamObjectController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/DefaultFlatParamObjectController.java index f96bff150..6959bd501 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/DefaultFlatParamObjectController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/DefaultFlatParamObjectController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java index 6c3cff547..8bdbd1818 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/DatabaseLoader.java index a0bfd766e..41479ae9d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/Employee.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/Employee.java index 41a7bbb80..9b4955301 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/Employee.java @@ -21,34 +21,16 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +43,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +63,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeController.java index 09f44adb8..c5cc9a04d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeRepository.java index 78295fc7a..3d7ee133f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java index b21bbadc1..b234c26e8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java index c62943422..6cf474445 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/Country.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/Country.java index 3bc1533a3..21d298f37 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/Country.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/Country.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/CountryPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/CountryPredicate.java index 0a934a1b1..1b21efc19 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/CountryPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/CountryPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/GreetingController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/GreetingController.java index 2739a4143..0f8d64d0f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/GreetingController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/GreetingController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/QCountry.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/QCountry.java index d6294b7b2..2d59a0aa5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/QCountry.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/QCountry.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java index efa971f2c..77b2f6c80 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/DatabaseLoader.java index 94c9b630c..75411aebe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/Employee.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/Employee.java index f3e76b2bd..2d651d334 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeController.java index 1be9db363..c5e5c23a3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeRepository.java index d850232ef..cc2c3c550 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java index 886f9105d..9d526f438 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocTestApp.java index 1ec73e3c4..0ab2580d7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java index cae453e79..4ce41fa4e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/PersonDTO.java index 7e66b26a6..e36e19f61 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java index 06ee8c982..958af9c51 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/Album.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/Album.java index 3a3bea5e2..9a61477a8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/Album.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/Album.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumController.java index 21a5f0cd1..cbb4bb069 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumModelAssembler.java index a68002442..97e0b474c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/AlbumModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java index 1b6a8682e..995501dd8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java index 96b79a9a6..745ab9244 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/ComponentsController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/ComponentsController.java index 878c31b11..4a298f1b2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/ComponentsController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/ComponentsController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.component.controller; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/ComponentDtoModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/ComponentDtoModelAssembler.java index f9b2b5497..c1e94c11a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/ComponentDtoModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/ComponentDtoModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.component.controller.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java index b555eb898..7fe8adef5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.component.controller.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/DemoComponentDto.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/DemoComponentDto.java index a4ba03883..b4f8b49d6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/DemoComponentDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/DemoComponentDto.java @@ -21,23 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.component.dto; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; import org.springframework.hateoas.server.core.Relation; -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor @Relation(collectionRelation = "components") @Schema(description = "A demo component to illustrate Springdoc Issue #401") public final class DemoComponentDto { @@ -48,4 +40,56 @@ public final class DemoComponentDto { @Schema(description = "Some dummy payload", example = "Hello World") private String payload; + public DemoComponentDto(String id, String payload) { + this.id = id; + this.payload = payload; + } + + private DemoComponentDto(Builder builder) { + setId(builder.id); + setPayload(builder.payload); + } + + public static Builder builder() { + return new Builder(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPayload() { + return payload; + } + + public void setPayload(String payload) { + this.payload = payload; + } + + public static final class Builder { + private String id; + + private String payload; + + private Builder() { + } + + public Builder id(String val) { + id = val; + return this; + } + + public Builder payload(String val) { + payload = val; + return this; + } + + public DemoComponentDto build() { + return new DemoComponentDto(this); + } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/converter/DemoComponentConverter.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/converter/DemoComponentConverter.java index 046747a19..32965c29e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/converter/DemoComponentConverter.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/dto/converter/DemoComponentConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.component.dto.converter; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/model/DemoComponent.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/model/DemoComponent.java index 900153f3c..7b34937a1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/model/DemoComponent.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/model/DemoComponent.java @@ -21,22 +21,14 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.component.model; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; import org.springframework.data.annotation.Id; -@Data -@Builder -@AllArgsConstructor -@EqualsAndHashCode public class DemoComponent { @Id @@ -44,4 +36,52 @@ public class DemoComponent { private String payload; + public DemoComponent(String id, String payload) { + this.id = id; + this.payload = payload; + } + + private DemoComponent(Builder builder) { + setId(builder.id); + setPayload(builder.payload); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPayload() { + return payload; + } + + public void setPayload(String payload) { + this.payload = payload; + } + + public static final class Builder { + private String id; + + private String payload; + + public Builder() { + } + + public Builder id(String val) { + id = val; + return this; + } + + public Builder payload(String val) { + payload = val; + return this; + } + + public DemoComponent build() { + return new DemoComponent(this); + } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/service/ComponentsService.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/service/ComponentsService.java index b162699d0..cf024e8de 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/service/ComponentsService.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/component/service/ComponentsService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.component.service; @@ -32,6 +32,7 @@ import java.util.Optional; import test.org.springdoc.api.v30.app9.component.model.DemoComponent; +import test.org.springdoc.api.v30.app9.component.model.DemoComponent.Builder; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -41,7 +42,9 @@ @Service public class ComponentsService { - private static final Map repo = Collections.singletonMap("1", DemoComponent.builder().id("1").payload("Hello World !").build()); + private static final Map repo = Collections.singletonMap("1", + + new Builder().id("1").payload("Hello World !").build()); public Optional findById(String componentId) { return Optional.ofNullable(repo.get(componentId)); diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/OpenAPIConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/OpenAPIConfiguration.java index 946a7e170..9e4765ec8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/OpenAPIConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/OpenAPIConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.core.config; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/SpringRestConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/SpringRestConfiguration.java index d0a1f9751..dffe38391 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/SpringRestConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/SpringRestConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.core.config; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/WebMvcConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/WebMvcConfiguration.java index d04900fec..2baac6adb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/WebMvcConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/config/WebMvcConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.core.config; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BadArgumentException.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BadArgumentException.java index 16e450418..f40e931be 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BadArgumentException.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BadArgumentException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.core.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BusinessException.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BusinessException.java index b71019f31..665e69d9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BusinessException.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/exception/BusinessException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.core.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/model/ExceptionDto.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/model/ExceptionDto.java index 1b66c28ba..ecf907bc8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/model/ExceptionDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/core/model/ExceptionDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.core.model; @@ -31,13 +31,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.NonNull; -@Data public class ExceptionDto { - @NonNull @NotNull @NotEmpty @Schema(description = "The date and time the problem occured", example = "2020-02-04T13:21:08.098+0000", type = "string", format = "date-time") @@ -49,4 +45,27 @@ public class ExceptionDto { @Schema(description = "The exception message", example = "Trying to update a non existing component !") private String message; + public Instant getTimestamp() { + return timestamp; + } + + public void setTimestamp(Instant timestamp) { + this.timestamp = timestamp; + } + + public String getException() { + return exception; + } + + public void setException(String exception) { + this.exception = exception; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/utils/Converter.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/utils/Converter.java index 9ab47120c..756880d07 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/utils/Converter.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v30/app9/utils/Converter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.utils; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index a88d3265e..29bbac4aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Account.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Account.java index fe913cdcc..4d6809ad9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Account.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Account.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/AccountRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/AccountRepository.java index 2ad726fb0..9c9cc8bb5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/AccountRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/AccountRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -35,7 +35,6 @@ /** * Repository to manage {@link Account} instances. - * */ @RepositoryRestResource public interface AccountRepository extends CrudRepository { diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Customer.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Customer.java index f0263d37d..a6bd710d6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Customer.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/Customer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/CustomerRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/CustomerRepository.java index 9b6f89670..4fc05bb42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/CustomerRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/CustomerRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java index f2b91c7a5..92f5a930b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/Person.java index 92905ae73..611081ea1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/PersonRepository.java index f1aed0151..077d6591b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java index 4411b7abd..fb4ce99d2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java index f8169da98..2d7625ef9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java index 0cd6ffdb2..bfb295249 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java index fe7d3a85b..ff8a247ad 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java index 6ec5d1458..706dc3e0d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java index 9b149c949..2f975a27b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java index 282a794d0..eb8f4ae56 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java @@ -47,8 +47,8 @@ public ResponseEntity> getAllPets(@ParameterObject Pageable page @GetMapping("/test1") public String getPatientList1(@PageableDefault(size = 100, sort = { "someField", "someoTHER" }, - direction = Sort.Direction.DESC) - @ParameterObject Pageable pageable) { + direction = Sort.Direction.DESC) + @ParameterObject Pageable pageable) { return "bla"; } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/PersonDTO.java index 2cbe843e9..05a0e38cc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java index 8a0f23df3..2fb855d3c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java index 4a877d43c..884b5e9c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/PersonDTO.java index 076f6332d..6a44cc5dd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java index 38df23261..19a28fe2b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Account.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Account.java index 1eaf072a7..cd782a887 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Account.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Account.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/AccountRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/AccountRepository.java index 84d138196..27cf2628f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/AccountRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/AccountRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; @@ -38,7 +38,6 @@ /** * Repository to manage {@link Account} instances. - * */ @RepositoryRestResource @Tag(name = "The account Repository") diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Customer.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Customer.java index 2c674c95a..afc31686a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Customer.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/Customer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/CustomerRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/CustomerRepository.java index 5ce219160..f26fc2e12 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/CustomerRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/CustomerRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/OpenApiConfig.java index 2b8d31e10..4c07a0204 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java index ac798f879..fbe97f2ea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildProperty.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildProperty.java index 6863c34a4..eef4ed09d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildProperty.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildProperty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app17; @@ -30,11 +30,9 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Data; @Entity -public @Data -class ChildProperty { +public class ChildProperty { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildPropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildPropertyRepository.java index 7c5918285..eeaad81ce 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildPropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/ChildPropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/Property.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/Property.java index d45816636..d90b4a399 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/Property.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/Property.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app17; @@ -32,11 +32,9 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import lombok.Data; @Entity -public @Data -class Property { +public class Property { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/PropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/PropertyRepository.java index a7311f867..6d6f2d385 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/PropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/PropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java index 3af44ad26..2c1689e25 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java index e002a40ae..cf57ddad6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloWorldModel.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloWorldModel.java index 05f3826f2..9852b9868 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloWorldModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloWorldModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java index 650852c30..5481c8b6c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/Application.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/Application.java index 001818afe..7cfb25293 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/Application.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/Application.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app19; @@ -38,12 +38,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; -import lombok.Data; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -@Data @Entity @Table(schema = "application", name = "application") @Schema(description = "app") @@ -103,4 +101,76 @@ public enum AppType { INNER, EXTERNAL } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public AppType getType() { + return type; + } + + public void setType(AppType type) { + this.type = type; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } + + public String getPublicKey() { + return publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public AuditStatus getAuditStatus() { + return auditStatus; + } + + public void setAuditStatus(AuditStatus auditStatus) { + this.auditStatus = auditStatus; + } + + public LocalDateTime getAuditTime() { + return auditTime; + } + + public void setAuditTime(LocalDateTime auditTime) { + this.auditTime = auditTime; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/ApplicationPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/ApplicationPredicate.java index 4ddae77e0..b6760ae8f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/ApplicationPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/ApplicationPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/GreetingController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/GreetingController.java index df13412e1..88cafcd7f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/GreetingController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/GreetingController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/QApplication.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/QApplication.java index b4894fa2b..4f874ebbe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/QApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/QApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java index 1885539f0..41eeba6fe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java index ef37cd93b..5521169a6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/PersonDTO.java index ba048cb66..e567a63a9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java index 3fef40c5a..70708b604 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/Bank.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/Bank.java index f802ce0f3..513b29955 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/Bank.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/Bank.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/BankRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/BankRepository.java index 48ab7f656..dee8a0b4e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/BankRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/BankRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/CodeLookupRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/CodeLookupRepository.java index f484ab661..6e2f2ba7a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/CodeLookupRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/CodeLookupRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; @@ -30,7 +30,7 @@ import org.springframework.data.repository.query.Param; @NoRepositoryBean -public interface CodeLookupRepository { +public interface CodeLookupRepository { EntityT findOneByCode(@Param("code") KeyT code); Long countByCode(KeyT code); diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/DemoApplication.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/DemoApplication.java index fa34360f1..cacd523a7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/DemoApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/DemoApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/EntityDefinition.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/EntityDefinition.java index 9e6a71094..d30455883 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/EntityDefinition.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/EntityDefinition.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java index 33e4c1026..d8de69695 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/Person.java index caec567a4..9efbd1a40 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/PersonRepository.java index b3c492389..c33affcc2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java index e57bb1ed1..9437ddc51 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/Person.java index 47458862f..a9608308c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonApi.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonApi.java index e5417c885..5ef52a6c0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonRepository.java index 77d72c0c0..7f75b7825 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java index 80861859d..9e68eeaf9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Clinic.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Clinic.java index e2156d75a..b095f3ca7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Clinic.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Clinic.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app23; @@ -32,18 +32,8 @@ import jakarta.persistence.Id; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -@Data @Entity -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@Builder public class Clinic { @Id @@ -54,4 +44,28 @@ public class Clinic { @NotBlank private String name; + public Clinic(Long id, String name) { + this.id = id; + this.name = name; + } + + public Clinic() { + + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/ClinicRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/ClinicRepo.java index 6dfd42399..7ae9e263c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/ClinicRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/ClinicRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Doctor.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Doctor.java index 5a6902465..4160bc449 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Doctor.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/Doctor.java @@ -21,11 +21,12 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app23; + import java.util.Set; import io.swagger.v3.oas.annotations.media.ArraySchema; @@ -37,18 +38,8 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -@Data @Entity -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@Builder public class Doctor { @Id @@ -63,4 +54,25 @@ public class Doctor { accessMode = AccessMode.WRITE_ONLY )) private Set clinics; + + + public Doctor() { + + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Set getClinics() { + return clinics; + } + + public void setClinics(Set clinics) { + this.clinics = clinics; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/DoctorRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/DoctorRepo.java index 308b73cfa..4e376ee4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/DoctorRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/DoctorRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java index 4c33f4ac2..44c538166 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/QUser.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/QUser.java index 1db52884e..e7541582e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/QUser.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/QUser.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java index 6fdbbc1de..e2fe59e8f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/TesteResource.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/TesteResource.java index c63417b7c..0c3b1c80f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/TesteResource.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/TesteResource.java @@ -21,13 +21,12 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; import com.querydsl.core.types.Predicate; -import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -37,7 +36,6 @@ @RestController -@AllArgsConstructor public class TesteResource { @GetMapping("/") diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/User.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/User.java index 79741b964..e18ee8d2a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; @@ -30,12 +30,8 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Getter; -import lombok.Setter; @Entity -@Getter -@Setter public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -46,5 +42,36 @@ public class User { private String lastName; private String email; -} + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/UserPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/UserPredicate.java index 2a76b9557..78e11375b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/UserPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app24/UserPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java index be50c24c0..d0f06544a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Address.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Address.java index bf41b6c05..7587b4864 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Address.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Address.java @@ -21,22 +21,14 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; import jakarta.persistence.Embeddable; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; @Embeddable -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Address { private String name; @@ -51,4 +43,51 @@ public class Address { private String country; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public String getZipcode() { + return zipcode; + } + + public void setZipcode(String zipcode) { + this.zipcode = zipcode; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/BaseEntity.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/BaseEntity.java index a7f6d757a..f5426664b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/BaseEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/BaseEntity.java @@ -21,25 +21,20 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; + import java.util.UUID; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.PrePersist; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.type.SqlTypes; -@Getter -@Setter -@NoArgsConstructor @MappedSuperclass public abstract class BaseEntity { @@ -53,4 +48,15 @@ private void generateId() { id = UUID.randomUUID(); } + public BaseEntity(UUID id) { + this.id = id; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Cat.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Cat.java index 0e6c58840..b77144811 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Cat.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Cat.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; @@ -29,26 +29,26 @@ import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Cat extends Pet { @Enumerated(EnumType.STRING) private CoatType coat; - @Builder - public Cat(String name, Owner owner, CoatType coat) { - super(name, owner); + public Cat(CoatType coat) { + this.coat = coat; + } + + public Cat() { + super(); + } + + public CoatType getCoat() { + return coat; + } + + public void setCoat(CoatType coat) { this.coat = coat; } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Clinic.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Clinic.java index 7e7cb72e3..c2b70f9bc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Clinic.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Clinic.java @@ -21,29 +21,20 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; import java.util.Set; +import java.util.UUID; import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Clinic extends BaseEntity { @NotNull @@ -53,4 +44,33 @@ public class Clinic extends BaseEntity { @ElementCollection private Set
addresses; -} + public Clinic(UUID id) { + super(id); + } + + public Clinic(UUID id, String name, Set
addresses) { + super(id); + this.name = name; + this.addresses = addresses; + } + + public Clinic() { + super(UUID.randomUUID()); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set
getAddresses() { + return addresses; + } + + public void setAddresses(Set
addresses) { + this.addresses = addresses; + } +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Doctor.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Doctor.java index aa6935387..6c36d0d62 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Doctor.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Doctor.java @@ -21,12 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; import java.util.Set; +import java.util.UUID; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -34,18 +35,9 @@ import jakarta.persistence.ManyToMany; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; + @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Doctor extends BaseEntity { @NotNull @@ -61,4 +53,47 @@ public class Doctor extends BaseEntity { @ManyToMany private Set clinics; + public Doctor(String firstname, String lastname, Specialty specialty, Set clinics) { + super(UUID.randomUUID()); + this.firstname = firstname; + this.lastname = lastname; + this.specialty = specialty; + this.clinics = clinics; + } + + public Doctor() { + super(UUID.randomUUID()); + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public Specialty getSpecialty() { + return specialty; + } + + public void setSpecialty(Specialty specialty) { + this.specialty = specialty; + } + + public Set getClinics() { + return clinics; + } + + public void setClinics(Set clinics) { + this.clinics = clinics; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Dog.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Dog.java index d3a2bfdc8..73dc9d671 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Dog.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Dog.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; @@ -29,28 +29,24 @@ import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor public class Dog extends Pet { @Enumerated(EnumType.STRING) private CoatType coat; - @Builder - public Dog(String name, Owner owner, CoatType coat) { - super(name, owner); + public CoatType getCoat() { + return coat; + } + + public void setCoat(CoatType coat) { this.coat = coat; } + public Dog() { + } + public static enum CoatType { SMOOTH, SHORT, COMBINATION, DOUBLE, HEAVY, SILKY, LONG, CURLY, WIRE, HAIRLESS } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Owner.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Owner.java index 970a27b3d..c7aa3231a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Owner.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Owner.java @@ -21,30 +21,22 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; import java.util.Set; +import java.util.UUID; import jakarta.persistence.CascadeType; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.OneToMany; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; + @Entity -@Data -@EqualsAndHashCode(callSuper = false) -@Builder -@AllArgsConstructor -@NoArgsConstructor public class Owner extends BaseEntity { private String firstname; @@ -56,8 +48,46 @@ public class Owner extends BaseEntity { @Embedded private Address addresses; - @EqualsAndHashCode.Exclude @OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL }) private Set pets; + public Owner(UUID id) { + super(id); + } + + public Owner() { + super(UUID.randomUUID()); + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public Address getAddresses() { + return addresses; + } + + public void setAddresses(Address addresses) { + this.addresses = addresses; + } + + public Set getPets() { + return pets; + } + + public void setPets(Set pets) { + this.pets = pets; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Pet.java index 95f2c2817..5981e6c3e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Pet.java @@ -21,11 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; +import java.util.UUID; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -34,21 +36,9 @@ import jakarta.persistence.InheritanceType; import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; @Entity - -@EqualsAndHashCode(callSuper = false) @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) - -@Data -@NoArgsConstructor -@RequiredArgsConstructor - @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, @@ -59,12 +49,33 @@ }) public class Pet extends BaseEntity { - @NonNull @NotNull private String name; - @NonNull @ManyToOne private Owner owner; + public Pet(UUID id) { + super(id); + } + + public Pet() { + super(UUID.randomUUID()); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Owner getOwner() { + return owner; + } + + public void setOwner(Owner owner) { + this.owner = owner; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Specialty.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Specialty.java index 01b2e195f..c98c02b0f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Specialty.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/model/Specialty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/ClinicRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/ClinicRepo.java index 4e2afd69d..5133d9b0f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/ClinicRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/ClinicRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/DoctorRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/DoctorRepo.java index 3b7b90aca..7905a0e12 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/DoctorRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/DoctorRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/OwnerRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/OwnerRepo.java index eaa5a18b9..256c2ca72 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/OwnerRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/OwnerRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/PetRepo.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/PetRepo.java index a4223bd3f..8d01ef458 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/PetRepo.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app25/repo/PetRepo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25.repo; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/Person.java index 7876d4520..2798914cd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/PersonRepository.java index 1813497d6..556fc19d2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java index 04ae935b7..ab1f0cb89 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringRestConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringRestConfiguration.java index 1006d3d04..ed05237a4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringRestConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringRestConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java index 0fdf5865c..161f13b81 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/PersonDTO.java index 1b2b72898..abd50e686 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java index 5306c9e4b..c705d759c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageable.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageable.java index aa22fd81e..bd303f1a4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageable.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageable.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageableReplacement.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageableReplacement.java index cfe5fa80e..fd5e98086 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageableReplacement.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/ExamplePageableReplacement.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app28; @@ -38,7 +38,8 @@ public class ExamplePageableReplacement extends Pageable { /** * Instantiates a new Pageable. - * @param page the page + * + * @param page the page * @param size the size * @param sort the sort */ diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java index f841501f5..eb96c0545 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java index 49a4a0ead..3f03516be 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/Person.java index 589b0fb3e..d6d89cbdf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonApi.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonApi.java index bbf716e56..353c1392e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonRepository.java index 0dd92e452..a21e37461 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java index 136f530be..21852f2ab 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java index b8386c2ee..293a8d0a5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java index a5377b94f..a82a623c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java index e68880518..d01b5a029 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/QUser.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/QUser.java index aaa8eb9de..62af11c4f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/QUser.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/QUser.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java index c9e0bb870..2494b3612 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/User.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/User.java index d13a9f693..2a97bf0c6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app30; @@ -31,12 +31,8 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Getter; -import lombok.Setter; @Entity -@Getter -@Setter public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -47,4 +43,36 @@ public class User { private String lastName; private String email; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/UserPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/UserPredicate.java index f11de7712..5c1e1c9c5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/UserPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app30/UserPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/Person.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/Person.java index eb78bf1f8..7a9cb5dce 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app301; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonApi.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonApi.java index d4527fc25..c6a23b872 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app301; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonRepository.java index 3f360b1f6..aece5416d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/PersonRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app301; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/SpringDocApp301Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/SpringDocApp301Test.java index 2f7366421..91b1cc340 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/SpringDocApp301Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app301/SpringDocApp301Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app301; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java index fa4b30b91..9207121d2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/PersonDTO.java index 69a162dc7..f9ba15cd7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java index b92ad6523..c0ccbed00 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java index 4a2a6f369..97fc5971f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/PersonDTO.java index f7b4e19a8..06dfe52aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java index 6c8aa36dd..1d59b71a7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSort.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSort.java index 23bf9ecf0..a69f33f9e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSort.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSort.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSortReplacement.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSortReplacement.java index 65e3f8765..147a175f7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSortReplacement.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/ExampleSortReplacement.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app33; @@ -38,6 +38,7 @@ public class ExampleSortReplacement extends Sort { /** * Instantiates a new Sort. + * * @param sort the sort */ public ExampleSortReplacement(List sort) { diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java index 1a9a293e1..bd2e0dcd4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java index 5273fbf0d..0bba8f51b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Account.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Account.java index 2795be4dc..9ce3d70f3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Account.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Account.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/AccountRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/AccountRepository.java index b6a80d186..0b8c97987 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/AccountRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/AccountRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; @@ -38,7 +38,6 @@ /** * Repository to manage {@link Account} instances. - * */ @RepositoryRestResource @Tag(name = "The account Repository") diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Customer.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Customer.java index 0d803fd6a..aa1e4358e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Customer.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/Customer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/CustomerRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/CustomerRepository.java index ee799f9f4..26d986da1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/CustomerRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/CustomerRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/OpenApiConfig.java index f456244de..7b42feae1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java index 1063a917e..a65f2035a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringRestConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringRestConfiguration.java index c25b9a964..6c01fada8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringRestConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringRestConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildProperty.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildProperty.java index 24e096224..e4d61b1e1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildProperty.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildProperty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app35; @@ -31,11 +31,9 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import lombok.Data; @Entity -public @Data -class ChildProperty { +public class ChildProperty { @Id @GeneratedValue(strategy = GenerationType.AUTO) diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildPropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildPropertyRepository.java index 1bc444c51..3bb8723b9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildPropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/ChildPropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/Property.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/Property.java index c3d33f0de..75d6b1ed3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/Property.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/Property.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app35; @@ -33,11 +33,10 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import lombok.Data; + @Entity -public @Data -class Property { +public class Property { @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -72,4 +71,4 @@ public ChildProperty getMyChildPropertyName() { public void setMyChildPropertyName(ChildProperty myChildPropertyName) { this.myChildPropertyName = myChildPropertyName; } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/PropertyRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/PropertyRepository.java index 14eff26bf..1504386f9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/PropertyRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/PropertyRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java index 8078d891d..915ce1b9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolder.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolder.java index 87fd8389f..07fb74ebe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolder.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolder.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app36; @@ -33,12 +33,6 @@ @Entity public class EnumFieldHolder { - public enum EnumField { - - FOO, BAR; - - } - @Id @GeneratedValue private Long id; @@ -57,4 +51,10 @@ public void setEnumField(EnumField enumField) { this.enumField = enumField; } + public enum EnumField { + + FOO, BAR; + + } + } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolderRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolderRepository.java index 13996b095..b1446e3f7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolderRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/EnumFieldHolderRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java index d633ac324..ba8e9e4bf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app36/SpringDocApp36Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app36; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/BaseEntity.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/BaseEntity.java index 63a93d153..aa061d9d3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/BaseEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/BaseEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; @@ -33,28 +33,25 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; /** * @author bnasslahsen */ - -@Data @MappedSuperclass -@DynamicInsert(true) -@DynamicUpdate(true) -@SuperBuilder(toBuilder = true) -@NoArgsConstructor +@DynamicInsert +@DynamicUpdate public abstract class BaseEntity implements Serializable { - /** SVUDI */ + /** + * SVUDI + */ private static final long serialVersionUID = 1L; - /** 数据库中的ID */ + /** + * 数据库中的ID + */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", unique = true, nullable = false, insertable = false, updatable = false) @@ -67,4 +64,19 @@ public abstract class BaseEntity implements Serializable { * @return 是否合法 */ public abstract boolean isValid(); + + public BaseEntity(Long id) { + this.id = id; + } + + public BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductEntity.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductEntity.java index afaf6b513..e9576cfe7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; @@ -33,41 +33,37 @@ import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.SuperBuilder; /** * @author bnasslahsen */ -@Getter -@Setter -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = false) @Entity @Table(name = "PRODUCT_ENTITY") -@SuperBuilder(toBuilder = true) -@NoArgsConstructor public class ProductEntity extends BaseEntity implements Comparable { - /** SVUDI */ + /** + * SVUDI + */ private static final long serialVersionUID = 1L; - /** 名字. */ + /** + * 名字. + */ @NotNull @Column(nullable = false) private String name; - /** 单价. */ + /** + * 单价. + */ @NotNull @Column(nullable = false) private BigDecimal price; - /** 日期. */ + /** + * 日期. + */ @NotNull @Column(nullable = false) private LocalDate date; @@ -77,7 +73,33 @@ public boolean isValid() { return name != null && price != null && date != null; } - /** 根据日期排序 */ + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; + } + + /** + * 根据日期排序 + */ @Override public int compareTo(ProductEntity oProduct) { return this.getDate().compareTo(oProduct.getDate()); diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductRepository.java index 999fdf505..02acfa445 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/ProductRepository.java @@ -21,13 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; /** - * @author bnasslahsen + * */ import java.math.BigDecimal; @@ -51,13 +51,14 @@ @RepositoryRestResource(path = "product") public interface ProductRepository extends JpaRepository { - List findByPrice( @Parameter( + List findByPrice(@Parameter( name = "price", description = "test desc", in = ParameterIn.QUERY, required = true ) @Param("price") BigDecimal price); + /** * 根据商品名称查询商品信息 * @@ -110,6 +111,6 @@ List findByDateBefore( */ List findByNameContainingIgnoreCaseAndDateBefore( @Parameter(name = "name2", required = true) String name, - @Parameter(name = "end2", required = true) @DateTimeFormat(pattern = DateTokenConverter.DEFAULT_DATE_PATTERN) @Param("end") LocalDate end); + @Parameter(name = "end2", required = true) @DateTimeFormat(pattern = DateTokenConverter.DEFAULT_DATE_PATTERN) @Param("end") LocalDate end); } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java index 35e25b485..b0cf0ab21 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/DefaultFlatParamObjectController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/DefaultFlatParamObjectController.java index a38090ad9..92d1c2e13 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/DefaultFlatParamObjectController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/DefaultFlatParamObjectController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java index 53cb5da8f..bd75c5696 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/DatabaseLoader.java index 30dde550b..9fdf16e52 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/Employee.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/Employee.java index bad2b6f36..02f852315 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeController.java index f09b013d3..4cd3746b7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeRepository.java index 14a5d162d..f2f1ba0e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java index 5d60fc494..c49479354 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java index 7da86449d..f33993418 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/Country.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/Country.java index becea25bf..d86a44b8a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/Country.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/Country.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/CountryPredicate.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/CountryPredicate.java index fef275fc0..78bea687e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/CountryPredicate.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/CountryPredicate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/GreetingController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/GreetingController.java index 3efbb32af..d5d5e3a35 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/GreetingController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/GreetingController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/QCountry.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/QCountry.java index 00c9aa679..1c3642cf0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/QCountry.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/QCountry.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java index c4f996968..cf1f1f95e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/DatabaseLoader.java index 5001a631e..a88c0b1ff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/Employee.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/Employee.java index 50b2fbee8..2f5a14caf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeController.java index ec36b2a11..c2cb1cb8c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeRepository.java index 61c4aa887..42a3dcf59 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java index 1933073e2..06f0d6339 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocTestApp.java index 053730202..f806bda4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java index 528071409..ef9a45001 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/PersonDTO.java index d601029e2..efb7a0a07 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java index f18601f70..4e8965cb5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/Album.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/Album.java index 8f024d3cd..eede06b1a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/Album.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/Album.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumController.java index 8412ab28b..90c35a01e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumModelAssembler.java index 4ac085987..0c7921ec9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/AlbumModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java index 7954f61e9..0b302696c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java index 0f813a91a..898252a8f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/ComponentsController.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/ComponentsController.java index c49d0d590..47bf3d3e8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/ComponentsController.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/ComponentsController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.component.controller; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/ComponentDtoModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/ComponentDtoModelAssembler.java index 087885889..386279df0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/ComponentDtoModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/ComponentDtoModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.component.controller.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java index 5fa37eca4..90e29bcd1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/controller/hateoas/DemoComponentDtoModelProcessor.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.component.controller.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/DemoComponentDto.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/DemoComponentDto.java index a38ac49da..4081f3ae4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/DemoComponentDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/DemoComponentDto.java @@ -21,23 +21,18 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.component.dto; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; import org.springframework.hateoas.server.core.Relation; -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor +/** + * The type Demo component dto. + */ @Relation(collectionRelation = "components") @Schema(description = "A demo component to illustrate Springdoc Issue #401") public final class DemoComponentDto { @@ -48,4 +43,56 @@ public final class DemoComponentDto { @Schema(description = "Some dummy payload", example = "Hello World") private String payload; + public DemoComponentDto(String id, String payload) { + this.id = id; + this.payload = payload; + } + + private DemoComponentDto(Builder builder) { + setId(builder.id); + setPayload(builder.payload); + } + + public static Builder builder() { + return new Builder(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPayload() { + return payload; + } + + public void setPayload(String payload) { + this.payload = payload; + } + + public static final class Builder { + private String id; + + private String payload; + + private Builder() { + } + + public Builder id(String val) { + id = val; + return this; + } + + public Builder payload(String val) { + payload = val; + return this; + } + + public DemoComponentDto build() { + return new DemoComponentDto(this); + } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/converter/DemoComponentConverter.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/converter/DemoComponentConverter.java index cd42b81f6..6a074b2c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/converter/DemoComponentConverter.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/dto/converter/DemoComponentConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.component.dto.converter; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/model/DemoComponent.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/model/DemoComponent.java index 75a9ea4e6..518270243 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/model/DemoComponent.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/model/DemoComponent.java @@ -21,22 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.component.model; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; - import org.springframework.data.annotation.Id; -@Data -@Builder -@AllArgsConstructor -@EqualsAndHashCode public class DemoComponent { @Id @@ -44,4 +35,57 @@ public class DemoComponent { private String payload; + public DemoComponent(String id, String payload) { + this.id = id; + this.payload = payload; + } + + private DemoComponent(Builder builder) { + setId(builder.id); + setPayload(builder.payload); + } + + public static Builder builder() { + return new Builder(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPayload() { + return payload; + } + + public void setPayload(String payload) { + this.payload = payload; + } + + + public static final class Builder { + private String id; + + private String payload; + + private Builder() { + } + + public Builder id(String val) { + id = val; + return this; + } + + public Builder payload(String val) { + payload = val; + return this; + } + + public DemoComponent build() { + return new DemoComponent(this); + } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/service/ComponentsService.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/service/ComponentsService.java index 8429cf32a..b6e26a403 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/service/ComponentsService.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/component/service/ComponentsService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.component.service; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/OpenAPIConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/OpenAPIConfiguration.java index 34cc20b32..990748e08 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/OpenAPIConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/OpenAPIConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.core.config; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/SpringRestConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/SpringRestConfiguration.java index d831a89b1..6ce299e4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/SpringRestConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/SpringRestConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.core.config; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/WebMvcConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/WebMvcConfiguration.java index 787ea1200..861a1a0f8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/WebMvcConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/config/WebMvcConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.core.config; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BadArgumentException.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BadArgumentException.java index 22f91c4a5..0cd619693 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BadArgumentException.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BadArgumentException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.core.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BusinessException.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BusinessException.java index c5861511a..efacc5238 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BusinessException.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/exception/BusinessException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.core.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/model/ExceptionDto.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/model/ExceptionDto.java index 7b188439c..b8e1d3cda 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/model/ExceptionDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/core/model/ExceptionDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.core.model; @@ -31,13 +31,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.NonNull; -@Data + public class ExceptionDto { - @NonNull @NotNull @NotEmpty @Schema(description = "The date and time the problem occured", example = "2020-02-04T13:21:08.098+0000", type = "string", format = "date-time") @@ -49,4 +46,27 @@ public class ExceptionDto { @Schema(description = "The exception message", example = "Trying to update a non existing component !") private String message; + public Instant getTimestamp() { + return timestamp; + } + + public void setTimestamp(Instant timestamp) { + this.timestamp = timestamp; + } + + public String getException() { + return exception; + } + + public void setException(String exception) { + this.exception = exception; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/utils/Converter.java b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/utils/Converter.java index 5e5ee17ba..119cc0077 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/utils/Converter.java +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app9/utils/Converter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.utils; diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app18.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app18.json index 0ed04df2c..d46aa228b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app18.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app18.json @@ -25,6 +25,7 @@ "description": "Description for abc", "required": true, "schema": { + "minLength": 1, "type": "string" }, "example": "def" @@ -69,6 +70,7 @@ "description": "Description for abc", "required": true, "schema": { + "minLength": 1, "type": "string" }, "example": "def" @@ -110,6 +112,7 @@ "type": "object", "properties": { "abc": { + "minLength": 1, "type": "string" }, "thisDate": { @@ -120,4 +123,4 @@ } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app22.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app22.json index 7b0342647..9ad681c13 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app22.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app22.json @@ -143,6 +143,11 @@ "$ref": "#/components/schemas/Person" } }, + "application/vnd.hal+json": { + "schema": { + "$ref": "#/components/schemas/Person" + } + }, "application/json": { "schema": { "$ref": "#/components/schemas/Person" @@ -227,12 +232,6 @@ } } }, - "Links": { - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/Link" - } - }, "RepresentationModelObject": { "type": "object", "properties": { @@ -337,6 +336,12 @@ "type": "boolean" } } + }, + "Links": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app23.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app23.json index 3b2dd10aa..4b297655c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app23.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app23.json @@ -839,15 +839,28 @@ } } }, - "Links": { + "RepresentationModelObject": { "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/Link" + "properties": { + "_links": { + "$ref": "#/components/schemas/Links" + } } }, - "RepresentationModelObject": { + "CollectionModelEntityModelDoctor": { "type": "object", "properties": { + "_embedded": { + "type": "object", + "properties": { + "doctors": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EntityModelDoctor" + } + } + } + }, "_links": { "$ref": "#/components/schemas/Links" } @@ -861,16 +874,16 @@ } } }, - "CollectionModelEntityModelDoctor": { + "CollectionModelObject": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "doctors": { + "objects": { "type": "array", "items": { - "$ref": "#/components/schemas/EntityModelDoctor" + "type": "object" } } } @@ -899,16 +912,16 @@ } } }, - "CollectionModelObject": { + "CollectionModelEntityModelClinic": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "objects": { + "clinics": { "type": "array", "items": { - "type": "object" + "$ref": "#/components/schemas/EntityModelClinic" } } } @@ -925,6 +938,7 @@ "type": "object", "properties": { "name": { + "minLength": 1, "type": "string" }, "_links": { @@ -932,25 +946,6 @@ } } }, - "CollectionModelEntityModelClinic": { - "type": "object", - "properties": { - "_embedded": { - "type": "object", - "properties": { - "clinics": { - "type": "array", - "items": { - "$ref": "#/components/schemas/EntityModelClinic" - } - } - } - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - } - }, "ClinicRequestBody": { "required": [ "name" @@ -962,6 +957,7 @@ "format": "int64" }, "name": { + "minLength": 1, "type": "string" } } @@ -988,6 +984,7 @@ "type": "object", "properties": { "name": { + "minLength": 1, "type": "string" } } @@ -1020,6 +1017,12 @@ "type": "boolean" } } + }, + "Links": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app38.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app38.json index 7f54e2d54..ad054ae09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app38.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.0.1/app38.json @@ -49,7 +49,7 @@ } } }, - "components":{ - "schemas":{} + "components": { + "schemas": {} } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app10.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app10.json index dacf06142..dc24676ae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app10.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app10.json @@ -560,9 +560,9 @@ "description": "Zero-based page index (0..N)", "required": false, "schema": { - "minimum": 0, "type": "integer", - "default": 0 + "default": 0, + "minimum": 0 } }, { @@ -571,9 +571,9 @@ "description": "The size of the page to be returned", "required": false, "schema": { - "minimum": 1, "type": "integer", - "default": 20 + "default": 20, + "minimum": 1 } }, { @@ -755,12 +755,6 @@ } } }, - "Links": { - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/Link" - } - }, "RepresentationModelObject": { "type": "object", "properties": { @@ -769,16 +763,16 @@ } } }, - "CollectionModelEntityModelCustomer": { + "CollectionModelEntityModelAccount": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "customers": { + "accounts": { "type": "array", "items": { - "$ref": "#/components/schemas/EntityModelCustomer" + "$ref": "#/components/schemas/EntityModelAccount" } } } @@ -803,85 +797,59 @@ } } }, - "EntityModelCustomer": { + "EntityModelAccount": { "type": "object", "properties": { - "firstname": { - "type": "string" - }, - "lastname": { - "type": "string" + "expiryDate": { + "type": "string", + "format": "date-time" }, "_links": { "$ref": "#/components/schemas/Links" } } }, - "PageMetadata": { + "EntityModelCustomer": { "type": "object", "properties": { - "size": { - "type": "integer", - "format": "int64" - }, - "totalElements": { - "type": "integer", - "format": "int64" + "firstname": { + "type": "string" }, - "totalPages": { - "type": "integer", - "format": "int64" + "lastname": { + "type": "string" }, - "number": { - "type": "integer", - "format": "int64" + "_links": { + "$ref": "#/components/schemas/Links" } } }, - "PagedModelEntityModelCustomer": { + "CollectionModelObject": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "customers": { + "objects": { "type": "array", - "items": { - "$ref": "#/components/schemas/EntityModelCustomer" - } + "items": {} } } }, - "_links": { - "$ref": "#/components/schemas/Links" - }, - "page": { - "$ref": "#/components/schemas/PageMetadata" - } - } - }, - "EntityModelAccount": { - "type": "object", - "properties": { - "expiryDate": { - "type": "string", - "format": "date-time" - }, "_links": { "$ref": "#/components/schemas/Links" } } }, - "CollectionModelEntityModelAccount": { + "CollectionModelEntityModelCustomer": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "accounts": { + "customers": { "type": "array", "items": { - "$ref": "#/components/schemas/EntityModelAccount" + "$ref": "#/components/schemas/EntityModelCustomer" } } } @@ -891,22 +859,46 @@ } } }, - "CollectionModelObject": { + "PageMetadata": { + "type": "object", + "properties": { + "size": { + "type": "integer", + "format": "int64" + }, + "totalElements": { + "type": "integer", + "format": "int64" + }, + "totalPages": { + "type": "integer", + "format": "int64" + }, + "number": { + "type": "integer", + "format": "int64" + } + } + }, + "PagedModelEntityModelCustomer": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "objects": { + "customers": { "type": "array", "items": { - "type": "object" + "$ref": "#/components/schemas/EntityModelCustomer" } } } }, "_links": { "$ref": "#/components/schemas/Links" + }, + "page": { + "$ref": "#/components/schemas/PageMetadata" } } }, @@ -954,6 +946,12 @@ "type": "boolean" } } + }, + "Links": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app16.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app16.json index d7ab06682..28d48fc22 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app16.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app16.json @@ -675,9 +675,9 @@ "description": "Zero-based page index (0..N)", "required": false, "schema": { - "minimum": 0, "type": "integer", - "default": 0 + "default": 0, + "minimum": 0 } }, { @@ -686,9 +686,9 @@ "description": "The size of the page to be returned", "required": false, "schema": { - "minimum": 1, "type": "integer", - "default": 20 + "default": 20, + "minimum": 1 } }, { @@ -1009,15 +1009,28 @@ } } }, - "Links": { + "RepresentationModelObject": { "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/Link" + "properties": { + "_links": { + "$ref": "#/components/schemas/Links" + } } }, - "RepresentationModelObject": { + "CollectionModelEntityModelAccount": { "type": "object", "properties": { + "_embedded": { + "type": "object", + "properties": { + "accounts": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EntityModelAccount" + } + } + } + }, "_links": { "$ref": "#/components/schemas/Links" } @@ -1050,25 +1063,6 @@ } } }, - "CollectionModelEntityModelAccount": { - "type": "object", - "properties": { - "_embedded": { - "type": "object", - "properties": { - "accounts": { - "type": "array", - "items": { - "$ref": "#/components/schemas/EntityModelAccount" - } - } - } - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - } - }, "EntityModelCustomer": { "type": "object", "properties": { @@ -1091,9 +1085,7 @@ "properties": { "objects": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } }, @@ -1223,6 +1215,12 @@ "type": "boolean" } } + }, + "Links": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } } }, "securitySchemes": { diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app18.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app18.json index fa8936163..073f17c40 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app18.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app18.json @@ -25,7 +25,8 @@ "description": "Description for abc", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 }, "example": "def" }, @@ -69,7 +70,8 @@ "description": "Description for abc", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 }, "example": "def" }, @@ -103,21 +105,22 @@ "components": { "schemas": { "HelloWorldModel": { - "required": [ - "abc", - "thisDate" - ], "type": "object", "properties": { "abc": { - "type": "string" + "type": "string", + "minLength": 1 }, "thisDate": { "type": "string", "format": "date" } - } + }, + "required": [ + "abc", + "thisDate" + ] } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app22.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app22.json index d24d579c4..d0be6037d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app22.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app22.json @@ -25,9 +25,9 @@ "description": "Zero-based page index (0..N)", "required": false, "schema": { - "minimum": 0, "type": "integer", - "default": 0 + "default": 0, + "minimum": 0 } }, { @@ -36,9 +36,9 @@ "description": "The size of the page to be returned", "required": false, "schema": { - "minimum": 1, "type": "integer", - "default": 20 + "default": 20, + "minimum": 1 } }, { @@ -143,6 +143,11 @@ "$ref": "#/components/schemas/Person" } }, + "application/vnd.hal+json": { + "schema": { + "$ref": "#/components/schemas/Person" + } + }, "application/json": { "schema": { "$ref": "#/components/schemas/Person" @@ -227,12 +232,6 @@ } } }, - "Links": { - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/Link" - } - }, "RepresentationModelObject": { "type": "object", "properties": { @@ -337,6 +336,12 @@ "type": "boolean" } } + }, + "Links": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app23.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app23.json index 232b86a03..5a2a3a851 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app23.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app23.json @@ -839,12 +839,6 @@ } } }, - "Links": { - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/Link" - } - }, "RepresentationModelObject": { "type": "object", "properties": { @@ -853,14 +847,6 @@ } } }, - "EntityModelDoctor": { - "type": "object", - "properties": { - "_links": { - "$ref": "#/components/schemas/Links" - } - } - }, "CollectionModelEntityModelDoctor": { "type": "object", "properties": { @@ -880,6 +866,14 @@ } } }, + "EntityModelDoctor": { + "type": "object", + "properties": { + "_links": { + "$ref": "#/components/schemas/Links" + } + } + }, "CollectionModelClinic": { "type": "object", "properties": { @@ -907,9 +901,7 @@ "properties": { "objects": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } }, @@ -918,20 +910,6 @@ } } }, - "EntityModelClinic": { - "required": [ - "name" - ], - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - } - }, "CollectionModelEntityModelClinic": { "type": "object", "properties": { @@ -951,10 +929,22 @@ } } }, - "ClinicRequestBody": { + "EntityModelClinic": { + "type": "object", + "properties": { + "name": { + "type": "string", + "minLength": 1 + }, + "_links": { + "$ref": "#/components/schemas/Links" + } + }, "required": [ "name" - ], + ] + }, + "ClinicRequestBody": { "type": "object", "properties": { "id": { @@ -962,9 +952,13 @@ "format": "int64" }, "name": { - "type": "string" + "type": "string", + "minLength": 1 } - } + }, + "required": [ + "name" + ] }, "DoctorRequestBody": { "type": "object", @@ -982,15 +976,16 @@ } }, "ClinicResponse": { - "required": [ - "name" - ], "type": "object", "properties": { "name": { - "type": "string" + "type": "string", + "minLength": 1 } - } + }, + "required": [ + "name" + ] }, "Link": { "type": "object", @@ -1020,6 +1015,12 @@ "type": "boolean" } } + }, + "Links": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app25.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app25.json index 52c638696..9b57b8898 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app25.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app25.json @@ -2097,9 +2097,7 @@ "properties": { "objects": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } }, @@ -2132,6 +2130,107 @@ "name" ] }, + "CollectionModelEntityModelClinic": { + "type": "object", + "properties": { + "_embedded": { + "type": "object", + "properties": { + "clinics": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EntityModelClinic" + } + } + } + }, + "_links": { + "$ref": "#/components/schemas/Links" + } + } + }, + "EntityModelClinic": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "addresses": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Address" + }, + "maxItems": 2147483647, + "minItems": 1, + "uniqueItems": true + }, + "_links": { + "$ref": "#/components/schemas/Links" + } + }, + "required": [ + "name" + ] + }, + "EntityModelPet": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "_type": { + "type": "string" + }, + "_links": { + "$ref": "#/components/schemas/Links" + } + }, + "required": [ + "_type", + "name" + ] + }, + "PagedModelEntityModelPet": { + "type": "object", + "properties": { + "_embedded": { + "type": "object", + "properties": { + "pets": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EntityModelPet" + } + } + } + }, + "_links": { + "$ref": "#/components/schemas/Links" + }, + "page": { + "$ref": "#/components/schemas/PageMetadata" + } + } + }, + "CollectionModelEntityModelDoctor": { + "type": "object", + "properties": { + "_embedded": { + "type": "object", + "properties": { + "doctors": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EntityModelDoctor" + } + } + } + }, + "_links": { + "$ref": "#/components/schemas/Links" + } + } + }, "EntityModelDoctor": { "type": "object", "properties": { @@ -2228,25 +2327,6 @@ "lastname" ] }, - "CollectionModelEntityModelDoctor": { - "type": "object", - "properties": { - "_embedded": { - "type": "object", - "properties": { - "doctors": { - "type": "array", - "items": { - "$ref": "#/components/schemas/EntityModelDoctor" - } - } - } - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - } - }, "CollectionModelClinic": { "type": "object", "properties": { @@ -2266,88 +2346,6 @@ } } }, - "EntityModelClinic": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "addresses": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Address" - }, - "maxItems": 2147483647, - "minItems": 1, - "uniqueItems": true - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - }, - "required": [ - "name" - ] - }, - "CollectionModelEntityModelClinic": { - "type": "object", - "properties": { - "_embedded": { - "type": "object", - "properties": { - "clinics": { - "type": "array", - "items": { - "$ref": "#/components/schemas/EntityModelClinic" - } - } - } - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - } - }, - "EntityModelPet": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "_type": { - "type": "string" - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - }, - "required": [ - "_type", - "name" - ] - }, - "PagedModelEntityModelPet": { - "type": "object", - "properties": { - "_embedded": { - "type": "object", - "properties": { - "pets": { - "type": "array", - "items": { - "$ref": "#/components/schemas/EntityModelPet" - } - } - } - }, - "_links": { - "$ref": "#/components/schemas/Links" - }, - "page": { - "$ref": "#/components/schemas/PageMetadata" - } - } - }, "ClinicRequestBody": { "type": "object", "properties": { diff --git a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app34.json b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app34.json index 60caa7048..f0ed805be 100644 --- a/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app34.json +++ b/springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app34.json @@ -659,9 +659,9 @@ "description": "Zero-based page index (0..N)", "required": false, "schema": { - "minimum": 0, "type": "integer", - "default": 0 + "default": 0, + "minimum": 0 } }, { @@ -670,9 +670,9 @@ "description": "The size of the page to be returned", "required": false, "schema": { - "minimum": 1, "type": "integer", - "default": 20 + "default": 20, + "minimum": 1 } }, { @@ -1182,12 +1182,6 @@ } } }, - "Links": { - "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/Link" - } - }, "RepresentationModelObject": { "type": "object", "properties": { @@ -1212,53 +1206,16 @@ } } }, - "Customer": { - "type": "object", - "properties": { - "id": { - "type": "integer", - "format": "int64" - }, - "firstname": { - "type": "string" - }, - "lastname": { - "type": "string" - }, - "accounts": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Account" - } - } - } - }, - "EntityModelAccount": { - "type": "object", - "properties": { - "id": { - "type": "integer", - "format": "int64" - }, - "expiryDate": { - "type": "string", - "format": "date-time" - }, - "_links": { - "$ref": "#/components/schemas/Links" - } - } - }, - "CollectionModelEntityModelAccount": { + "CollectionModelEntityModelCustomer": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "accounts": { + "customers": { "type": "array", "items": { - "$ref": "#/components/schemas/EntityModelAccount" + "$ref": "#/components/schemas/EntityModelCustomer" } } } @@ -1268,7 +1225,7 @@ } } }, - "EntityModelCustomer": { + "Customer": { "type": "object", "properties": { "id": { @@ -1281,40 +1238,42 @@ "lastname": { "type": "string" }, - "_links": { - "$ref": "#/components/schemas/Links" + "accounts": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Account" + } } } }, - "CollectionModelObject": { + "EntityModelCustomer": { "type": "object", "properties": { - "_embedded": { - "type": "object", - "properties": { - "objects": { - "type": "array", - "items": { - "type": "object" - } - } - } + "id": { + "type": "integer", + "format": "int64" + }, + "firstname": { + "type": "string" + }, + "lastname": { + "type": "string" }, "_links": { "$ref": "#/components/schemas/Links" } } }, - "CollectionModelEntityModelCustomer": { + "CollectionModelAccount": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "customers": { + "accounts": { "type": "array", "items": { - "$ref": "#/components/schemas/EntityModelCustomer" + "$ref": "#/components/schemas/AccountResponse" } } } @@ -1324,17 +1283,15 @@ } } }, - "CollectionModelAccount": { + "CollectionModelObject": { "type": "object", "properties": { "_embedded": { "type": "object", "properties": { - "accounts": { + "objects": { "type": "array", - "items": { - "$ref": "#/components/schemas/AccountResponse" - } + "items": {} } } }, @@ -1386,6 +1343,41 @@ } } }, + "CollectionModelEntityModelAccount": { + "type": "object", + "properties": { + "_embedded": { + "type": "object", + "properties": { + "accounts": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EntityModelAccount" + } + } + } + }, + "_links": { + "$ref": "#/components/schemas/Links" + } + } + }, + "EntityModelAccount": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "expiryDate": { + "type": "string", + "format": "date-time" + }, + "_links": { + "$ref": "#/components/schemas/Links" + } + } + }, "AccountRequestBody": { "type": "object", "properties": { @@ -1464,6 +1456,12 @@ "type": "boolean" } } + }, + "Links": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Link" + } } }, "securitySchemes": { diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/pom.xml index 6c0f31049..5b2db7aef 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/pom.xml @@ -2,11 +2,12 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-function-webflux-tests + ${project.artifactId} @@ -20,11 +21,5 @@ spring-cloud-starter-function-webflux test - - io.netty - netty-resolver-dns-native-macos - osx-aarch_64 - test - - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java index a26b7e6f2..d3971928b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -42,7 +42,7 @@ @AutoConfigureWebTestClient(timeout = "3600000") @ActiveProfiles("test") -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractCommonTest { protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class); diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocFunctionTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocFunctionTest.java index 3530b3608..e3571ca2f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocFunctionTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocFunctionTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java index 4dedd2868..02935cfae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocFunctionTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocFunctionTest.java index 006206529..e48afa7ee 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocFunctionTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocFunctionTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/pom.xml index a6d1f9e82..d1a1adc24 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/pom.xml @@ -2,11 +2,12 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-function-webmvc-tests + ${project.artifactId} @@ -22,4 +23,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java index 853053296..09a2b91d9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -39,7 +39,7 @@ @AutoConfigureMockMvc @ActiveProfiles("test") -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractCommonTest { @Autowired diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index 1f28f3fa6..c5bd35463 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java index 4534f8803..3daa13438 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractCommonTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index ee9336ca1..4b2b6fce4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-function-webmvc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/pom.xml index cc71b2f05..868b9fe03 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/pom.xml @@ -3,9 +3,10 @@ org.springdoc springdoc-openapi-tests - 2.8.5 + 2.8.13 springdoc-openapi-groovy-tests + ${project.artifactId} org.apache.groovy @@ -36,6 +37,7 @@ org.codehaus.gmavenplus gmavenplus-plugin + ${gmavenplus-plugin.version} @@ -54,4 +56,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/AbstractSpringDocTest.java index a904460dc..391bc0d6e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -51,9 +51,9 @@ @ActiveProfiles("test") @SpringBootTest @AutoConfigureMockMvc -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractSpringDocTest { - + public static String className; @Autowired diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/CarController.groovy b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/CarController.groovy index 2344c2d11..09d9c4462 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/CarController.groovy +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/CarController.groovy @@ -40,7 +40,7 @@ class CarController { CarController(CarService carService) { this.carService = carService } - + @GetMapping(path = 'cars/{carId}') Car getCar(@PathVariable(value = 'carId') Long carId) { return carService.getCar(carId) diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java index 7c374d615..987cee706 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/HelloController.java index a518e9705..0530b0279 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/PersonDTO.java index 2486bdc17..a5df99612 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java index d77535f8c..ae0a3a143 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java index 0b9b89f36..671d25b0d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestController.java index 67995ec4a..e06c29323 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestController.java @@ -21,13 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; /** - * @author bnasslahsen + * */ import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestRequest.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestRequest.java index 278cdf504..2adec9153 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestRequest.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app11/TestRequest.java @@ -21,13 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; /** - * @author bnasslahsen + * */ import java.util.Map; @@ -41,8 +41,19 @@ public class TestRequest { @Schema(description = "This is an example of a map that does not work.!") private Map testingTheMap; - public String getJoeWasHere() { return joeWasHere; } - public void setJoeWasHere(String joeWasHere) { this.joeWasHere = joeWasHere; } - public Map getTestingTheMap() { return testingTheMap; } - public void setTestingTheMap(Map testingTheMap) { this.testingTheMap = testingTheMap; } + public String getJoeWasHere() { + return joeWasHere; + } + + public void setJoeWasHere(String joeWasHere) { + this.joeWasHere = joeWasHere; + } + + public Map getTestingTheMap() { + return testingTheMap; + } + + public void setTestingTheMap(Map testingTheMap) { + this.testingTheMap = testingTheMap; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/GlobalExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/GlobalExceptionHandler.java index 0d105db0b..e26d3aab8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/GlobalExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/GlobalExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/HelloController.java index 0e4bae95c..0ac3495f6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/MyException.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/MyException.java index 76741b5ce..a35496e64 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/MyException.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/MyException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/PersonDTO.java index 853cb549e..0e769ec42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java index 42114150b..bd360d641 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app191/SpringDocApp191Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java index 0b1e69f90..190c6ec6d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/DeprecatedEntity.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/DeprecatedEntity.java index 2bc85606d..fa04542cd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/DeprecatedEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/DeprecatedEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/HelloController.java index 7ac731d4f..b8e183fa8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java index 23d86759b..490f495b8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/AbstractSpringDocTest.java index e2e449a88..f759ee5af 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; @@ -57,7 +57,7 @@ public abstract class AbstractSpringDocTest { @Autowired protected MockMvc mockMvc; - public static String getContent(String fileName){ + public static String getContent(String fileName) { try { Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI()); byte[] fileBytes = Files.readAllBytes(path); diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/CarController.groovy b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/CarController.groovy index 917285c9d..47d3f6e1e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/CarController.groovy +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/CarController.groovy @@ -40,7 +40,7 @@ class CarController { CarController(test.org.springdoc.api.v31.app1.CarService carService) { this.carService = carService } - + @GetMapping(path = 'cars/{carId}') test.org.springdoc.api.v31.app1.Car getCar(@PathVariable(value = 'carId') Long carId) { return carService.getCar(carId) diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java index ce8cc1925..7e4c31557 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/HelloController.java index 64f15154d..c13f8484b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/PersonDTO.java index c4a62e445..be36154bc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java index 100636623..cd28b9f51 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java index 71914ef53..454f8b79a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestController.java index 28c883d48..c054e3a56 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestController.java @@ -21,13 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; /** - * @author bnasslahsen + * */ import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestRequest.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestRequest.java index 87325d36a..f0b5c1759 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestRequest.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app11/TestRequest.java @@ -21,13 +21,13 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; /** - * @author bnasslahsen + * */ import java.util.Map; @@ -41,8 +41,19 @@ public class TestRequest { @Schema(description = "This is an example of a map that does not work.!") private Map testingTheMap; - public String getJoeWasHere() { return joeWasHere; } - public void setJoeWasHere(String joeWasHere) { this.joeWasHere = joeWasHere; } - public Map getTestingTheMap() { return testingTheMap; } - public void setTestingTheMap(Map testingTheMap) { this.testingTheMap = testingTheMap; } + public String getJoeWasHere() { + return joeWasHere; + } + + public void setJoeWasHere(String joeWasHere) { + this.joeWasHere = joeWasHere; + } + + public Map getTestingTheMap() { + return testingTheMap; + } + + public void setTestingTheMap(Map testingTheMap) { + this.testingTheMap = testingTheMap; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/GlobalExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/GlobalExceptionHandler.java index 58ad154f0..92deb1148 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/GlobalExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/GlobalExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/HelloController.java index 88820dca8..741e09ba8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/MyException.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/MyException.java index 7ba1f9beb..cb10376f2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/MyException.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/MyException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/PersonDTO.java index ccfbc95d5..8d92ec35a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java index af7eafa27..26c8857fc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app191/SpringDocApp191Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app191; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java index 11c23a735..93a5598ff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/DeprecatedEntity.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/DeprecatedEntity.java index 7c32aebeb..1cad4a3c0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/DeprecatedEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/DeprecatedEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/HelloController.java index c1000c244..456a90ccf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java index 0c8486e6f..6189bbc31 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/groovy/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/resources/results/3.1.0/app1.json b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/resources/results/3.1.0/app1.json index abd4acc2a..2b05ad912 100644 --- a/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/resources/results/3.1.0/app1.json +++ b/springdoc-openapi-tests/springdoc-openapi-groovy-tests/src/test/resources/results/3.1.0/app1.json @@ -99,21 +99,17 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "text": { "type": "string" }, "sourcePosition": { - "$ref": "#/components/schemas/ASTNode" + "writeOnly": true }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -138,19 +134,13 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } - }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" + "additionalProperties": {} }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, - "instance": { - "$ref": "#/components/schemas/AnnotatedNode" - }, + "instance": {}, "hasNoRealSourcePosition": { "type": "boolean", "writeOnly": true @@ -167,9 +157,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -194,13 +182,9 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } - }, - "classNode": { - "$ref": "#/components/schemas/ClassNode" + "additionalProperties": {} }, + "classNode": {}, "members": { "type": "object", "additionalProperties": { @@ -236,9 +220,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -263,9 +245,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "statementLabels": { "type": "array", @@ -298,15 +278,11 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, - "BytecodeProcessor": { - "type": "object" - }, + "BytecodeProcessor": {}, "CSTNode": { "type": "object", "properties": { @@ -320,9 +296,16 @@ "type": "integer", "format": "int32" }, - "description": { + "meaning": { + "type": "integer", + "format": "int32" + }, + "rootText": { "type": "string" }, + "anExpression": { + "type": "boolean" + }, "startLine": { "type": "integer", "format": "int32" @@ -331,15 +314,8 @@ "type": "integer", "format": "int32" }, - "meaning": { - "type": "integer", - "format": "int32" - }, - "rootText": { + "description": { "type": "string" - }, - "anExpression": { - "type": "boolean" } } }, @@ -364,9 +340,7 @@ "$ref": "#/components/schemas/CachedMethod" } }, - "cachedSuperClass": { - "$ref": "#/components/schemas/CachedClass" - }, + "cachedSuperClass": {}, "hierarchy": { "type": "array", "items": { @@ -375,21 +349,15 @@ }, "declaredInterfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/CachedClass" - }, + "items": {}, "uniqueItems": true }, "interfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/CachedClass" - }, + "items": {}, "uniqueItems": true }, - "cachedClass": { - "$ref": "#/components/schemas/CachedClass" - }, + "cachedClass": {}, "classInfo": { "$ref": "#/components/schemas/ClassInfo" }, @@ -430,18 +398,16 @@ "typeDescription": { "type": "string" }, - "superClassDistance": { - "type": "integer", - "format": "int32" - }, "newMetaMethods": { "type": "array", - "items": { - "$ref": "#/components/schemas/MetaMethod" - } + "items": {} }, "callSiteLoader": { "$ref": "#/components/schemas/CallSiteClassLoader" + }, + "superClassDistance": { + "type": "integer", + "format": "int32" } } }, @@ -478,9 +444,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -497,9 +461,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -529,15 +491,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -554,15 +512,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -581,15 +535,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -619,30 +569,22 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "annotatedType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -683,9 +625,7 @@ "items": { "type": "object", "properties": { - "genericDeclaration": { - "type": "object" - }, + "genericDeclaration": {}, "annotatedBounds": { "type": "array", "items": { @@ -693,15 +633,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -733,15 +669,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -751,9 +683,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "varArgs": { "type": "boolean" @@ -765,15 +695,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -794,9 +720,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -826,15 +750,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -851,15 +771,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -878,15 +794,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -901,9 +813,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -924,15 +834,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -947,9 +853,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } }, @@ -960,15 +864,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1000,15 +900,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -1018,9 +914,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -1037,9 +931,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -1069,15 +961,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1094,15 +982,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1121,15 +1005,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1159,30 +1039,22 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "annotatedType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1223,9 +1095,7 @@ "items": { "type": "object", "properties": { - "genericDeclaration": { - "type": "object" - }, + "genericDeclaration": {}, "annotatedBounds": { "type": "array", "items": { @@ -1233,15 +1103,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1273,15 +1139,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -1291,9 +1153,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "varArgs": { "type": "boolean" @@ -1305,15 +1165,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1334,9 +1190,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -1366,15 +1220,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1391,15 +1241,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1418,15 +1264,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1441,9 +1283,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -1464,15 +1304,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1487,9 +1323,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } }, @@ -1497,9 +1331,7 @@ "type": "integer", "format": "int32" }, - "cachedClass": { - "$ref": "#/components/schemas/CachedClass" - }, + "cachedClass": {}, "vargsMethod": { "type": "boolean" } @@ -1536,9 +1368,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -1560,15 +1390,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1582,9 +1408,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -1599,9 +1423,7 @@ "mopName": { "type": "string" }, - "cachedClass": { - "$ref": "#/components/schemas/CachedClass" - }, + "cachedClass": {}, "cachedMethod": { "type": "object", "properties": { @@ -1624,15 +1446,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1664,15 +1482,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -1682,9 +1496,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -1701,9 +1513,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -1742,23 +1552,17 @@ "bridge": { "type": "boolean" }, - "defaultValue": { - "type": "object" - }, + "defaultValue": {}, "annotatedReturnType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1777,15 +1581,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1815,30 +1615,22 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "annotatedType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1879,9 +1671,7 @@ "items": { "type": "object", "properties": { - "genericDeclaration": { - "type": "object" - }, + "genericDeclaration": {}, "annotatedBounds": { "type": "array", "items": { @@ -1889,15 +1679,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1929,15 +1715,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -1947,9 +1729,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "varArgs": { "type": "boolean" @@ -1961,15 +1741,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -1990,9 +1766,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -2022,15 +1796,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -2047,15 +1817,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -2074,15 +1840,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -2097,9 +1859,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -2118,15 +1878,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -2145,15 +1901,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -2168,15 +1920,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } }, - "transformedMethod": { - "$ref": "#/components/schemas/CachedMethod" - }, + "transformedMethod": {}, "name": { "type": "string" }, @@ -2193,9 +1941,7 @@ "static": { "type": "boolean" }, - "declaringClass": { - "$ref": "#/components/schemas/CachedClass" - }, + "declaringClass": {}, "paramsCount": { "type": "integer", "format": "int32" @@ -2278,15 +2024,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2334,15 +2076,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "packages": { "type": "array", @@ -2354,9 +2092,7 @@ "nativeAccessEnabled": { "type": "boolean" }, - "layer": { - "type": "object" - } + "layer": {} } }, "definedPackages": { @@ -2369,15 +2105,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2434,15 +2166,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2490,15 +2218,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "packages": { "type": "array", @@ -2510,9 +2234,7 @@ "nativeAccessEnabled": { "type": "boolean" }, - "layer": { - "type": "object" - } + "layer": {} } }, "definedPackages": { @@ -2525,15 +2247,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2601,15 +2319,13 @@ "weakMetaClass": { "$ref": "#/components/schemas/MetaClass" }, - "cachedClass": { - "$ref": "#/components/schemas/CachedClass" + "metaClassForClass": { + "$ref": "#/components/schemas/MetaClass" }, "modifiedExpando": { "$ref": "#/components/schemas/ExpandoMetaClass" }, - "metaClassForClass": { - "$ref": "#/components/schemas/MetaClass" - } + "cachedClass": {} } }, "ClassLoaderForClassArtifacts": { @@ -2664,15 +2380,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2720,15 +2432,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "packages": { "type": "array", @@ -2740,9 +2448,7 @@ "nativeAccessEnabled": { "type": "boolean" }, - "layer": { - "type": "object" - } + "layer": {} } }, "definedPackages": { @@ -2755,15 +2461,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2820,15 +2522,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2876,15 +2574,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "packages": { "type": "array", @@ -2896,9 +2590,7 @@ "nativeAccessEnabled": { "type": "boolean" }, - "layer": { - "type": "object" - } + "layer": {} } }, "definedPackages": { @@ -2911,15 +2603,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -2972,9 +2660,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -2982,9 +2668,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -3000,9 +2684,7 @@ }, "interfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "mixins": { "type": "array", @@ -3049,12 +2731,8 @@ "script": { "type": "boolean" }, - "superClass": { - "$ref": "#/components/schemas/ClassNode" - }, - "innerClasses": { - "type": "object" - }, + "superClass": {}, + "innerClasses": {}, "permittedSubclasses": { "type": "array", "items": { @@ -3073,11 +2751,9 @@ "$ref": "#/components/schemas/RecordComponentNode" } }, - "componentType": { - "$ref": "#/components/schemas/ClassNode" - }, + "componentType": {}, "redirect": { - "$ref": "#/components/schemas/ClassNode" + "writeOnly": true }, "annotated": { "type": "boolean" @@ -3130,23 +2806,19 @@ "text": { "type": "string" }, + "unresolvedSuperClass": {}, "objectInitializerStatements": { "type": "array", "items": { "$ref": "#/components/schemas/Statement" } }, - "derivedFromGroovyObject": { - "type": "boolean" - }, - "unresolvedSuperClass": { - "$ref": "#/components/schemas/ClassNode" - }, "unresolvedInterfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} + }, + "derivedFromGroovyObject": { + "type": "boolean" }, "recordComponentNodes": { "type": "array", @@ -3155,34 +2827,10 @@ "$ref": "#/components/schemas/RecordComponentNode" } }, - "outerClass": { - "$ref": "#/components/schemas/ClassNode" - }, - "redirectNode": { - "type": "boolean" - }, - "allDeclaredMethods": { - "type": "array", - "items": { - "$ref": "#/components/schemas/MethodNode" - } - }, - "allInterfaces": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - }, - "uniqueItems": true - }, - "abstractMethods": { - "type": "array", - "items": { - "$ref": "#/components/schemas/MethodNode" - } - }, "genericsPlaceHolder": { "type": "boolean" }, + "plainNodeReference": {}, "primaryClassNode": { "type": "boolean" }, @@ -3197,9 +2845,7 @@ }, "outerClasses": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "nameWithoutPackage": { "type": "string" @@ -3207,8 +2853,26 @@ "annotationDefinition": { "type": "boolean" }, - "plainNodeReference": { - "$ref": "#/components/schemas/ClassNode" + "abstractMethods": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MethodNode" + } + }, + "allInterfaces": { + "type": "array", + "items": {}, + "uniqueItems": true + }, + "allDeclaredMethods": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MethodNode" + } + }, + "outerClass": {}, + "redirectNode": { + "type": "boolean" }, "instance": { "$ref": "#/components/schemas/AnnotatedNode" @@ -3226,9 +2890,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -3302,9 +2964,7 @@ "signerCertPath": { "type": "object", "properties": { - "encodings": { - "type": "object" - }, + "encodings": {}, "certificates": { "type": "array", "items": { @@ -3354,9 +3014,7 @@ "signerCertPath": { "type": "object", "properties": { - "encodings": { - "type": "object" - }, + "encodings": {}, "certificates": { "type": "array", "items": { @@ -3405,27 +3063,19 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "modules": { "type": "array", - "items": { - "$ref": "#/components/schemas/ModuleNode" - } + "items": {} }, "classes": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "classesToCompile": { "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/ClassNode" - } + "additionalProperties": {} }, "generatedInnerClasses": { "type": "object", @@ -3438,9 +3088,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -3455,7 +3103,6 @@ "type": "string" }, "output": { - "type": "object", "deprecated": true }, "targetDirectory": { @@ -3519,9 +3166,7 @@ }, "jointCompilationOptions": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "optimizationOptions": { "type": "object", @@ -3552,9 +3197,6 @@ "runtimeGroovydocEnabled": { "type": "boolean" }, - "indyEnabled": { - "type": "boolean" - }, "targetDirectorySafe": { "type": "string", "writeOnly": true @@ -3572,6 +3214,9 @@ }, "groovydocEnabled": { "type": "boolean" + }, + "indyEnabled": { + "type": "boolean" } } }, @@ -3596,9 +3241,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -3606,9 +3249,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -3622,9 +3263,7 @@ "syntheticPublic": { "type": "boolean" }, - "returnType": { - "$ref": "#/components/schemas/ClassNode" - }, + "returnType": {}, "parameters": { "type": "array", "items": { @@ -3642,9 +3281,7 @@ }, "exceptions": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "genericsTypes": { "type": "array", @@ -3682,6 +3319,16 @@ "text": { "type": "string" }, + "annotationDefault": { + "type": "boolean", + "writeOnly": true + }, + "firstStatement": { + "$ref": "#/components/schemas/Statement" + }, + "staticConstructor": { + "type": "boolean" + }, "voidMethod": { "type": "boolean" }, @@ -3691,16 +3338,6 @@ "scriptBody": { "type": "boolean" }, - "firstStatement": { - "$ref": "#/components/schemas/Statement" - }, - "staticConstructor": { - "type": "boolean" - }, - "annotationDefault": { - "type": "boolean", - "writeOnly": true - }, "instance": { "$ref": "#/components/schemas/AnnotatedNode" }, @@ -3717,9 +3354,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -3741,14 +3376,14 @@ "configuration": { "$ref": "#/components/schemas/CompilerConfiguration" }, - "errorCount": { + "warningCount": { "type": "integer", "format": "int32" }, "lastError": { "$ref": "#/components/schemas/Message" }, - "warningCount": { + "errorCount": { "type": "integer", "format": "int32" } @@ -3757,14 +3392,10 @@ "ExpandoMetaClass": { "type": "object", "properties": { - "theCachedClass": { - "$ref": "#/components/schemas/CachedClass" - }, + "theCachedClass": {}, "additionalMetaMethods": { "type": "array", - "items": { - "$ref": "#/components/schemas/MetaMethod" - } + "items": {} }, "registry": { "$ref": "#/components/schemas/MetaClassRegistry" @@ -3787,9 +3418,7 @@ }, "expandoSubclassMethods": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "expandoProperties": { "type": "array", @@ -3811,12 +3440,6 @@ "type": "integer", "format": "int32" }, - "classInfo": { - "$ref": "#/components/schemas/ClassInfo" - }, - "groovyObject": { - "type": "boolean" - }, "upProperties": { "type": "array", "items": { @@ -3868,15 +3491,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -3908,15 +3527,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -3926,9 +3541,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -3945,9 +3558,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -3986,23 +3597,17 @@ "bridge": { "type": "boolean" }, - "defaultValue": { - "type": "object" - }, + "defaultValue": {}, "annotatedReturnType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4021,15 +3626,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4059,30 +3660,22 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "annotatedType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4123,9 +3716,7 @@ "items": { "type": "object", "properties": { - "genericDeclaration": { - "type": "object" - }, + "genericDeclaration": {}, "annotatedBounds": { "type": "array", "items": { @@ -4133,15 +3724,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4173,15 +3760,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -4191,9 +3774,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "varArgs": { "type": "boolean" @@ -4205,15 +3786,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4234,9 +3811,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -4266,15 +3841,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4291,15 +3862,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4318,15 +3885,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4341,9 +3904,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -4362,15 +3923,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4389,15 +3946,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4412,9 +3965,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } }, @@ -4440,15 +3991,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4480,15 +4027,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -4498,9 +4041,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -4517,9 +4058,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -4558,23 +4097,17 @@ "bridge": { "type": "boolean" }, - "defaultValue": { - "type": "object" - }, + "defaultValue": {}, "annotatedReturnType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4593,15 +4126,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4631,30 +4160,22 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "annotatedType": { "type": "object", "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4695,9 +4216,7 @@ "items": { "type": "object", "properties": { - "genericDeclaration": { - "type": "object" - }, + "genericDeclaration": {}, "annotatedBounds": { "type": "array", "items": { @@ -4705,15 +4224,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4745,15 +4260,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -4763,9 +4274,7 @@ }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "varArgs": { "type": "boolean" @@ -4777,15 +4286,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4806,9 +4311,7 @@ "type": "array", "items": { "type": "array", - "items": { - "type": "object" - } + "items": {} } }, "genericParameterTypes": { @@ -4838,15 +4341,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4863,15 +4362,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4890,15 +4385,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4913,9 +4404,7 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "accessible": { "type": "boolean", @@ -4934,15 +4423,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4961,15 +4446,11 @@ "properties": { "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "type": { "type": "object", @@ -4984,16 +4465,18 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } } }, "writeOnly": true - } + }, + "groovyObject": { + "type": "boolean" + }, + "classInfo": {} } }, "Expression": { @@ -5017,19 +4500,13 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } - }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" + "additionalProperties": {} }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, "instance": { "$ref": "#/components/schemas/AnnotatedNode" }, @@ -5049,9 +4526,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -5076,9 +4551,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -5086,9 +4559,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -5099,12 +4570,8 @@ "type": "integer", "format": "int32" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, - "owner": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, + "owner": {}, "initialValueExpression": { "$ref": "#/components/schemas/Expression" }, @@ -5114,9 +4581,7 @@ "holder": { "type": "boolean" }, - "originType": { - "$ref": "#/components/schemas/ClassNode" - }, + "originType": {}, "enum": { "type": "boolean" }, @@ -5167,9 +4632,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -5194,24 +4657,16 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "name": { "type": "string" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, - "lowerBound": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, + "lowerBound": {}, "upperBounds": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "placeholder": { "type": "boolean" @@ -5231,9 +4686,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -5293,15 +4746,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -5349,15 +4798,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "packages": { "type": "array", @@ -5369,9 +4814,7 @@ "nativeAccessEnabled": { "type": "boolean" }, - "layer": { - "type": "object" - } + "layer": {} } }, "definedPackages": { @@ -5384,15 +4827,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -5449,15 +4888,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -5505,15 +4940,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "packages": { "type": "array", @@ -5525,9 +4956,7 @@ "nativeAccessEnabled": { "type": "boolean" }, - "layer": { - "type": "object" - } + "layer": {} } }, "definedPackages": { @@ -5540,15 +4969,11 @@ }, "annotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "declaredAnnotations": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "sealed": { "type": "boolean" @@ -5580,9 +5005,7 @@ } } }, - "GroovyResourceLoader": { - "type": "object" - }, + "GroovyResourceLoader": {}, "Groovydoc": { "type": "object", "properties": { @@ -5606,12 +5029,8 @@ "GroovydocHolder": { "type": "object", "properties": { - "instance": { - "type": "object" - }, - "groovydoc": { - "$ref": "#/components/schemas/Groovydoc" - } + "instance": {}, + "groovydoc": {} } }, "GroovydocTag": { @@ -5623,9 +5042,7 @@ "content": { "type": "string" }, - "groovydoc": { - "$ref": "#/components/schemas/Groovydoc" - } + "groovydoc": {} } }, "ImportNode": { @@ -5649,9 +5066,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -5659,15 +5074,11 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, "alias": { "type": "string" }, @@ -5705,9 +5116,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -5732,9 +5141,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -5742,9 +5149,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -5760,9 +5165,7 @@ }, "interfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "methods": { "type": "array", @@ -5788,12 +5191,8 @@ "$ref": "#/components/schemas/FieldNode" } }, - "module": { - "$ref": "#/components/schemas/ModuleNode" - }, - "compileUnit": { - "$ref": "#/components/schemas/CompileUnit" - }, + "module": {}, + "compileUnit": {}, "staticClass": { "type": "boolean" }, @@ -5803,12 +5202,8 @@ "script": { "type": "boolean" }, - "superClass": { - "$ref": "#/components/schemas/ClassNode" - }, - "innerClasses": { - "type": "object" - }, + "superClass": {}, + "innerClasses": {}, "permittedSubclasses": { "type": "array", "items": { @@ -5827,11 +5222,9 @@ "$ref": "#/components/schemas/RecordComponentNode" } }, - "componentType": { - "$ref": "#/components/schemas/ClassNode" - }, + "componentType": {}, "redirect": { - "$ref": "#/components/schemas/ClassNode" + "writeOnly": true }, "annotated": { "type": "boolean" @@ -5845,15 +5238,11 @@ "enclosingMethod": { "$ref": "#/components/schemas/MethodNode" }, - "outerClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "outerClass": {}, "anonymous": { "type": "boolean" }, - "outerMostClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "outerMostClass": {}, "variableScope": { "$ref": "#/components/schemas/VariableScope" }, @@ -5896,23 +5285,19 @@ "text": { "type": "string" }, + "unresolvedSuperClass": {}, "objectInitializerStatements": { "type": "array", "items": { "$ref": "#/components/schemas/Statement" } }, - "derivedFromGroovyObject": { - "type": "boolean" - }, - "unresolvedSuperClass": { - "$ref": "#/components/schemas/ClassNode" - }, "unresolvedInterfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} + }, + "derivedFromGroovyObject": { + "type": "boolean" }, "recordComponentNodes": { "type": "array", @@ -5921,31 +5306,10 @@ "$ref": "#/components/schemas/RecordComponentNode" } }, - "redirectNode": { - "type": "boolean" - }, - "allDeclaredMethods": { - "type": "array", - "items": { - "$ref": "#/components/schemas/MethodNode" - } - }, - "allInterfaces": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - }, - "uniqueItems": true - }, - "abstractMethods": { - "type": "array", - "items": { - "$ref": "#/components/schemas/MethodNode" - } - }, "genericsPlaceHolder": { "type": "boolean" }, + "plainNodeReference": {}, "primaryClassNode": { "type": "boolean" }, @@ -5960,9 +5324,7 @@ }, "outerClasses": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "nameWithoutPackage": { "type": "string" @@ -5970,8 +5332,25 @@ "annotationDefinition": { "type": "boolean" }, - "plainNodeReference": { - "$ref": "#/components/schemas/ClassNode" + "abstractMethods": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MethodNode" + } + }, + "allInterfaces": { + "type": "array", + "items": {}, + "uniqueItems": true + }, + "allDeclaredMethods": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MethodNode" + } + }, + "redirectNode": { + "type": "boolean" }, "instance": { "$ref": "#/components/schemas/AnnotatedNode" @@ -5989,15 +5368,11 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, - "Message": { - "type": "object" - }, + "Message": {}, "MetaClass": { "type": "object", "properties": { @@ -6035,24 +5410,22 @@ "MetaClassRegistry": { "type": "object", "properties": { + "metaClassRegistryChangeEventListeners": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MetaClassRegistryChangeEventListener" + } + }, "metaClassCreationHandler": { "$ref": "#/components/schemas/MetaClassCreationHandle" }, "metaClassCreationHandle": { "$ref": "#/components/schemas/MetaClassCreationHandle", "writeOnly": true - }, - "metaClassRegistryChangeEventListeners": { - "type": "array", - "items": { - "$ref": "#/components/schemas/MetaClassRegistryChangeEventListener" - } } } }, - "MetaClassRegistryChangeEventListener": { - "type": "object" - }, + "MetaClassRegistryChangeEventListener": {}, "MetaMethod": { "type": "object", "properties": { @@ -6102,15 +5475,15 @@ "cacheable": { "type": "boolean" }, - "vargsMethod": { - "type": "boolean" - }, "parametersTypes": { "type": "array", "items": { "$ref": "#/components/schemas/CachedClass" }, "writeOnly": true + }, + "vargsMethod": { + "type": "boolean" } } }, @@ -6147,9 +5520,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -6157,9 +5528,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -6173,9 +5542,7 @@ "syntheticPublic": { "type": "boolean" }, - "returnType": { - "$ref": "#/components/schemas/ClassNode" - }, + "returnType": {}, "parameters": { "type": "array", "items": { @@ -6193,9 +5560,7 @@ }, "exceptions": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "genericsTypes": { "type": "array", @@ -6233,6 +5598,16 @@ "text": { "type": "string" }, + "annotationDefault": { + "type": "boolean", + "writeOnly": true + }, + "firstStatement": { + "$ref": "#/components/schemas/Statement" + }, + "staticConstructor": { + "type": "boolean" + }, "voidMethod": { "type": "boolean" }, @@ -6242,16 +5617,6 @@ "scriptBody": { "type": "boolean" }, - "firstStatement": { - "$ref": "#/components/schemas/Statement" - }, - "staticConstructor": { - "type": "boolean" - }, - "annotationDefault": { - "type": "boolean", - "writeOnly": true - }, "instance": { "$ref": "#/components/schemas/AnnotatedNode" }, @@ -6268,9 +5633,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -6295,9 +5658,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -6305,9 +5666,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -6323,9 +5682,7 @@ }, "interfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "methods": { "type": "array", @@ -6366,12 +5723,8 @@ "script": { "type": "boolean" }, - "superClass": { - "$ref": "#/components/schemas/ClassNode" - }, - "innerClasses": { - "type": "object" - }, + "superClass": {}, + "innerClasses": {}, "permittedSubclasses": { "type": "array", "items": { @@ -6390,11 +5743,9 @@ "$ref": "#/components/schemas/RecordComponentNode" } }, - "componentType": { - "$ref": "#/components/schemas/ClassNode" - }, + "componentType": {}, "redirect": { - "$ref": "#/components/schemas/ClassNode" + "writeOnly": true }, "annotated": { "type": "boolean" @@ -6447,23 +5798,19 @@ "text": { "type": "string" }, + "unresolvedSuperClass": {}, "objectInitializerStatements": { "type": "array", "items": { "$ref": "#/components/schemas/Statement" } }, - "derivedFromGroovyObject": { - "type": "boolean" - }, - "unresolvedSuperClass": { - "$ref": "#/components/schemas/ClassNode" - }, "unresolvedInterfaces": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} + }, + "derivedFromGroovyObject": { + "type": "boolean" }, "recordComponentNodes": { "type": "array", @@ -6472,34 +5819,10 @@ "$ref": "#/components/schemas/RecordComponentNode" } }, - "outerClass": { - "$ref": "#/components/schemas/ClassNode" - }, - "redirectNode": { - "type": "boolean" - }, - "allDeclaredMethods": { - "type": "array", - "items": { - "$ref": "#/components/schemas/MethodNode" - } - }, - "allInterfaces": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - }, - "uniqueItems": true - }, - "abstractMethods": { - "type": "array", - "items": { - "$ref": "#/components/schemas/MethodNode" - } - }, "genericsPlaceHolder": { "type": "boolean" }, + "plainNodeReference": {}, "primaryClassNode": { "type": "boolean" }, @@ -6514,9 +5837,7 @@ }, "outerClasses": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "nameWithoutPackage": { "type": "string" @@ -6524,8 +5845,26 @@ "annotationDefinition": { "type": "boolean" }, - "plainNodeReference": { - "$ref": "#/components/schemas/ClassNode" + "abstractMethods": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MethodNode" + } + }, + "allInterfaces": { + "type": "array", + "items": {}, + "uniqueItems": true + }, + "allDeclaredMethods": { + "type": "array", + "items": { + "$ref": "#/components/schemas/MethodNode" + } + }, + "outerClass": {}, + "redirectNode": { + "type": "boolean" }, "instance": { "$ref": "#/components/schemas/AnnotatedNode" @@ -6543,9 +5882,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -6570,15 +5907,11 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "classes": { "type": "array", - "items": { - "$ref": "#/components/schemas/ClassNode" - } + "items": {} }, "methods": { "type": "array", @@ -6639,11 +5972,9 @@ "$ref": "#/components/schemas/SourceUnit" }, "scriptBaseClassFromConfig": { - "$ref": "#/components/schemas/ClassNode" - }, - "scriptClassDummy": { - "$ref": "#/components/schemas/ClassNode" + "writeOnly": true }, + "scriptClassDummy": {}, "text": { "type": "string" }, @@ -6653,9 +5984,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -6680,9 +6009,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -6690,9 +6017,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -6718,9 +6043,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -6745,9 +6068,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -6755,21 +6076,15 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, "name": { "type": "string" }, - "originType": { - "$ref": "#/components/schemas/ClassNode" - }, + "originType": {}, "dynamicTyped": { "type": "boolean" }, @@ -6808,9 +6123,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -6822,9 +6135,7 @@ } } }, - "ParserPluginFactory": { - "type": "object" - }, + "ParserPluginFactory": {}, "PropertyNode": { "type": "object", "properties": { @@ -6846,9 +6157,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -6856,9 +6165,7 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, @@ -6881,9 +6188,7 @@ "type": "integer", "format": "int32" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, "name": { "type": "string" }, @@ -6900,12 +6205,6 @@ "type": "boolean", "deprecated": true }, - "dynamicTyped": { - "type": "boolean" - }, - "originType": { - "$ref": "#/components/schemas/ClassNode" - }, "getterNameOrDefault": { "type": "string" }, @@ -6918,6 +6217,10 @@ "inStaticContext": { "type": "boolean" }, + "dynamicTyped": { + "type": "boolean" + }, + "originType": {}, "instance": { "$ref": "#/components/schemas/AnnotatedNode" }, @@ -6937,9 +6240,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -6950,9 +6251,7 @@ "type": "string", "format": "uri" }, - "reader": { - "type": "object" - } + "reader": {} } }, "RecordComponentNode": { @@ -6976,9 +6275,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "annotations": { "type": "array", @@ -6986,18 +6283,14 @@ "$ref": "#/components/schemas/AnnotationNode" } }, - "declaringClass": { - "$ref": "#/components/schemas/ClassNode" - }, + "declaringClass": {}, "synthetic": { "type": "boolean" }, "name": { "type": "string" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, "instance": { "$ref": "#/components/schemas/AnnotatedNode" }, @@ -7017,9 +6310,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -7039,7 +6330,11 @@ "type": "integer", "format": "int32" }, - "description": { + "meaning": { + "type": "integer", + "format": "int32" + }, + "rootText": { "type": "string" }, "startLine": { @@ -7050,11 +6345,7 @@ "type": "integer", "format": "int32" }, - "meaning": { - "type": "integer", - "format": "int32" - }, - "rootText": { + "description": { "type": "string" } } @@ -7087,9 +6378,7 @@ "cst": { "$ref": "#/components/schemas/Reduction" }, - "ast": { - "$ref": "#/components/schemas/ModuleNode" - }, + "ast": {}, "phaseDescription": { "type": "string" } @@ -7116,9 +6405,7 @@ }, "metaDataMap": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} }, "statementLabels": { "type": "array", @@ -7142,9 +6429,7 @@ }, "nodeMetaData": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -7170,20 +6455,18 @@ "type": "integer", "format": "int32" }, - "root": { - "$ref": "#/components/schemas/Token" - }, + "root": {}, "rootText": { "type": "string" }, "empty": { "type": "boolean" }, - "description": { - "type": "string" - }, "anExpression": { "type": "boolean" + }, + "description": { + "type": "string" } } }, @@ -7197,35 +6480,27 @@ "type": "integer", "format": "int32" }, - "type": { - "$ref": "#/components/schemas/ClassNode" - }, + "type": {}, "closureSharedVariable": { "type": "boolean" }, - "dynamicTyped": { - "type": "boolean" - }, - "originType": { - "$ref": "#/components/schemas/ClassNode" - }, "initialExpression": { "$ref": "#/components/schemas/Expression" }, "inStaticContext": { "type": "boolean" - } + }, + "dynamicTyped": { + "type": "boolean" + }, + "originType": {} } }, "VariableScope": { "type": "object", "properties": { - "parent": { - "$ref": "#/components/schemas/VariableScope" - }, - "classScope": { - "$ref": "#/components/schemas/ClassNode" - }, + "parent": {}, + "classScope": {}, "inStaticContext": { "type": "boolean" }, @@ -7244,19 +6519,13 @@ "root": { "type": "boolean" }, - "declaredVariablesIterator": { - "type": "object" - }, "referencedLocalVariablesCount": { "type": "integer", "format": "int32" }, - "referencedLocalVariablesIterator": { - "type": "object" - }, - "referencedClassVariablesIterator": { - "type": "object" - } + "referencedLocalVariablesIterator": {}, + "referencedClassVariablesIterator": {}, + "declaredVariablesIterator": {} } }, "WarningMessage": { diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/pom.xml index b8c863bd4..332033c7a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/pom.xml @@ -2,10 +2,11 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-hateoas-tests + ${project.artifactId} @@ -24,11 +25,6 @@ h2 test - - org.projectlombok - lombok - test - org.springframework.boot spring-boot-starter-hateoas @@ -36,4 +32,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index 4f6c2d241..c8d201c91 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -51,7 +51,7 @@ @ActiveProfiles("test") @SpringBootTest @AutoConfigureMockMvc -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractSpringDocTest { public static String className; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/DatabaseLoader.java index f07681cbd..0d541c4b9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/Employee.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/Employee.java index e491214b7..5fe4b89dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeController.java index 53ce35d71..39d495bf2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeRepository.java index 0f4a84020..1d83d5593 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java index 0d4ab7109..e347cffb4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/Dummy.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/Dummy.java index 85baf2822..4bfcab36c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/Dummy.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/Dummy.java @@ -21,18 +21,25 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; -import lombok.AllArgsConstructor; -import lombok.Data; -@Data -@AllArgsConstructor public class Dummy { private T value; + public Dummy(T value) { + this.value = value; + } + + public T getValue() { + return value; + } + + public void setValue(T value) { + this.value = value; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java index ae53b9bcc..c55dcb912 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -31,6 +31,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.web.PagedModel; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -43,6 +44,11 @@ public Page pageSimple() { return pageImpl("test"); } + @GetMapping("/page-simple-response") + public ResponseEntity> pageSimpleResponse() { + return null; + } + @GetMapping("/paged-model-simple") public PagedModel pagedModelSimple() { return pagedModel("test"); @@ -76,4 +82,8 @@ private Page pageImpl(T value) { return new PageImpl<>(List.of(value)); } + public record UserDto( + String id, + String email + ) {} } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10DirectTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10DirectTest.java index b56e3f542..4dd164cb2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10DirectTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10DirectTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -45,9 +45,9 @@ public class SpringDocApp10DirectTest extends AbstractSpringDocTest { @Test protected void testApp() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.0.1"))) - .andExpect(content().json(getContent("results/3.0.1/app10-direct.json"), true)); + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.0.1"))) + .andExpect(content().json(getContent("results/3.0.1/app10-direct.json"), true)); } @SpringBootApplication diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10NotSpecifiedTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10NotSpecifiedTest.java index de83b58dc..1ec375a05 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10NotSpecifiedTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10NotSpecifiedTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -54,14 +54,14 @@ public static void init() { .stream().filter(modelConverter -> modelConverter instanceof PageOpenAPIConverter).findAny(); pageOpenAPIConverter.ifPresent(ModelConverters.getInstance()::removeConverter); } - + @Override @Test protected void testApp() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.0.1"))) - .andExpect(content().json(getContent("results/3.0.1/app10-direct.json"), true)); + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.0.1"))) + .andExpect(content().json(getContent("results/3.0.1/app10-direct.json"), true)); } @SpringBootApplication diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10ViaDtoTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10ViaDtoTest.java index e8917f8d9..f69756226 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10ViaDtoTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10ViaDtoTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -45,9 +45,9 @@ public class SpringDocApp10ViaDtoTest extends AbstractSpringDocTest { @Test protected void testApp() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.0.1"))) - .andExpect(content().json(getContent("results/3.0.1/app10-via_dto.json"), true)); + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.0.1"))) + .andExpect(content().json(getContent("results/3.0.1/app10-via_dto.json"), true)); } @SpringBootApplication diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java index b89e6019b..709a5b39a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/config/DatabaseConfig.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/config/DatabaseConfig.java index facf8d943..8869c3e1d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/config/DatabaseConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/config/DatabaseConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.config; @@ -29,7 +29,6 @@ import java.time.LocalDate; import jakarta.annotation.PostConstruct; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v30.app2.entities.Post; import test.org.springdoc.api.v30.app2.repositories.PostRepository; @@ -40,11 +39,14 @@ * 2020 */ @Configuration -@RequiredArgsConstructor public class DatabaseConfig { private final PostRepository postRepository; + public DatabaseConfig(PostRepository postRepository) { + this.postRepository = postRepository; + } + @PostConstruct private void postConstruct() { for (int i = 0; i < 33; i++) { diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/controller/PostController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/controller/PostController.java index f0745d2ba..9a81f2551 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/controller/PostController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/controller/PostController.java @@ -21,12 +21,11 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.controller; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v30.app2.entities.Post; import test.org.springdoc.api.v30.app2.service.PostService; @@ -43,11 +42,14 @@ * 2020 */ @RestController -@RequiredArgsConstructor public class PostController { private final PostService postService; + public PostController(PostService postService) { + this.postService = postService; + } + @GetMapping public ResponseEntity>> getAll(Pageable pageable) { return new ResponseEntity<>(postService.getAll(pageable), HttpStatus.OK); diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/entities/Post.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/entities/Post.java index 0a9bad4b0..0c6ae8775 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/entities/Post.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/entities/Post.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.entities; @@ -29,18 +29,12 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; /** * @author Davide Pedone * 2020 */ -@Data @Entity -@NoArgsConstructor -@AllArgsConstructor public class Post { @Id @@ -53,4 +47,46 @@ public class Post { private Long createdAt; + public Post(Long id, String author, String content, Long createdAt) { + this.id = id; + this.author = author; + this.content = content; + this.createdAt = createdAt; + } + + public Post() { + + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Long getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Long createdAt) { + this.createdAt = createdAt; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/hateoas/PostResourceAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/hateoas/PostResourceAssembler.java index 66f749466..100de2319 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/hateoas/PostResourceAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/hateoas/PostResourceAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/repositories/PostRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/repositories/PostRepository.java index 2b98aed8f..061d2442d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/repositories/PostRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/repositories/PostRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.repositories; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/service/PostService.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/service/PostService.java index 9e5bdc6a7..6d4fab7af 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/service/PostService.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app2/service/PostService.java @@ -21,13 +21,12 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.service; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v30.app2.entities.Post; import test.org.springdoc.api.v30.app2.hateoas.PostResourceAssembler; import test.org.springdoc.api.v30.app2.repositories.PostRepository; @@ -43,7 +42,6 @@ * @author Davide Pedone * 2020 */ -@RequiredArgsConstructor @Service public class PostService { @@ -58,4 +56,9 @@ public PagedModel> getAll(Pageable pageable) { return pagedResourcesAssembler.toModel(postPage, postResourceAssembler); } + public PostService(PostRepository postRepository, PagedResourcesAssembler pagedResourcesAssembler, PostResourceAssembler postResourceAssembler) { + this.postRepository = postRepository; + this.pagedResourcesAssembler = pagedResourcesAssembler; + this.postResourceAssembler = postResourceAssembler; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/DatabaseLoader.java index 28cc70f30..3ccb28b8b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/Employee.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/Employee.java index a3f214c08..2b564c8c0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeController.java index 7e667c7bb..42270a5d1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeRepository.java index f0914e0c7..c6fb3ab20 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java index 30a8aeb1a..a9af9eb5c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java index 756719ead..c5177bf91 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/Album.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/Album.java index 185011185..7fbc31039 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/Album.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/Album.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumController.java index 87c097c3e..418a3ab5f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumModelAssembler.java index 4a90ad1b7..11319abae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/AlbumModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java index 6a3b81f87..348c767f8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java index 0f558d601..850031f14 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/controller/CompanyController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/controller/CompanyController.java index 922a04f29..b33371ba3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/controller/CompanyController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/controller/CompanyController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5.controller; @@ -29,7 +29,6 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v30.app5.entities.CompanyDto; import org.springframework.web.bind.annotation.PostMapping; @@ -41,7 +40,6 @@ * 2020 */ @RestController -@RequiredArgsConstructor public class CompanyController { diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/Company.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/Company.java index 6f7384d96..09276b596 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/Company.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/Company.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5.entities; @@ -30,21 +30,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; +import org.springframework.hateoas.Link; import org.springframework.hateoas.RepresentationModel; import org.springframework.hateoas.server.core.Relation; /** * @author bnasslahsen */ -@AllArgsConstructor -@Data -@Builder -@EqualsAndHashCode(callSuper = false) @Relation(collectionRelation = "companies", itemRelation = "company") public class Company extends RepresentationModel { @JsonProperty(access = JsonProperty.Access.READ_ONLY) @@ -52,4 +45,37 @@ public class Company extends RepresentationModel { @NotNull private String name; + + public Company(UUID id, String name) { + this.id = id; + this.name = name; + } + + public Company(Link initialLink, UUID id, String name) { + super(initialLink); + this.id = id; + this.name = name; + } + + public Company(Iterable initialLinks, UUID id, String name) { + super(initialLinks); + this.id = id; + this.name = name; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/CompanyDto.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/CompanyDto.java index 45a863a72..707295a15 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/CompanyDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/entities/CompanyDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5.entities; @@ -29,27 +29,86 @@ import java.util.UUID; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty.Access; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; +import org.springframework.hateoas.Link; import org.springframework.hateoas.RepresentationModel; import org.springframework.hateoas.server.core.Relation; /** * @author bnasslahsen */ -@AllArgsConstructor -@Data -@Builder -@EqualsAndHashCode(callSuper = false) @Relation(collectionRelation = "companies", itemRelation = "company") public class CompanyDto extends RepresentationModel { - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = Access.READ_ONLY) private UUID id; @NotNull private String name; + + private CompanyDto(Builder builder) { + setId(builder.id); + setName(builder.name); + } + + public static Builder builder() { + return new Builder(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public CompanyDto(UUID id, String name) { + this.id = id; + this.name = name; + } + + public CompanyDto(Link initialLink, UUID id, String name) { + super(initialLink); + this.id = id; + this.name = name; + } + + public CompanyDto(Iterable initialLinks, UUID id, String name) { + super(initialLinks); + this.id = id; + this.name = name; + } + + public static final class Builder { + private UUID id; + + private @NotNull String name; + + private Builder() { + } + + public Builder id(UUID val) { + id = val; + return this; + } + + public Builder name(@NotNull String val) { + name = val; + return this; + } + + public CompanyDto build() { + return new CompanyDto(this); + } + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/hateoas/CompanyModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/hateoas/CompanyModelAssembler.java index 57ecb5013..e6a8f0302 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/hateoas/CompanyModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app5/hateoas/CompanyModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java index 7a238ff74..7be76d117 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; @@ -53,7 +53,7 @@ public class SpringDocApp6Test extends AbstractSpringDocTest { @BeforeEach void init() throws IllegalAccessException { - SimpleMixInResolver _mixIns = (SimpleMixInResolver) FieldUtils.readDeclaredField(objectMapperProvider.jsonMapper(),"_mixIns", true); + SimpleMixInResolver _mixIns = (SimpleMixInResolver) FieldUtils.readDeclaredField(objectMapperProvider.jsonMapper(), "_mixIns", true); Map> _localMixIns = (Map>) FieldUtils.readDeclaredField(_mixIns, "_localMixIns", true); Iterator>> iterator = _localMixIns.entrySet().iterator(); diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/controller/ItemController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/controller/ItemController.java index b8fd4d2c2..fbfce1527 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/controller/ItemController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/controller/ItemController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6.controller; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/model/Item.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/model/Item.java index 570b2a487..b90eb837b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/model/Item.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app6/model/Item.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/FooConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/FooConfiguration.java index 4694d8e15..e15cce785 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/FooConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/FooConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java index 6c1a11c2f..b7c8d25ba 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/Foo.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/Foo.java index a724fe4c1..90ed4506e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/Foo.java @@ -21,16 +21,23 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7.application; -import lombok.AllArgsConstructor; -import lombok.Data; - -@Data -@AllArgsConstructor public class Foo { String foo; + + public Foo(String foo) { + this.foo = foo; + } + + public String getFoo() { + return foo; + } + + public void setFoo(String foo) { + this.foo = foo; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooController.java index 2d396aeec..5c112be2a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7.application; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooResourceAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooResourceAssembler.java index 546bad633..f4d803c20 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooResourceAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooResourceAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7.application; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooService.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooService.java index 7a290453e..5536d2908 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooService.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app7/application/FooService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7.application; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/DatabaseLoader.java index e362554b2..af03e7d78 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/Employee.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/Employee.java index 700df1514..db74cf80a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeController.java index 3a21941b4..9edc33f52 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeRepository.java index dfb350e43..79662dedc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java index ee48105ed..7449bbd09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; @@ -57,7 +57,7 @@ void init() throws IllegalAccessException { Map> _localMixIns = (Map>) FieldUtils.readDeclaredField(_mixIns, "_localMixIns", true); Iterator>> it = _localMixIns.entrySet().iterator(); while (it.hasNext()) { - Map.Entry> entry = it.next(); + Entry> entry = it.next(); if (entry.getKey().toString().startsWith("org.springframework")) { springMixins.put(entry.getKey(), entry.getValue()); it.remove(); diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/FooConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/FooConfiguration.java index baf92b141..514b145bb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/FooConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/FooConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; @@ -46,10 +46,10 @@ public class FooConfiguration { OpenAPI customOpenApi() { return new OpenAPI() .components(new Components().addSecuritySchemes("bearerScheme", - new SecurityScheme() - .type(SecurityScheme.Type.HTTP) - .scheme("bearer") - .bearerFormat("JWT")) + new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT")) .addSchemas("FeedResponse", feedResponseSchema())) .info(new Info() .title("Response API") @@ -69,7 +69,7 @@ OpenAPI customOpenApi() { private Schema feedResponseSchema() { Schema schema = new Schema<>(); schema.addProperty("_links", linkSchema()); - schema.addProperty("data", new ArraySchema().items(new Schema<>().$ref("#/components/schemas/ResponseData"))); + schema.addProperty("data", new ArraySchema().items(new Schema<>().$ref("#/components/schemas/ResponseData"))); return schema; } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java index c1557b44f..596450975 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/FooController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/FooController.java index 530c4077b..ce5854fa1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/FooController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/FooController.java @@ -21,18 +21,17 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.application; +import java.time.LocalDate; import java.util.List; import java.util.UUID; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import test.org.springdoc.api.v30.app9.application.dto.FeedResponse; import test.org.springdoc.api.v30.app9.application.dto.ResponseData; @@ -43,21 +42,18 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; + @Tag(name = "ResponseDataController") @RestController @RequestMapping(value = "/some-route", produces = MediaType.APPLICATION_JSON_VALUE) -@RequiredArgsConstructor -@Slf4j public class FooController { - - @Operation(summary = "Get all data", description = "Get all data") @GetMapping(value = "foo/{id}") @ResponseStatus(HttpStatus.OK) public FeedResponse getFoo(@PathVariable("id") UUID id) { - var dataList = List.of(ResponseData.builder().dataId(id).build()); + var dataList = List.of(new ResponseData(id, LocalDate.now())); return FeedResponse.createForResponseData(dataList, UUID.randomUUID()); } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/FeedResponse.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/FeedResponse.java index 6a7a435ad..29e0ab7c3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/FeedResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/FeedResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.application.dto; @@ -31,11 +31,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.experimental.Accessors; import test.org.springdoc.api.v30.app9.application.FooController; import org.springframework.hateoas.IanaLinkRelations; @@ -44,15 +39,15 @@ import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn; -@Getter -@Accessors(fluent = true) -@Builder(access = AccessLevel.PACKAGE) -@EqualsAndHashCode(callSuper = true) public class FeedResponse extends RepresentationModel { @NotNull @JsonProperty("data") private final List data; + public FeedResponse(List data) { + this.data = data; + } + public static FeedResponse createForResponseData(@NotNull List responseData, UUID uuid) { var feedResponse = new FeedResponse(responseData); feedResponse.add(linkTo(methodOn(FooController.class).getFoo(uuid)).withSelfRel()); @@ -62,4 +57,8 @@ public static FeedResponse createForResponseData(@NotNull List res return feedResponse; } + + public List getData() { + return data; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/ResponseData.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/ResponseData.java index 847a9e465..d92005f53 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/ResponseData.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app9/application/dto/ResponseData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9.application.dto; @@ -32,15 +32,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import lombok.Builder; -@Builder public record ResponseData( - @JsonProperty(value = "DATA_ID", required = true) - @NotNull - UUID dataId, - @JsonProperty(value = "DATE", required = true) - @NotNull - @Schema(example = "2024-03-27", format = "date") - LocalDate date + @JsonProperty(value = "DATA_ID", required = true) + @NotNull + UUID dataId, + @JsonProperty(value = "DATE", required = true) + @NotNull + @Schema(example = "2024-03-27", format = "date") + LocalDate date ) {} diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index a38cc04c9..d1bacf084 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/DatabaseLoader.java index 3e1eb517a..bd13e5073 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/Employee.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/Employee.java index 8692d25c1..6af9d8eda 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeController.java index 323974545..75776c59c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeRepository.java index e51dff831..84cbb0f0c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java index 76ecc6662..f6308f083 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/Dummy.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/Dummy.java index 0bf8faf98..83bb1e00b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/Dummy.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/Dummy.java @@ -21,18 +21,25 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; -import lombok.AllArgsConstructor; -import lombok.Data; -@Data -@AllArgsConstructor public class Dummy { private T value; + public Dummy(T value) { + this.value = value; + } + + public T getValue() { + return value; + } + + public void setValue(T value) { + this.value = value; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java index d028d144d..fef0e40bd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10DirectTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10DirectTest.java index 954dddce3..4e92e30b7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10DirectTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10DirectTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -45,9 +45,9 @@ public class SpringDocApp10DirectTest extends AbstractSpringDocTest { @Test protected void testApp() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.1.0"))) - .andExpect(content().json(getContent("results/3.1.0/app10-direct.json"), true)); + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.1.0"))) + .andExpect(content().json(getContent("results/3.1.0/app10-direct.json"), true)); } @SpringBootApplication diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10NotSpecifiedTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10NotSpecifiedTest.java index fd9f13add..8d4bc3123 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10NotSpecifiedTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10NotSpecifiedTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -54,14 +54,14 @@ public static void init() { .stream().filter(modelConverter -> modelConverter instanceof PageOpenAPIConverter).findAny(); pageOpenAPIConverter.ifPresent(ModelConverters.getInstance()::removeConverter); } - + @Override @Test protected void testApp() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.1.0"))) - .andExpect(content().json(getContent("results/3.1.0/app10-direct.json"), true)); + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.1.0"))) + .andExpect(content().json(getContent("results/3.1.0/app10-direct.json"), true)); } @SpringBootApplication diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10ViaDtoTest.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10ViaDtoTest.java index 4b3253cca..6da3795d6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10ViaDtoTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10ViaDtoTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -45,9 +45,9 @@ public class SpringDocApp10ViaDtoTest extends AbstractSpringDocTest { @Test protected void testApp() throws Exception { mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.openapi", is("3.1.0"))) - .andExpect(content().json(getContent("results/3.1.0/app10-via_dto.json"), true)); + .andExpect(status().isOk()) + .andExpect(jsonPath("$.openapi", is("3.1.0"))) + .andExpect(content().json(getContent("results/3.1.0/app10-via_dto.json"), true)); } @SpringBootApplication diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java index 3e619a272..4e9adaa2c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/configuration/WebMvcConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/configuration/WebMvcConfiguration.java index 032eeeac7..e8599b422 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/configuration/WebMvcConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/configuration/WebMvcConfiguration.java @@ -13,13 +13,13 @@ @Configuration public class WebMvcConfiguration { - @Bean - MappingJackson2HttpMessageConverter getMappingJacksonHttpMessageConverter() { - MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); - converter.setSupportedMediaTypes(List.of(MediaType.APPLICATION_JSON)); - converter.setObjectMapper(new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL) - ); + @Bean + MappingJackson2HttpMessageConverter getMappingJacksonHttpMessageConverter() { + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); + converter.setSupportedMediaTypes(List.of(MediaType.APPLICATION_JSON)); + converter.setObjectMapper(new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL) + ); - return converter; - } + return converter; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/BasicController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/BasicController.java index 7f6586f05..5c50aa753 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/BasicController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/BasicController.java @@ -17,25 +17,26 @@ @RequestMapping(path = "/") public class BasicController { - @GetMapping("/cat") - @ResponseStatus(HttpStatus.OK) - @Operation(summary = "get", description = "Provides an animal.") - public String get(Cat cat) { - return cat != null ? cat.getName() : ""; - } + @GetMapping("/cat") + @ResponseStatus(HttpStatus.OK) + @Operation(summary = "get", description = "Provides an animal.") + public String get(Cat cat) { + return cat != null ? cat.getName() : ""; + } - @GetMapping("/test") - @ResponseStatus(HttpStatus.OK) - @Operation(summary = "get", description = "Provides a response.") - @ApiResponse(content = @Content(mediaType = MediaTypes.HAL_JSON_VALUE, - schema = @io.swagger.v3.oas.annotations.media.Schema(implementation = Response.class)), - responseCode = "200") - public Response get() { - return new Response("value"); - } + @GetMapping("/test") + @ResponseStatus(HttpStatus.OK) + @Operation(summary = "get", description = "Provides a response.") + @ApiResponse(content = @Content(mediaType = MediaTypes.HAL_JSON_VALUE, + schema = @io.swagger.v3.oas.annotations.media.Schema(implementation = Response.class)), + responseCode = "200") + public Response get() { + return new Response("value"); + } - // dummy - public static class Response extends RepresentationModel { - public Response(String v) {} - } + // dummy + public static class Response extends RepresentationModel { + public Response(String v) { + } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/CustomOpenApiWebMvcResource.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/CustomOpenApiWebMvcResource.java index f88930430..7fa44ef05 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/CustomOpenApiWebMvcResource.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/controllers/CustomOpenApiWebMvcResource.java @@ -15,13 +15,13 @@ @RestController public class CustomOpenApiWebMvcResource extends OpenApiWebMvcResource { - public CustomOpenApiWebMvcResource(ObjectFactory openAPIBuilderObjectFactory, - AbstractRequestService requestBuilder, - GenericResponseService responseBuilder, - OperationService operationParser, - SpringDocConfigProperties springDocConfigProperties, - SpringDocProviders springDocProviders, - SpringDocCustomizers springDocCustomizers) { - super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); - } + public CustomOpenApiWebMvcResource(ObjectFactory openAPIBuilderObjectFactory, + AbstractRequestService requestBuilder, + GenericResponseService responseBuilder, + OperationService operationParser, + SpringDocConfigProperties springDocConfigProperties, + SpringDocProviders springDocProviders, + SpringDocCustomizers springDocCustomizers) { + super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/model/Cat.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/model/Cat.java index 95595b01a..3f7c58fd6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/model/Cat.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app11/model/Cat.java @@ -6,19 +6,19 @@ @Schema(description = "Represents a Cat class.") public class Cat { - @JsonUnwrapped - @Schema(description = "The name.", nullable = true) - private String name; + @JsonUnwrapped + @Schema(description = "The name.", nullable = true) + private String name; - public Cat(String name) { - this.name = name; - } + public Cat(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java new file mode 100644 index 000000000..a4c125090 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java @@ -0,0 +1,39 @@ +/* + * + * * + * * * + * * * * + * * * * * + * * * * * * Copyright 2019-2025 the original author or authors. + * * * * * * + * * * * * * Licensed under the Apache License, Version 2.0 (the "License"); + * * * * * * you may not use this file except in compliance with the License. + * * * * * * You may obtain a copy of the License at + * * * * * * + * * * * * * https://www.apache.org/licenses/LICENSE-2.0 + * * * * * * + * * * * * * Unless required by applicable law or agreed to in writing, software + * * * * * * distributed under the License is distributed on an "AS IS" BASIS, + * * * * * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * * * * * See the License for the specific language governing permissions and + * * * * * * limitations under the License. + * * * * * + * * * * + * * * + * * + * + */ + +package test.org.springdoc.api.v31.app12; + +import test.org.springdoc.api.v31.AbstractSpringDocTest; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +public class SpringDocApp12Test extends AbstractSpringDocTest { + + @SpringBootApplication + static class SpringDocTestApp { + } + +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/configuration/WebMvcConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/configuration/WebMvcConfiguration.java new file mode 100644 index 000000000..4dc50c007 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/configuration/WebMvcConfiguration.java @@ -0,0 +1,25 @@ +package test.org.springdoc.api.v31.app12.configuration; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; + +@Configuration +public class WebMvcConfiguration { + + @Bean + MappingJackson2HttpMessageConverter getMappingJacksonHttpMessageConverter() { + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); + converter.setSupportedMediaTypes(List.of(MediaType.APPLICATION_JSON)); + converter.setObjectMapper(new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL) + ); + + return converter; + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/controllers/BasicController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/controllers/BasicController.java new file mode 100644 index 000000000..5610fdcb6 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/controllers/BasicController.java @@ -0,0 +1,43 @@ +package test.org.springdoc.api.v31.app12.controllers; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import test.org.springdoc.api.v31.app12.model.Cat; + +import org.springframework.hateoas.MediaTypes; +import org.springframework.hateoas.RepresentationModel; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(path = "/") +public class BasicController { + + @GetMapping("/cat") + @ResponseStatus(HttpStatus.OK) + @Operation(summary = "get", description = "Provides an animal.") + public String get(Cat cat) { + return cat != null ? cat.getName() : ""; + } + + @GetMapping("/test") + @ResponseStatus(HttpStatus.OK) + @Operation(summary = "get", description = "Provides a response.") + @ApiResponse(content = @Content(mediaType = MediaTypes.HAL_JSON_VALUE, + schema = @io.swagger.v3.oas.annotations.media.Schema(oneOf = { + Integer.class + })), + responseCode = "200") + public Object get() { + return 1; + } + + // dummy + public static class Response extends RepresentationModel { + public Response(String v) {} + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/controllers/CustomOpenApiWebMvcResource.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/controllers/CustomOpenApiWebMvcResource.java new file mode 100644 index 000000000..4aef520b5 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/controllers/CustomOpenApiWebMvcResource.java @@ -0,0 +1,27 @@ +package test.org.springdoc.api.v31.app12.controllers; + +import org.springdoc.core.customizers.SpringDocCustomizers; +import org.springdoc.core.properties.SpringDocConfigProperties; +import org.springdoc.core.providers.SpringDocProviders; +import org.springdoc.core.service.AbstractRequestService; +import org.springdoc.core.service.GenericResponseService; +import org.springdoc.core.service.OpenAPIService; +import org.springdoc.core.service.OperationService; +import org.springdoc.webmvc.api.OpenApiWebMvcResource; + +import org.springframework.beans.factory.ObjectFactory; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CustomOpenApiWebMvcResource extends OpenApiWebMvcResource { + + public CustomOpenApiWebMvcResource(ObjectFactory openAPIBuilderObjectFactory, + AbstractRequestService requestBuilder, + GenericResponseService responseBuilder, + OperationService operationParser, + SpringDocConfigProperties springDocConfigProperties, + SpringDocProviders springDocProviders, + SpringDocCustomizers springDocCustomizers) { + super(openAPIBuilderObjectFactory, requestBuilder, responseBuilder, operationParser, springDocConfigProperties, springDocProviders, springDocCustomizers); + } +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/model/Cat.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/model/Cat.java new file mode 100644 index 000000000..3420ba985 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app12/model/Cat.java @@ -0,0 +1,24 @@ +package test.org.springdoc.api.v31.app12.model; + +import com.fasterxml.jackson.annotation.JsonUnwrapped; +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "Represents a Cat class.") +public class Cat { + + @JsonUnwrapped + @Schema(description = "The name.", nullable = true) + private String name; + + public Cat(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java index 9f4d7f515..6372e31e8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/config/DatabaseConfig.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/config/DatabaseConfig.java index 8ef2464c6..234885545 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/config/DatabaseConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/config/DatabaseConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.config; @@ -29,7 +29,6 @@ import java.time.LocalDate; import jakarta.annotation.PostConstruct; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v31.app2.entities.Post; import test.org.springdoc.api.v31.app2.repositories.PostRepository; @@ -40,11 +39,14 @@ * 2020 */ @Configuration -@RequiredArgsConstructor public class DatabaseConfig { private final PostRepository postRepository; + public DatabaseConfig(PostRepository postRepository) { + this.postRepository = postRepository; + } + @PostConstruct private void postConstruct() { for (int i = 0; i < 33; i++) { diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/controller/PostController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/controller/PostController.java index 8a96491e4..21050ddda 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/controller/PostController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/controller/PostController.java @@ -21,12 +21,11 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.controller; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v31.app2.entities.Post; import test.org.springdoc.api.v31.app2.service.PostService; @@ -43,11 +42,14 @@ * 2020 */ @RestController -@RequiredArgsConstructor public class PostController { private final PostService postService; + public PostController(PostService postService) { + this.postService = postService; + } + @GetMapping public ResponseEntity>> getAll(Pageable pageable) { return new ResponseEntity<>(postService.getAll(pageable), HttpStatus.OK); diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/entities/Post.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/entities/Post.java index 6ac6f1328..4450b2669 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/entities/Post.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/entities/Post.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.entities; @@ -29,18 +29,12 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; /** * @author Davide Pedone * 2020 */ -@Data @Entity -@NoArgsConstructor -@AllArgsConstructor public class Post { @Id @@ -53,4 +47,46 @@ public class Post { private Long createdAt; + public Post(Long id, String author, String content, Long createdAt) { + this.id = id; + this.author = author; + this.content = content; + this.createdAt = createdAt; + } + + public Post() { + + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Long getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Long createdAt) { + this.createdAt = createdAt; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/hateoas/PostResourceAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/hateoas/PostResourceAssembler.java index 2f64e515f..1357f05d8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/hateoas/PostResourceAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/hateoas/PostResourceAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/repositories/PostRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/repositories/PostRepository.java index 93bb46767..d4042716a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/repositories/PostRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/repositories/PostRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.repositories; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/service/PostService.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/service/PostService.java index 55899bebe..7eb12119f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/service/PostService.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app2/service/PostService.java @@ -21,13 +21,12 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.service; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v31.app2.entities.Post; import test.org.springdoc.api.v31.app2.hateoas.PostResourceAssembler; import test.org.springdoc.api.v31.app2.repositories.PostRepository; @@ -43,7 +42,6 @@ * @author Davide Pedone * 2020 */ -@RequiredArgsConstructor @Service public class PostService { @@ -53,6 +51,12 @@ public class PostService { private final PostResourceAssembler postResourceAssembler; + public PostService(PostRepository postRepository, PagedResourcesAssembler pagedResourcesAssembler, PostResourceAssembler postResourceAssembler) { + this.postRepository = postRepository; + this.pagedResourcesAssembler = pagedResourcesAssembler; + this.postResourceAssembler = postResourceAssembler; + } + public PagedModel> getAll(Pageable pageable) { Page postPage = postRepository.findAll(pageable); return pagedResourcesAssembler.toModel(postPage, postResourceAssembler); diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/DatabaseLoader.java index 77e094e5f..69db5f07e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/Employee.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/Employee.java index 4d7df1a7e..d747cc210 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeController.java index 3bbc31e5d..fa48c92d4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeRepository.java index 0915f1e19..930f54eff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java index fdaddc056..ef415d72b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java index b69b2599c..aec234af7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/Album.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/Album.java index 8cc5876af..41586a24b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/Album.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/Album.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumController.java index e85fc6e73..2edca701f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumModelAssembler.java index a22e1aaea..54ddeec9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/AlbumModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java index c017a86a5..1bd62f708 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java index dc93acbf7..5cdfdcccb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/controller/CompanyController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/controller/CompanyController.java index ad955f062..6378f5fcd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/controller/CompanyController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/controller/CompanyController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5.controller; @@ -29,7 +29,6 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import test.org.springdoc.api.v31.app5.entities.CompanyDto; import org.springframework.web.bind.annotation.PostMapping; @@ -41,10 +40,8 @@ * 2020 */ @RestController -@RequiredArgsConstructor public class CompanyController { - @PostMapping @io.swagger.v3.oas.annotations.parameters.RequestBody( description = "Details of the Item to be created", diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/Company.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/Company.java index 74f2a0402..4eb0bf929 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/Company.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/Company.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5.entities; @@ -30,26 +30,53 @@ import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; +import org.springframework.hateoas.Link; import org.springframework.hateoas.RepresentationModel; import org.springframework.hateoas.server.core.Relation; /** * @author bnasslahsen */ -@AllArgsConstructor -@Data -@Builder -@EqualsAndHashCode(callSuper = false) @Relation(collectionRelation = "companies", itemRelation = "company") public class Company extends RepresentationModel { + @JsonProperty(access = JsonProperty.Access.READ_ONLY) private UUID id; @NotNull private String name; + + public Company(UUID id, String name) { + this.id = id; + this.name = name; + } + + public Company(Link initialLink, UUID id, String name) { + super(initialLink); + this.id = id; + this.name = name; + } + + public Company(Iterable initialLinks, UUID id, String name) { + super(initialLinks); + this.id = id; + this.name = name; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/CompanyDto.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/CompanyDto.java index 62fd1d84c..953e87881 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/CompanyDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/entities/CompanyDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5.entities; @@ -29,27 +29,86 @@ import java.util.UUID; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty.Access; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; +import org.springframework.hateoas.Link; import org.springframework.hateoas.RepresentationModel; import org.springframework.hateoas.server.core.Relation; /** * @author bnasslahsen */ -@AllArgsConstructor -@Data -@Builder -@EqualsAndHashCode(callSuper = false) @Relation(collectionRelation = "companies", itemRelation = "company") public class CompanyDto extends RepresentationModel { - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = Access.READ_ONLY) private UUID id; @NotNull private String name; + + public CompanyDto(UUID id, String name) { + this.id = id; + this.name = name; + } + + public CompanyDto(Link initialLink, UUID id, String name) { + super(initialLink); + this.id = id; + this.name = name; + } + + public CompanyDto(Iterable initialLinks, UUID id, String name) { + super(initialLinks); + this.id = id; + this.name = name; + } + + private CompanyDto(Builder builder) { + setId(builder.id); + setName(builder.name); + } + + public static Builder builder() { + return new Builder(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public static final class Builder { + private UUID id; + + private @NotNull String name; + + private Builder() { + } + + public Builder id(UUID val) { + id = val; + return this; + } + + public Builder name(@NotNull String val) { + name = val; + return this; + } + + public CompanyDto build() { + return new CompanyDto(this); + } + } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/hateoas/CompanyModelAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/hateoas/CompanyModelAssembler.java index ffb87b28b..af16fe457 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/hateoas/CompanyModelAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app5/hateoas/CompanyModelAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5.hateoas; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java index dc0f8a0f2..d1d3ed895 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; @@ -53,7 +53,7 @@ public class SpringDocApp6Test extends AbstractSpringDocTest { @BeforeEach void init() throws IllegalAccessException { - SimpleMixInResolver _mixIns = (SimpleMixInResolver) FieldUtils.readDeclaredField(objectMapperProvider.jsonMapper(),"_mixIns", true); + SimpleMixInResolver _mixIns = (SimpleMixInResolver) FieldUtils.readDeclaredField(objectMapperProvider.jsonMapper(), "_mixIns", true); Map> _localMixIns = (Map>) FieldUtils.readDeclaredField(_mixIns, "_localMixIns", true); Iterator>> iterator = _localMixIns.entrySet().iterator(); diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/controller/ItemController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/controller/ItemController.java index cbe732945..77c356e6a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/controller/ItemController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/controller/ItemController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6.controller; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/model/Item.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/model/Item.java index f78545b0f..9408b5954 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/model/Item.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app6/model/Item.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/FooConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/FooConfiguration.java index 31b684e72..935f619a5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/FooConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/FooConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java index 838a6bfc1..aa46eb201 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/Foo.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/Foo.java index fda9ae798..b072d1757 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/Foo.java @@ -21,16 +21,24 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7.application; -import lombok.AllArgsConstructor; -import lombok.Data; -@Data -@AllArgsConstructor public class Foo { String foo; + + public Foo(String foo) { + this.foo = foo; + } + + public String getFoo() { + return foo; + } + + public void setFoo(String foo) { + this.foo = foo; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooController.java index 49bb8c5d2..8cc658648 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7.application; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooResourceAssembler.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooResourceAssembler.java index 89ed69013..300bd5f5b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooResourceAssembler.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooResourceAssembler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7.application; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooService.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooService.java index 054b495e9..2133335c3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooService.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app7/application/FooService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7.application; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/DatabaseLoader.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/DatabaseLoader.java index fe79f0adb..2dab46e4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/DatabaseLoader.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/DatabaseLoader.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/Employee.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/Employee.java index 2f16d3d6d..883dbc839 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/Employee.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/Employee.java @@ -21,34 +21,15 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * Domain object representing a company employee. Project Lombok keeps actual code at a minimum. {@code @Data} - - * Generates getters, setters, toString, hash, and equals functions {@code @Entity} - JPA annotation to flag this class - * for DB persistence {@code @NoArgsConstructor} - Create a constructor with no args to support JPA - * {@code @AllArgsConstructor} - Create a constructor with all args to support testing - * {@code @JsonIgnoreProperties(ignoreUnknow=true)} When converting JSON to Java, ignore any unrecognized attributes. - * This is critical for REST because it encourages adding new fields in later versions that won't break. It also allows - * things like _links to be ignore as well, meaning HAL documents can be fetched and later posted to the server without - * adjustment. - * - * @author Greg Turnquist - */ -@Data + @Entity -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@AllArgsConstructor class Employee { @Id @@ -61,6 +42,13 @@ class Employee { private String role; + public Employee(Long id, String firstName, String lastName, String role) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.role = role; + } + /** * Useful constructor when id is not yet known. * @@ -74,4 +62,39 @@ class Employee { this.lastName = lastName; this.role = role; } + + public Employee() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeController.java index 6399f78f7..9d897f776 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeRepository.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeRepository.java index 686499af5..a57ad7f03 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/EmployeeRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java index f0f293ebe..6ea75aea5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/FooConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/FooConfiguration.java index 75bb7d166..2ffa7d1b1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/FooConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/FooConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; @@ -46,10 +46,10 @@ public class FooConfiguration { OpenAPI customOpenApi() { return new OpenAPI() .components(new Components().addSecuritySchemes("bearerScheme", - new SecurityScheme() - .type(SecurityScheme.Type.HTTP) - .scheme("bearer") - .bearerFormat("JWT")) + new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT")) .addSchemas("FeedResponse", feedResponseSchema())) .info(new Info() .title("Response API") @@ -69,7 +69,7 @@ OpenAPI customOpenApi() { private Schema feedResponseSchema() { Schema schema = new Schema<>(); schema.addProperty("_links", linkSchema()); - schema.addProperty("data", new ArraySchema().items(new Schema<>().$ref("#/components/schemas/ResponseData"))); + schema.addProperty("data", new ArraySchema().items(new Schema<>().$ref("#/components/schemas/ResponseData"))); return schema; } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java index c0bf9885b..400418a3f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/FooController.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/FooController.java index b8fe61384..f1343f498 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/FooController.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/FooController.java @@ -21,18 +21,17 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.application; +import java.time.LocalDate; import java.util.List; import java.util.UUID; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import test.org.springdoc.api.v31.app9.application.dto.FeedResponse; import test.org.springdoc.api.v31.app9.application.dto.ResponseData; @@ -43,21 +42,18 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; + @Tag(name = "ResponseDataController") @RestController @RequestMapping(value = "/some-route", produces = MediaType.APPLICATION_JSON_VALUE) -@RequiredArgsConstructor -@Slf4j public class FooController { - - @Operation(summary = "Get all data", description = "Get all data") @GetMapping(value = "foo/{id}") @ResponseStatus(HttpStatus.OK) public FeedResponse getFoo(@PathVariable("id") UUID id) { - var dataList = List.of(ResponseData.builder().dataId(id).build()); + var dataList = List.of(new ResponseData(id, LocalDate.now())); return FeedResponse.createForResponseData(dataList, UUID.randomUUID()); } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/FeedResponse.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/FeedResponse.java index dafa1dfa8..2647e6275 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/FeedResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/FeedResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.application.dto; @@ -31,11 +31,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.experimental.Accessors; import test.org.springdoc.api.v31.app9.application.FooController; import org.springframework.hateoas.IanaLinkRelations; @@ -44,15 +39,16 @@ import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn; -@Getter -@Accessors(fluent = true) -@Builder(access = AccessLevel.PACKAGE) -@EqualsAndHashCode(callSuper = true) public class FeedResponse extends RepresentationModel { + @NotNull @JsonProperty("data") private final List data; + public FeedResponse(List data) { + this.data = data; + } + public static FeedResponse createForResponseData(@NotNull List responseData, UUID uuid) { var feedResponse = new FeedResponse(responseData); feedResponse.add(linkTo(methodOn(FooController.class).getFoo(uuid)).withSelfRel()); @@ -62,4 +58,8 @@ public static FeedResponse createForResponseData(@NotNull List res return feedResponse; } + + public List getData() { + return data; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/ResponseData.java b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/ResponseData.java index 2210e7c64..302125dd3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/ResponseData.java +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v31/app9/application/dto/ResponseData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9.application.dto; @@ -32,15 +32,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import lombok.Builder; -@Builder public record ResponseData( - @JsonProperty(value = "DATA_ID", required = true) - @NotNull - UUID dataId, - @JsonProperty(value = "DATE", required = true) - @NotNull - @Schema(example = "2024-03-27", format = "date") - LocalDate date + @JsonProperty(value = "DATA_ID", required = true) + @NotNull + UUID dataId, + @JsonProperty(value = "DATE", required = true) + @NotNull + @Schema(example = "2024-03-27", format = "date") + LocalDate date ) {} diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-direct.json b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-direct.json index e755bde7a..d234570e6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-direct.json +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-direct.json @@ -91,6 +91,26 @@ } } }, + "/page-simple-response": { + "get": { + "tags": [ + "hello-controller" + ], + "operationId": "pageSimpleResponse", + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/PageUserDto" + } + } + } + } + } + } + }, "/page-raw": { "get": { "tags": [ @@ -294,6 +314,63 @@ } } }, + "PageUserDto": { + "type": "object", + "properties": { + "totalPages": { + "type": "integer", + "format": "int32" + }, + "totalElements": { + "type": "integer", + "format": "int64" + }, + "size": { + "type": "integer", + "format": "int32" + }, + "content": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserDto" + } + }, + "number": { + "type": "integer", + "format": "int32" + }, + "sort": { + "$ref": "#/components/schemas/SortObject" + }, + "pageable": { + "$ref": "#/components/schemas/PageableObject" + }, + "first": { + "type": "boolean" + }, + "last": { + "type": "boolean" + }, + "numberOfElements": { + "type": "integer", + "format": "int32" + }, + "empty": { + "type": "boolean" + } + } + }, + "UserDto": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "email": { + "type": "string" + } + } + }, "Page": { "type": "object", "properties": { diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-via_dto.json b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-via_dto.json index 44350a658..6b4da9192 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-via_dto.json +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-via_dto.json @@ -91,6 +91,26 @@ } } }, + "/page-simple-response": { + "get": { + "tags": [ + "hello-controller" + ], + "operationId": "pageSimpleResponse", + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/PagedModelUserDto" + } + } + } + } + } + } + }, "/page-raw": { "get": { "tags": [ @@ -207,6 +227,31 @@ "$ref": "#/components/schemas/PageMetadata" } } + }, + "PagedModelUserDto": { + "type": "object", + "properties": { + "content": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserDto" + } + }, + "page": { + "$ref": "#/components/schemas/PageMetadata" + } + } + }, + "UserDto": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "email": { + "type": "string" + } + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-direct.json b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-direct.json index a6b7e6b7c..1c93f179f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-direct.json +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-direct.json @@ -174,9 +174,7 @@ "properties": { "content": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "page": { "$ref": "#/components/schemas/PageMetadata" @@ -286,10 +284,10 @@ "empty": { "type": "boolean" }, - "unsorted": { + "sorted": { "type": "boolean" }, - "sorted": { + "unsorted": { "type": "boolean" } } @@ -311,9 +309,7 @@ }, "content": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "number": { "type": "integer", diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-via_dto.json b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-via_dto.json index 3434e8fe1..f7853b31f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-via_dto.json +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app10-via_dto.json @@ -174,9 +174,7 @@ "properties": { "content": { "type": "array", - "items": { - "type": "object" - } + "items": {} }, "page": { "$ref": "#/components/schemas/PageMetadata" diff --git a/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app12.json b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app12.json new file mode 100644 index 000000000..99b4b00c9 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.1.0/app12.json @@ -0,0 +1,88 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/test": { + "get": { + "tags": [ + "basic-controller" + ], + "summary": "get", + "description": "Provides a response.", + "operationId": "get", + "responses": { + "200": { + "description": "OK", + "content": { + "application/hal+json": { + "schema": { + "oneOf": [ + { + "type": "integer", + "format": "int32" + } + ] + } + } + } + } + } + } + }, + "/cat": { + "get": { + "tags": [ + "basic-controller" + ], + "summary": "get", + "description": "Provides an animal.", + "operationId": "get_1", + "parameters": [ + { + "name": "cat", + "in": "query", + "required": true, + "schema": { + "$ref": "#/components/schemas/Cat" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "Cat": { + "type": "object", + "description": "Represents a Cat class.", + "properties": { + "name": { + "type": "string", + "description": "The name." + } + } + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/pom.xml index 127082932..65657b696 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/pom.xml @@ -2,26 +2,26 @@ org.springdoc springdoc-openapi-tests - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-javadoc-tests + ${project.artifactId} - - - com.github.therapi - therapi-runtime-javadoc-scribe - ${therapi-runtime-javadoc.version} - test - org.springdoc springdoc-openapi-starter-webmvc-api ${project.version} test + + + com.github.therapi + therapi-runtime-javadoc-scribe + test + jakarta.servlet jakarta.servlet-api @@ -32,11 +32,6 @@ money-api test - - org.hibernate.validator - hibernate-validator - test - - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index 4c3990c94..292bde79a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -54,7 +54,7 @@ @ActiveProfiles("test") @SpringBootTest @AutoConfigureMockMvc -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractSpringDocTest { /** diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiException.java index 0145e3e9d..e0f6122d5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -47,7 +47,7 @@ public final class ApiException extends Exception { * Instantiates a new Api exception. * * @param code the code - * @param msg the msg + * @param msg the msg */ public ApiException(int code, String msg) { super(msg); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiOriginFilter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiOriginFilter.java index cd5a1f1f2..83ee09a00 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiOriginFilter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiOriginFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -42,10 +42,10 @@ class ApiOriginFilter implements jakarta.servlet.Filter { /** * Do filter. * - * @param request the request + * @param request the request * @param response the response - * @param chain the chain - * @throws IOException the io exception + * @param chain the chain + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiResponseMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiResponseMessage.java index e1d3d09e6..daca99fb7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiResponseMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ApiResponseMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -83,7 +83,7 @@ public ApiResponseMessage() { /** * Instantiates a new Api response message. * - * @param code the code + * @param code the code * @param message the message */ public ApiResponseMessage(int code, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ErrorMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ErrorMessage.java index 98c03b30b..dd1f81b9c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ErrorMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ErrorMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -44,7 +44,7 @@ class ErrorMessage { /** * Instantiates a new Error message. * - * @param id the id + * @param id the id * @param message2 the message 2 */ public ErrorMessage(String id, String message2) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ExceptionTranslator.java index 0da4240d2..b306a599a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -65,7 +65,7 @@ public ResponseEntity handleRunTimeException(RuntimeException e) { * Error response entity. * * @param status the status - * @param e the e + * @param e the e * @return the response entity */ private ResponseEntity error(HttpStatus status, Exception e) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java index 68475fe16..afff8d469 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -44,7 +44,7 @@ class HelloController { /** * Index string. * - * @param numTel the num tel + * @param numTel the num tel * @param adresse the adresse * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HomeController.java index 9b6bbeb6d..887cd307a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApi.java index 5a4c4938e..003280477 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -74,8 +74,8 @@ ResponseEntity addInventory( * Search inventory response entity. * * @param searchString the search string - * @param skip the skip - * @param limit the limit + * @param skip the skip + * @param limit the limit * @return the response entity */ @Operation(description = "searches inventory", operationId = "searchInventory", summary = "By passing in the appropriate options, you can search for available inventory in the system ", tags = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApiController.java index b9972fb9f..953c32ce1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -64,7 +64,7 @@ class InventoryApiController implements InventoryApi { * Instantiates a new Inventory api controller. * * @param objectMapper the object mapper - * @param request the request + * @param request the request */ @org.springframework.beans.factory.annotation.Autowired public InventoryApiController(ObjectMapper objectMapper, HttpServletRequest request) { @@ -89,8 +89,8 @@ public ResponseEntity addInventory( * Search inventory response entity. * * @param searchString the search string - * @param skip the skip - * @param limit the limit + * @param skip the skip + * @param limit the limit * @return the response entity */ public ResponseEntity> searchInventory( diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryItem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryItem.java index e6b02165b..3ce97982a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryItem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/InventoryItem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -249,6 +249,7 @@ public String toString() { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemController.java index ecc120f11..d695172d2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -60,9 +60,9 @@ class ItemController { * Show items list. * * @param customerID the customer id - * @param toto the toto - * @param startDate the start date - * @param filterIds the filter ids + * @param toto the toto + * @param startDate the start date + * @param filterIds the filter ids * @return the list */ @GetMapping("/items") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemDTO.java index 8e427e0b4..cc3516767 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -30,6 +30,7 @@ /** * The type Item dto. + * * @author bnasslahsen */ class ItemDTO implements Serializable { @@ -70,7 +71,7 @@ public ItemDTO() { * Instantiates a new Item dto. * * @param description description - * @param price price + * @param price price */ public ItemDTO(final String description, final int price) { this.description = description; @@ -80,9 +81,9 @@ public ItemDTO(final String description, final int price) { /** * Instantiates a new Item dto. * - * @param itemID itemID + * @param itemID itemID * @param description description - * @param price price + * @param price price */ public ItemDTO(final String itemID, final String description, final int price) { this.itemID = itemID; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemLightDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemLightDTO.java index 7f557efb6..c6f5ee4cf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemLightDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/ItemLightDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -30,6 +30,7 @@ /** * The type Item light dto. + * * @author bnasslahsen */ class ItemLightDTO implements Serializable { @@ -65,7 +66,7 @@ public ItemLightDTO() { * Instantiates a new Item light dto. * * @param description the description - * @param price the price + * @param price the price */ public ItemLightDTO(String description, int price) { super(); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/Manufacturer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/Manufacturer.java index db8eb7732..897b2e84a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/Manufacturer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/Manufacturer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -203,6 +203,7 @@ public String toString() { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PeopleRestService.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PeopleRestService.java index 742e97f54..c5bd1264b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PeopleRestService.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PeopleRestService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -100,9 +100,9 @@ public PersonDTO findPerson( /** * Add person response entity. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name * @return the response entity */ @PostMapping(value = "/{email}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PersonDTO.java index de48411cb..52ee895a8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java index 80d44a073..bbc7de067 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java index 8655b18b9..86c0759f0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -45,11 +45,11 @@ class HelloController { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, @@ -59,8 +59,8 @@ public void test(HttpSession header, HttpServletRequest request, HttpServletResp /** * Test request attribute. * - * @param sample the sample - * @param s the s + * @param sample the sample + * @param s the s */ @GetMapping("/testreq") public void testRequestAttribute(@RequestAttribute String sample, String s) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java index 90606fa9c..db5826e35 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/HelloController.java index 0c938edd0..75834f207 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app100; @@ -43,7 +43,7 @@ class HelloController { /** * Gets all pets. * - * @param toto the toto + * @param toto the toto * @return the all pets */ @GetMapping(value = "/search", produces = { "application/xml", "application/json" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/PersonDTO.java index 3b7f6a394..402844dd1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app100; @@ -57,9 +57,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/SpringDocApp100Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/SpringDocApp100Test.java index 761338601..4f679e59e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/SpringDocApp100Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app100/SpringDocApp100Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app100; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloController.java index 12f76bfd5..4c5abe096 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app101; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloDTO.java index d6732e42d..995712e92 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/HelloDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app101; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/SpringDocApp101Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/SpringDocApp101Test.java index 41d339064..d96197825 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/SpringDocApp101Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app101/SpringDocApp101Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app101; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java index a12a5f23d..2dd25c4b6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/InheritedRequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java index 90563e969..00294cd4a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/RequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java index ea42b187b..a47738284 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/SpringDocApp102Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/TestController.java index e987fb7aa..8caabb275 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app102/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app102; @@ -41,7 +41,7 @@ class TestController { /** * Gets test. * - * @param param the param + * @param param the param * @param requestParams the request params */ @GetMapping("test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/ExampleBody.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/ExampleBody.java index 8cbc2e1ac..8f8e736ea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/ExampleBody.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/ExampleBody.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app103; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/HelloController.java index c94308c19..e35c98b25 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app103; @@ -47,8 +47,8 @@ class HelloController { /** * Post my request body string. * - * @param body the body - * @param file the file + * @param body the body + * @param file the file * @return the string */ @PostMapping(value = "/test/103", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/SpringDocApp103Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/SpringDocApp103Test.java index b607f58b0..4a4b76c13 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/SpringDocApp103Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app103/SpringDocApp103Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app103; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/CrudController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/CrudController.java index ff8a6a701..f76c46c46 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/CrudController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/CrudController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app104; @@ -39,7 +39,7 @@ /** * The type Crud controller. * - * @param the type parameter + * @param the type parameter */ @Controller @SuppressWarnings("rawtypes") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/Design.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/Design.java index c6b846d0f..219c209a7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/Design.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/Design.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/DesignController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/DesignController.java index b540e8753..82190f3b3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/DesignController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/DesignController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/HavingPK.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/HavingPK.java index c2869a01d..f4caeb05c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/HavingPK.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/HavingPK.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/SpringDocApp104Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/SpringDocApp104Test.java index f24f696c2..ea0403f58 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/SpringDocApp104Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app104/SpringDocApp104Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/SpringDocApp105Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/SpringDocApp105Test.java index 4b90155b9..faff3ef66 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/SpringDocApp105Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/SpringDocApp105Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ApiUtil.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ApiUtil.java index 0f4d89b78..13fa9bc9c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ApiUtil.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ApiUtil.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api; @@ -42,9 +42,9 @@ public class ApiUtil { /** * Sets example response. * - * @param req the req - * @param contentType the content type - * @param example the example + * @param req the req + * @param contentType the content type + * @param example the example */ public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { try { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ExceptionTranslator.java index 99d109db6..4ad34f1a5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api; @@ -62,7 +62,7 @@ public ExceptionTranslator(ErrorAttributes errorAttributes) { /** * Process constraint violation exception map. * - * @param request the request + * @param request the request * @return the map */ @ExceptionHandler(ConstraintViolationException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/HomeController.java index f1f293b9f..c41711e1f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApi.java index 58dbc0872..3536dea78 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -100,8 +100,8 @@ default void addPet( /** * Delete pet response entity. * - * @param petId the pet id - * @param apiKey the api key + * @param petId the pet id + * @param apiKey the api key * @return the response entity */ @Operation(summary = "Deletes a pet", description = "", security = { @@ -118,7 +118,7 @@ default ResponseEntity deletePet( /** * Find pets by status response entity. * - * @param status the status + * @param status the status * @return the response entity */ @Operation(summary = "Finds Pets by status", description = "Multiple status values can be provided with comma separated strings", security = { @@ -135,7 +135,7 @@ default ResponseEntity> findPetsByStatus( /** * Find pets by tags response entity. * - * @param tags the tags + * @param tags the tags * @return the response entity */ @Operation(summary = "Finds Pets by tags", description = "Muliple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", security = { @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByTags( /** * Gets pet by id. * - * @param petId the pet id + * @param petId the pet id * @return the pet by id */ @Operation(summary = "Find pet by ID", description = "Returns a single pet", security = { @@ -170,7 +170,7 @@ default ResponseEntity getPetById( /** * Update pet response entity. * - * @param pet the pet + * @param pet the pet * @return the response entity */ @Operation(summary = "Update an existing pet", description = "", security = { @@ -187,9 +187,9 @@ default ResponseEntity updatePet( /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name - * @param status the status + * @param petId the pet id + * @param name the name + * @param status the status * @return the response entity */ @Operation(summary = "Updates a pet in the store with form data", description = "", security = { @@ -206,9 +206,9 @@ default ResponseEntity updatePetWithForm( /** * Upload file response entity. * - * @param petId the pet id - * @param additionalMetadata the additional metadata - * @param file the file + * @param petId the pet id + * @param additionalMetadata the additional metadata + * @param file the file * @return the response entity */ @Operation(summary = "uploads an image", description = "", security = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiController.java index f20e6d307..dad7e3593 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegate.java index 8c4c79157..316ef9d04 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.pet; @@ -70,8 +70,8 @@ default void addPet(Pet pet) { /** * Delete pet response entity. * - * @param petId the pet id - * @param apiKey the api key + * @param petId the pet id + * @param apiKey the api key * @return the response entity * @see PetApi#deletePet PetApi#deletePet */ @@ -84,7 +84,7 @@ default ResponseEntity deletePet(Long petId, /** * Find pets by status response entity. * - * @param status the status + * @param status the status * @return the response entity * @see PetApi#findPetsByStatus PetApi#findPetsByStatus */ @@ -115,7 +115,7 @@ default void extract() { /** * Find pets by tags response entity. * - * @param tags the tags + * @param tags the tags * @return the response entity * @see PetApi#findPetsByTags PetApi#findPetsByTags */ @@ -128,7 +128,7 @@ default ResponseEntity> findPetsByTags(List tags) { /** * Gets pet by id. * - * @param petId the pet id + * @param petId the pet id * @return the pet by id * @see PetApi#getPetById PetApi#getPetById */ @@ -141,7 +141,7 @@ default ResponseEntity getPetById(Long petId) { /** * Update pet response entity. * - * @param pet the pet + * @param pet the pet * @return the response entity * @see PetApi#updatePet PetApi#updatePet */ @@ -153,9 +153,9 @@ default ResponseEntity updatePet(Pet pet) { /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name - * @param status the status + * @param petId the pet id + * @param name the name + * @param status the status * @return the response entity * @see PetApi#updatePetWithForm PetApi#updatePetWithForm */ @@ -169,9 +169,9 @@ default ResponseEntity updatePetWithForm(Long petId, /** * Upload file response entity. * - * @param petId the pet id - * @param additionalMetadata the additional metadata - * @param file the file + * @param petId the pet id + * @param additionalMetadata the additional metadata + * @param file the file * @return the response entity * @see PetApi#uploadFile PetApi#uploadFile */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegateImpl.java index 88c50c130..02edfc163 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/pet/PetApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApi.java index 9f80a2b02..00506475d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -76,7 +76,7 @@ default StoreApiDelegate getDelegate() { /** * Delete order response entity. * - * @param orderId the order id + * @param orderId the order id * @return the response entity */ @Operation(summary = "Delete purchase order by ID", tags = { "store" }) @@ -105,7 +105,7 @@ default ResponseEntity> getInventory() { /** * Gets order by id. * - * @param orderId the order id + * @param orderId the order id * @return the order by id */ @Operation(summary = "Find purchase order by ID", tags = { "store" }) @@ -122,7 +122,7 @@ default ResponseEntity getOrderById( /** * Place order response entity. * - * @param order the order + * @param order the order * @return the response entity */ @Operation(summary = "Place an order for a pet", tags = { "store" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiController.java index 86454ab89..0f139b60e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegate.java index 99e159a0d..6a0c0b656 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.store; @@ -57,7 +57,7 @@ default Optional getRequest() { /** * Delete order response entity. * - * @param orderId the order id + * @param orderId the order id * @return the response entity * @see StoreApi#deleteOrder StoreApi#deleteOrder */ @@ -80,7 +80,7 @@ default ResponseEntity> getInventory() { /** * Gets order by id. * - * @param orderId the order id + * @param orderId the order id * @return the order by id * @see StoreApi#getOrderById StoreApi#getOrderById */ @@ -111,7 +111,7 @@ default void extract() { /** * Place order response entity. * - * @param order the order + * @param order the order * @return the response entity * @see StoreApi#placeOrder StoreApi#placeOrder */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegateImpl.java index c100604bd..3c129f7b1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/store/StoreApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApi.java index 5c3223f05..fc75c0a09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -74,7 +74,7 @@ default UserApiDelegate getDelegate() { /** * Create user response entity. * - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Create user", tags = { "user" }) @@ -88,7 +88,7 @@ default ResponseEntity createUser( /** * Create users with array input response entity. * - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Creates list of users with given input array", tags = { "user" }) @@ -103,7 +103,7 @@ default ResponseEntity createUsersWithArrayInput( /** * Create users with list input response entity. * - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Creates list of users with given input array", tags = { "user" }) @@ -117,7 +117,7 @@ default ResponseEntity createUsersWithListInput( /** * Delete user response entity. * - * @param username the username + * @param username the username * @return the response entity */ @Operation(summary = "Creates list of users with given input array", tags = { "user" }) @@ -132,7 +132,7 @@ default ResponseEntity deleteUser( /** * Gets user by name. * - * @param username the username + * @param username the username * @return the user by name */ @Operation(summary = "Get user by user name", tags = { "user" }) @@ -150,8 +150,8 @@ default ResponseEntity getUserByName( /** * Login user response entity. * - * @param username the username - * @param password the password + * @param username the username + * @param password the password * @return the response entity */ @Operation(summary = "Logs user into the system", tags = { "user" }) @@ -180,8 +180,8 @@ default ResponseEntity logoutUser() { /** * Update user response entity. * - * @param username the username - * @param user the user + * @param username the username + * @param user the user * @return the response entity */ @Operation(summary = "Updated user", tags = { "user" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiController.java index c36144b9d..4877de1bb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegate.java index 6b27efa02..4d2689d3b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.user; @@ -57,7 +57,7 @@ default Optional getRequest() { /** * Create user response entity. * - * @param user the user + * @param user the user * @return the response entity * @see UserApi#createUser UserApi#createUser */ @@ -69,7 +69,7 @@ default ResponseEntity createUser(User user) { /** * Create users with array input response entity. * - * @param user the user + * @param user the user * @return the response entity * @see UserApi#createUsersWithArrayInput UserApi#createUsersWithArrayInput */ @@ -81,7 +81,7 @@ default ResponseEntity createUsersWithArrayInput(List user) { /** * Create users with list input response entity. * - * @param user the user + * @param user the user * @return the response entity * @see UserApi#createUsersWithListInput UserApi#createUsersWithListInput */ @@ -93,7 +93,7 @@ default ResponseEntity createUsersWithListInput(List user) { /** * Delete user response entity. * - * @param username the username + * @param username the username * @return the response entity * @see UserApi#deleteUser UserApi#deleteUser */ @@ -105,7 +105,7 @@ default ResponseEntity deleteUser(String username) { /** * Gets user by name. * - * @param username the username + * @param username the username * @return the user by name * @see UserApi#getUserByName UserApi#getUserByName */ @@ -129,8 +129,8 @@ default ResponseEntity getUserByName(String username) { /** * Login user response entity. * - * @param username the username - * @param password the password + * @param username the username + * @param password the password * @return the response entity * @see UserApi#loginUser UserApi#loginUser */ @@ -154,8 +154,8 @@ default ResponseEntity logoutUser() { /** * Update user response entity. * - * @param username the username - * @param user the user + * @param username the username + * @param user the user * @return the response entity * @see UserApi#updateUser UserApi#updateUser */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegateImpl.java index 3490a2665..18116fd9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/api/user/UserApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Category.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Category.java index 81e44e96d..35bbdd446 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Category.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Category.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.model; @@ -49,7 +49,8 @@ class Category { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -81,7 +82,7 @@ public void setId(Long id) { /** * Id category. * - * @param id the id + * @param id the id * @return the category */ public Category id(Long id) { @@ -111,7 +112,7 @@ public void setName(String name) { /** * Name category. * - * @param name the name + * @param name the name * @return the category */ public Category name(String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/ModelApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/ModelApiResponse.java index 931c735c7..48b50fd75 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/ModelApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/ModelApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.model; @@ -55,7 +55,8 @@ public class ModelApiResponse { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -87,7 +88,7 @@ public void setCode(Integer code) { /** * Code model api response. * - * @param code the code + * @param code the code * @return the model api response */ public ModelApiResponse code(Integer code) { @@ -117,7 +118,7 @@ public void setType(String type) { /** * Type model api response. * - * @param type the type + * @param type the type * @return the model api response */ public ModelApiResponse type(String type) { @@ -147,7 +148,7 @@ public void setMessage(String message) { /** * Message model api response. * - * @param message the message + * @param message the message * @return the model api response */ public ModelApiResponse message(String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Order.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Order.java index f0d175f07..5386d3dc3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Order.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Order.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.model; @@ -80,7 +80,8 @@ public class Order { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -112,7 +113,7 @@ public void setId(Long id) { /** * Id order. * - * @param id the id + * @param id the id * @return the order */ public Order id(Long id) { @@ -142,7 +143,7 @@ public void setPetId(Long petId) { /** * Pet id order. * - * @param petId the pet id + * @param petId the pet id * @return the order */ public Order petId(Long petId) { @@ -172,7 +173,7 @@ public void setQuantity(Integer quantity) { /** * Quantity order. * - * @param quantity the quantity + * @param quantity the quantity * @return the order */ public Order quantity(Integer quantity) { @@ -202,7 +203,7 @@ public void setShipDate(Date shipDate) { /** * Ship date order. * - * @param shipDate the ship date + * @param shipDate the ship date * @return the order */ public Order shipDate(Date shipDate) { @@ -235,7 +236,7 @@ public void setStatus(StatusEnum status) { /** * Status order. * - * @param status the status + * @param status the status * @return the order */ public Order status(StatusEnum status) { @@ -265,7 +266,7 @@ public void setComplete(Boolean complete) { /** * Complete order. * - * @param complete the complete + * @param complete the complete * @return the order */ public Order complete(Boolean complete) { @@ -299,15 +300,15 @@ public String toString() { */ public enum StatusEnum { /** - *Placed status enum. + * Placed status enum. */ PLACED("placed"), /** - *Approved status enum. + * Approved status enum. */ APPROVED("approved"), /** - *Delivered status enum. + * Delivered status enum. */ DELIVERED("delivered"); @@ -328,7 +329,7 @@ public enum StatusEnum { /** * From value status enum. * - * @param text the text + * @param text the text * @return the status enum */ @JsonCreator diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Pet.java index 80cb02aef..418891307 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.model; @@ -82,7 +82,8 @@ public class Pet { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -114,7 +115,7 @@ public void setId(Long id) { /** * Id pet. * - * @param id the id + * @param id the id * @return the pet */ public Pet id(Long id) { @@ -144,7 +145,7 @@ public void setCategory(Category category) { /** * Category pet. * - * @param category the category + * @param category the category * @return the pet */ public Pet category(Category category) { @@ -175,7 +176,7 @@ public void setName(String name) { /** * Name pet. * - * @param name the name + * @param name the name * @return the pet */ public Pet name(String name) { @@ -206,7 +207,7 @@ public void setPhotoUrls(List photoUrls) { /** * Photo urls pet. * - * @param photoUrls the photo urls + * @param photoUrls the photo urls * @return the pet */ public Pet photoUrls(List photoUrls) { @@ -217,7 +218,7 @@ public Pet photoUrls(List photoUrls) { /** * Add photo urls item pet. * - * @param photoUrlsItem the photo urls item + * @param photoUrlsItem the photo urls item * @return the pet */ public Pet addPhotoUrlsItem(String photoUrlsItem) { @@ -247,7 +248,7 @@ public void setTags(List tags) { /** * Tags pet. * - * @param tags the tags + * @param tags the tags * @return the pet */ public Pet tags(List tags) { @@ -258,7 +259,7 @@ public Pet tags(List tags) { /** * Add tags item pet. * - * @param tagsItem the tags item + * @param tagsItem the tags item * @return the pet */ public Pet addTagsItem(Tag tagsItem) { @@ -294,7 +295,7 @@ public void setStatus(StatusEnum status) { /** * Status pet. * - * @param status the status + * @param status the status * @return the pet */ public Pet status(StatusEnum status) { @@ -327,15 +328,15 @@ public String toString() { */ public enum StatusEnum { /** - *Available status enum. + * Available status enum. */ AVAILABLE("available"), /** - *Pending status enum. + * Pending status enum. */ PENDING("pending"), /** - *Sold status enum. + * Sold status enum. */ SOLD("sold"); @@ -356,7 +357,7 @@ public enum StatusEnum { /** * From value status enum. * - * @param text the text + * @param text the text * @return the status enum */ @JsonCreator diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Tag.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Tag.java index 9c7ba4a06..56fcc5635 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Tag.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/Tag.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.model; @@ -49,7 +49,8 @@ class Tag { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -81,7 +82,7 @@ public void setId(Long id) { /** * Id tag. * - * @param id the id + * @param id the id * @return the tag */ public Tag id(Long id) { @@ -111,7 +112,7 @@ public void setName(String name) { /** * Name tag. * - * @param name the name + * @param name the name * @return the tag */ public Tag name(String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/User.java index 3e09cc23c..82585ff0b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app105/model/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app105.model; @@ -88,7 +88,8 @@ public class User { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -120,7 +121,7 @@ public void setId(Long id) { /** * Id user. * - * @param id the id + * @param id the id * @return the user */ public User id(Long id) { @@ -150,7 +151,7 @@ public void setUsername(String username) { /** * Username user. * - * @param username the username + * @param username the username * @return the user */ public User username(String username) { @@ -180,7 +181,7 @@ public void setFirstName(String firstName) { /** * First name user. * - * @param firstName the first name + * @param firstName the first name * @return the user */ public User firstName(String firstName) { @@ -210,7 +211,7 @@ public void setLastName(String lastName) { /** * Last name user. * - * @param lastName the last name + * @param lastName the last name * @return the user */ public User lastName(String lastName) { @@ -240,7 +241,7 @@ public void setEmail(String email) { /** * Email user. * - * @param email the email + * @param email the email * @return the user */ public User email(String email) { @@ -270,7 +271,7 @@ public void setPassword(String password) { /** * Password user. * - * @param password the password + * @param password the password * @return the user */ public User password(String password) { @@ -300,7 +301,7 @@ public void setPhone(String phone) { /** * Phone user. * - * @param phone the phone + * @param phone the phone * @return the user */ public User phone(String phone) { @@ -330,7 +331,7 @@ public void setUserStatus(Integer userStatus) { /** * User status user. * - * @param userStatus the user status + * @param userStatus the user status * @return the user */ public User userStatus(Integer userStatus) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/HelloController.java index 4ec9507e7..fc5c2e127 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app106; @@ -48,7 +48,7 @@ class HelloController { /** * Find articles response entity. * - * @param modifiedSince the modified since + * @param modifiedSince the modified since * @return the response entity */ @Operation(summary = "find-articles") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/SpringDocApp106Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/SpringDocApp106Test.java index 1378b6d31..c6abc9587 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/SpringDocApp106Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app106/SpringDocApp106Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app106; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/HelloController.java index 6bc235c9c..5697056b0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app107; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/SpringDocApp107Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/SpringDocApp107Test.java index a3d4aa53d..1055ed744 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/SpringDocApp107Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app107/SpringDocApp107Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app107; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/ActionResult.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/ActionResult.java index 621700d17..36681af80 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/ActionResult.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/ActionResult.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app108; @@ -29,7 +29,7 @@ /** * The type Action result. * - * @param the type parameter + * @param the type parameter */ class ActionResult { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/HelloController.java index d92664602..78d52217b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app108; @@ -38,7 +38,7 @@ class HelloController { /** * Update action result. * - * @param toto the toto + * @param toto the toto * @return the action result */ @PostMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/SpringDocApp108Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/SpringDocApp108Test.java index 8ae0b068e..ea888c62f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/SpringDocApp108Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app108/SpringDocApp108Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app108; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/HelloController.java index 032efdb4c..5c3ca3576 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app109; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/SpringDocApp109Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/SpringDocApp109Test.java index c43cc5f83..ce5a8f05c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/SpringDocApp109Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app109/SpringDocApp109Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app109; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java index 8099afd0b..b04ebf162 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; @@ -48,7 +48,7 @@ class HelloController { /** * Upload documents response entity. * - * @param multipartFiles the multipart files + * @param multipartFiles the multipart files * @return the response entity */ @PostMapping(path = "/documents", consumes = "multipart/form-data") @@ -59,7 +59,7 @@ public ResponseEntity uploadDocuments(@RequestPart("doc") List problem(final Throwable e) { /** * Handle method argument not valid response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(MethodArgumentNotValidException.class) @@ -110,7 +110,7 @@ public ResponseEntity handleMethodArgumentNotValid(MethodArgumentN /** * Handle constraint violated exception response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(ConstraintViolationException.class) @@ -135,7 +135,7 @@ public ResponseEntity handleConstraintViolatedException(Constraint /** * Handle missing servlet request parameter exception response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(MissingServletRequestParameterException.class) @@ -154,7 +154,7 @@ public ResponseEntity handleMissingServletRequestParameterExceptio /** * Handle http media type not supported response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(HttpMediaTypeNotSupportedException.class) @@ -170,7 +170,7 @@ public ResponseEntity handleHttpMediaTypeNotSupported(HttpMediaTyp /** * Handle http message not readable response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(HttpMessageNotReadableException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Person.java index c28859044..b0526e538 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app110; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController.java index 61255bb4a..00e7ad494 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app110; @@ -57,7 +57,7 @@ class PersonController { /** * Person person. * - * @param person the person + * @param person the person * @return the person */ @RequestMapping(path = "/person", method = RequestMethod.POST) @@ -73,7 +73,7 @@ public Person person(@Valid @RequestBody Person person) throws HttpMediaTypeNotS /** * Find by last name list. * - * @param lastName the last name + * @param lastName the last name * @return the list */ @RequestMapping(path = "/personByLastName", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController2.java index 5f5f465d6..cf10250ec 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/PersonController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app110; @@ -56,7 +56,7 @@ class PersonController2 { /** * Person person. * - * @param person the person + * @param person the person * @return the person */ @RequestMapping(path = "/person2", method = RequestMethod.POST) @@ -72,7 +72,7 @@ public Person person(@Valid @RequestBody Person person) { /** * Find by last name list. * - * @param lastName the last name + * @param lastName the last name * @return the list */ @RequestMapping(path = "/personByLastName2", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Problem.java index 249b9761a..7c54ca392 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app110; @@ -44,7 +44,7 @@ class Problem { /** * Instantiates a new Problem. * - * @param logRef the log ref + * @param logRef the log ref * @param message the message */ public Problem(String logRef, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java index c277bc3ad..05397dfdc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app110/SpringDocApp110Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app110; @@ -53,18 +53,18 @@ static class SpringDocTestApp { /** * Custom open api open api. * - * @param appDesciption the app desciption - * @param appVersion the app version + * @param appDescription the app description + * @param appVersion the app version * @return the open api */ @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/ErrorMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/ErrorMessage.java index 3d38bb18f..112660b77 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/ErrorMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/ErrorMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/GlobalControllerAdvice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/GlobalControllerAdvice.java index 88fd3dc62..7e66aa862 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/GlobalControllerAdvice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/GlobalControllerAdvice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Person.java index 1e2e1cb0f..238ca01a8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController.java index c0f489c55..8b9a60fea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController2.java index bde6f8b4e..13da437b5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/PersonController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Problem.java index 367112b14..6e8ad4b1f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app111; @@ -44,7 +44,7 @@ class Problem { /** * Instantiates a new Problem. * - * @param logRef the log ref + * @param logRef the log ref * @param message the message */ public Problem(String logRef, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java index d15a8d576..b7f8f9a04 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app111/SpringDocApp111Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app111; @@ -53,17 +53,17 @@ static class SpringDocTestApp { /** * Custom open api open api. * - * @param appDesciption the app desciption - * @param appVersion the app version + * @param appDescription the app description + * @param appVersion the app version * @return the open api */ @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/ErrorMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/ErrorMessage.java index d4d6a2493..cada9d36f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/ErrorMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/ErrorMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/GlobalControllerAdvice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/GlobalControllerAdvice.java index 2fab5b148..d02809398 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/GlobalControllerAdvice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/GlobalControllerAdvice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Person.java index e60ad3ab5..40005642a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/PersonController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/PersonController.java index 207725f6d..dcbd9f360 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/PersonController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/PersonController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Problem.java index db231b4ac..f51eb69f9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app112; @@ -44,7 +44,7 @@ class Problem { /** * Instantiates a new Problem. * - * @param logRef the log ref + * @param logRef the log ref * @param message the message */ public Problem(String logRef, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java index 3b9019c72..927aa7523 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/SpringDocApp112Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app112; @@ -53,17 +53,17 @@ static class SpringDocTestApp { /** * Custom open api open api. * - * @param appDesciption the app desciption - * @param appVersion the app version + * @param appDescription the app description + * @param appVersion the app version * @return the open api */ @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/sample/PersonController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/sample/PersonController2.java index c3db8f1ec..ed014c99c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/sample/PersonController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app112/sample/PersonController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app112.sample; @@ -58,7 +58,7 @@ class PersonController2 { /** * Person person. * - * @param person the person + * @param person the person * @return the person */ @RequestMapping(path = "/person2", method = RequestMethod.POST) @@ -74,7 +74,7 @@ public Person person(@Valid @RequestBody Person person) throws HttpMediaTypeNotS /** * Find by last name list. * - * @param lastName the last name + * @param lastName the last name * @return the list */ @RequestMapping(path = "/personByLastName2", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/HelloController.java index 486593c47..f32202822 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app113; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/SpringDocApp113Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/SpringDocApp113Test.java index a5b645bbb..76f6f8c68 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/SpringDocApp113Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app113/SpringDocApp113Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app113; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/HelloController.java index 27ff46f0b..045b644f0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app114; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/SpringDocApp114Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/SpringDocApp114Test.java index e9ce9538c..dbc4fabb6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/SpringDocApp114Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app114/SpringDocApp114Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app114; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/HelloController.java index 9630be358..cedf34a55 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app115; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java index 95b38bea7..1fcecd435 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/JavaTimeOperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app115; @@ -46,8 +46,8 @@ class JavaTimeOperationCustomizer implements OperationCustomizer { /** * Customize operation. * - * @param operation the operation - * @param handlerMethod the handler method + * @param operation the operation + * @param handlerMethod the handler method * @return the operation */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java index 49347f219..0a2a1be4e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app115/SpringDocApp115Test.java @@ -21,21 +21,38 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app115; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import test.org.springdoc.api.v30.AbstractSpringDocTest; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_EXTRA_SCHEMAS; +import static org.springdoc.core.utils.SpringDocUtils.getConfig; /** * The type Spring doc app 115 test. */ +@TestPropertySource(properties = SPRINGDOC_ENABLE_EXTRA_SCHEMAS + "=false") class SpringDocApp115Test extends AbstractSpringDocTest { + @BeforeAll + public static void clear() { + getConfig().resetExtraSchemas(); + } + + @AfterAll + public static void restore() { + getConfig().initExtraSchemas(); + } + /** * The type Spring doc test app. */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/FooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/FooErrorHandler.java index f82f1df68..5210b745d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/FooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/FooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app116; @@ -40,7 +40,7 @@ class FooErrorHandler { /** * Store assignment publishing error response entity. * - * @param e the e + * @param e the e * @return the response entity */ @ExceptionHandler diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/HelloController.java index e883e84f3..1c8a4aebf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app116; @@ -46,7 +46,7 @@ class HelloController { /** * Create string. * - * @param foo the foo + * @param foo the foo * @return the string */ @PostMapping("/foo") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/SpringDocApp116Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/SpringDocApp116Test.java index b810d3fe7..284aca4ac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/SpringDocApp116Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app116/SpringDocApp116Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app116; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/HelloApplication.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/HelloApplication.java index e757a9093..36714e137 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/HelloApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/HelloApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app117; @@ -68,7 +68,7 @@ class HelloApplication { /** * Routes router function. * - * @param ph the ph + * @param ph the ph * @return the router function */ @Bean @@ -97,10 +97,10 @@ class SimpleFilter extends GenericFilter { /** * Do filter. * - * @param req the req - * @param res the res - * @param filterChain the filter chain - * @throws IOException the io exception + * @param req the req + * @param res the res + * @param filterChain the filter chain + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override @@ -133,7 +133,7 @@ class PersonHandler { /** * Handle get all people server response. * - * @param serverRequest the server request + * @param serverRequest the server request * @return the server response */ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { @@ -143,10 +143,10 @@ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { /** * Handle post person server response. * - * @param r the r - * @return the server response - * @throws ServletException the servlet exception - * @throws IOException the io exception + * @param r the r + * @return the server response + * @throws ServletException the servlet exception + * @throws IOException the io exception */ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOException { Person result = personService.save(new Person(null, r.body(Person.class).getName())); @@ -157,7 +157,7 @@ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOExce /** * Handle get person by id server response. * - * @param r the r + * @param r the r * @return the server response */ ServerResponse handleGetPersonById(ServerRequest r) { @@ -174,7 +174,7 @@ class GreetingsRestController { /** * Greet string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping("/greet/{name}") @@ -207,7 +207,7 @@ class PersonService { /** * Save person. * - * @param p the p + * @param p the p * @return the person */ Person save(Person p) { @@ -228,7 +228,7 @@ Set all() { /** * By id person. * - * @param id the id + * @param id the id * @return the person */ Person byId(@Parameter(in = ParameterIn.PATH) Long id) { @@ -258,7 +258,7 @@ class Person { /** * Instantiates a new Person. * - * @param id the id + * @param id the id * @param name the name */ public Person(Long id, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/SpringDocApp117Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/SpringDocApp117Test.java index 6ebd6ee2e..3b07eb6c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/SpringDocApp117Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app117/SpringDocApp117Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app117; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/AbstractParent.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/AbstractParent.java index b743b09f0..ce90e818b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/AbstractParent.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/AbstractParent.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app118; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/ConcreteParent.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/ConcreteParent.java index a4ff5a45c..d7067f3dd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/ConcreteParent.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/ConcreteParent.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app118; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/Controller.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/Controller.java index 029111a1b..f54a41ee2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/Controller.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/Controller.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app118; @@ -42,7 +42,7 @@ class Controller { /** * Abstract parent response. * - * @param payload the payload + * @param payload the payload * @return the response */ @PostMapping("abstract-parent") @@ -53,7 +53,7 @@ public Response abstractParent(@RequestBody AbstractParent payload) { /** * Concrete parent response. * - * @param payload the payload + * @param payload the payload * @return the response */ @PostMapping("concrete-parent") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/SpringDocApp118Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/SpringDocApp118Test.java index 5ccae9c57..5547fa0f1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/SpringDocApp118Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app118/SpringDocApp118Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app118; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java index 5cf238164..d27a1aaae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app119; @@ -45,9 +45,9 @@ class HelloController { /** * Multi files in multi part string. * - * @param jsonRequest the json request - * @param file1 the file 1 - * @param file2 the file 2 + * @param jsonRequest the json request + * @param file1 the file 1 + * @param file2 the file 2 * @return the string */ @Operation(summary = "Multiple files and JSON payloads as multi part request") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/JsonRequest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/JsonRequest.java index 1035fa3e5..640278158 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/JsonRequest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/JsonRequest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app119; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/SpringDocApp119Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/SpringDocApp119Test.java index d8817f321..09ed5e0ee 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/SpringDocApp119Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app119/SpringDocApp119Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app119; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java index 7cf3dc686..9f16848ef 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java index 5f09e4fc9..83dadbe5c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/AccountId.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/AccountId.java index 7a033e132..0b6294d51 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/AccountId.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/AccountId.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app120; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/MetaAnnotationController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/MetaAnnotationController.java index ae3d50648..4da526069 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/MetaAnnotationController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/MetaAnnotationController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app120; @@ -69,6 +69,7 @@ String simpleTest(@PathVariable @AccountId String accountId) { /** * When there is a top level {@code @Parameter} annotation it has precedence over the meta-annotation * So the id parameter should have all the defaults, with a name of "id" + * * @param accountId the account id * @return the string */ @@ -90,6 +91,7 @@ String testQueryParam(@RequestParam @AccountId String accountId) { /** * {@code @AliasFor} in the {@code @AccountId} annotation allows us to override the default it provides. + * * @param accountId the account id * @return the string */ @@ -102,7 +104,7 @@ String testAliasFor(@RequestParam @AccountId(example = "OVERRIDDEN EXAMPLE") Str * Test meta meta annotation string. * * @param queryAccountId the query account id - * @param accountId the account id + * @param accountId the account id * @return the string */ @GetMapping(value = "/testMetaMetaAnnotation/{accountId}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/SpringDocApp120Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/SpringDocApp120Test.java index 66a1bdc49..84d698968 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/SpringDocApp120Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app120/SpringDocApp120Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app120; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/InheritedRequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/InheritedRequestParams.java index e1e9ef1c4..c06a48739 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/InheritedRequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/InheritedRequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app121; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/RequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/RequestParams.java index eb02770ce..305429ed5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/RequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/RequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app121; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/SpringDocApp121Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/SpringDocApp121Test.java index 450aa34ec..8772a5dc1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/SpringDocApp121Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/SpringDocApp121Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app121; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/TestController.java index b02ab3f72..fc48a1c98 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app121/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app121; @@ -41,8 +41,8 @@ class TestController { /** * Gets test. * - * @param param the param - * @param requestParams the request params + * @param param the param + * @param requestParams the request params * @return the test */ @PostMapping("test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseController.java index 515a3552b..e28e99344 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app122; @@ -36,7 +36,7 @@ /** * The type Base controller. * - * @param the type parameter + * @param the type parameter */ @RestController public abstract class BaseController { @@ -44,7 +44,7 @@ public abstract class BaseController { /** * Create response entity. * - * @param payload the payload + * @param payload the payload * @return the response entity */ @PostMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseObject.java index da1c562da..dbf09ff8a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/BaseObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/CustomerDto.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/CustomerDto.java index d042236bf..087893831 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/CustomerDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/CustomerDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/FirstController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/FirstController.java index 3187d72a2..e198c7a90 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/FirstController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/FirstController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/SpringDocApp122Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/SpringDocApp122Test.java index 2c7ccd1a3..51e7e8710 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/SpringDocApp122Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/SpringDocApp122Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/Wrapper.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/Wrapper.java index ddddd1e8f..63d01c6dd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/Wrapper.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app122/Wrapper.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app122; @@ -31,7 +31,7 @@ /** * The type Wrapper. * - * @param the type parameter + * @param the type parameter */ class Wrapper { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/HelloController.java index 12f9c8fb6..56985609a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app123; @@ -36,7 +36,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -44,8 +44,8 @@ class HelloController { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/MyExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/MyExceptionHandler.java index fec1616b0..6b91509ca 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/MyExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/MyExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app123; @@ -55,7 +55,7 @@ public void bad(IllegalArgumentException e) { /** * Gateway object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(RuntimeException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/SpringDocApp123Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/SpringDocApp123Test.java index 15165d794..57de9bbec 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/SpringDocApp123Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app123/SpringDocApp123Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app123; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/HelloController.java index c43bb6b70..39c6a9167 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app124; @@ -40,7 +40,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -60,8 +60,8 @@ public void bad(IllegalArgumentException e) { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/MyExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/MyExceptionHandler.java index f16e08bb9..4926ed510 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/MyExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/MyExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app124; @@ -40,7 +40,7 @@ class MyExceptionHandler { /** * Gateway object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(RuntimeException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/SpringDocApp124Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/SpringDocApp124Test.java index 358871337..006c02207 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/SpringDocApp124Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app124/SpringDocApp124Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app124; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/DeprecatedEntity.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/DeprecatedEntity.java index 493ed26ea..2eb276084 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/DeprecatedEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/DeprecatedEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app125; @@ -30,6 +30,7 @@ /** * The type Deprecated entity. + * * @author bnasslahsen */ class DeprecatedEntity { @@ -57,7 +58,7 @@ public String getMyNonDeprecatedField() { /** * Sets my non deprecated field. * - * @param myNonDeprecatedField the my non deprecated field + * @param myNonDeprecatedField the my non deprecated field * @return the my non deprecated field */ @Deprecated diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/HelloController.java index b2a0042ea..907f90156 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app125; @@ -33,6 +33,7 @@ /** * The type Hello controller. + * * @author bnasslahsen */ @RestController @@ -41,7 +42,7 @@ class HelloController { /** * Gets all pets. * - * @param toto the toto + * @param toto the toto * @return the all pets */ @GetMapping(value = "/search", produces = { "application/xml", "application/json" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/SpringDocApp125Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/SpringDocApp125Test.java index 4babed24f..4812caece 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/SpringDocApp125Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app125/SpringDocApp125Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app125; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/HelloController.java index 602d5a8ec..b224fc903 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app126; @@ -42,7 +42,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController @ApiResponses(value = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/Problem.java index bbd682e8d..2f1625068 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app126; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SecurityProblemResponsesConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SecurityProblemResponsesConfiguration.java index ee41e82af..44661c214 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SecurityProblemResponsesConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SecurityProblemResponsesConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app126; @@ -80,7 +80,7 @@ class SecurityProblemResponsesConfiguration { /** * Http 401 no token response map . entry. * - * @return the map . entry + * @return the map . entry * @throws IOException the io exception */ @Bean @@ -91,7 +91,7 @@ public Map.Entry http401NoTokenResponse() throws IOExceptio /** * Http 401 bad token response map . entry. * - * @return the map . entry + * @return the map . entry * @throws IOException the io exception */ @Bean @@ -102,7 +102,7 @@ public Map.Entry http401BadTokenResponse() throws IOExcepti /** * Http 403 example map . entry. * - * @return the map . entry + * @return the map . entry * @throws IOException the io exception */ @Bean @@ -113,9 +113,9 @@ public Map.Entry http403Example() throws IOException { /** * Simple response map . entry. * - * @param code the code - * @param description the description - * @return the map . entry + * @param code the code + * @param description the description + * @return the map . entry * @throws IOException the io exception */ private Map.Entry simpleResponse(String code, String description) throws IOException { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SpringDocApp126Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SpringDocApp126Test.java index 04883012b..14d4288d7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SpringDocApp126Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app126/SpringDocApp126Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app126; @@ -53,7 +53,7 @@ static class SpringDocTestApp { /** * Response registration customizer open api customiser. * - * @param responsesToRegister the responses to register + * @param responsesToRegister the responses to register * @return the open api customiser */ @Bean diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/AbstractObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/AbstractObject.java index 22b6ae542..f0936e944 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/AbstractObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/AbstractObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app127; @@ -55,7 +55,7 @@ public abstract class AbstractObject { /** * Instantiates a new Abstract object. * - * @param type the type + * @param type the type * @param name the name */ protected AbstractObject(ConcreteType type, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteObjectA.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteObjectA.java index 9edecf656..afdad51c4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteObjectA.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteObjectA.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app127; @@ -39,7 +39,7 @@ class ConcreteObjectA extends AbstractObject { /** * Instantiates a new Concrete object a. * - * @param name the name + * @param name the name * @param description the description */ public ConcreteObjectA(String name, String description) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteType.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteType.java index 523129008..fe27a4ccb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteType.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/ConcreteType.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Controller.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Controller.java index ffb95b6c7..69ce95c12 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Controller.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Controller.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/SpringDocApp127Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/SpringDocApp127Test.java index c604724b2..1bc733469 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/SpringDocApp127Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/SpringDocApp127Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Umbrella.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Umbrella.java index 26e71caa7..5286b0271 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Umbrella.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app127/Umbrella.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/ActualReturnedEntity.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/ActualReturnedEntity.java index 868c443ab..de380f30c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/ActualReturnedEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/ActualReturnedEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app129; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/HelloController.java index 655b9a1bb..d93fe333b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app129; @@ -45,8 +45,8 @@ class HelloController { /** * Update deferred result. * - * @param entity the entity - * @return the deferred result + * @param entity the entity + * @return the deferred result * @throws Exception the exception */ @PostMapping("/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/OperationResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/OperationResponse.java index 302a84818..c41206860 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/OperationResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/OperationResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app129; @@ -31,7 +31,7 @@ /** * The type Operation response. * - * @param the type parameter + * @param the type parameter */ class OperationResponse { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/SpringDocApp129Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/SpringDocApp129Test.java index 91f0e1020..c2bee6033 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/SpringDocApp129Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app129/SpringDocApp129Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app129; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java index 337197b9c..7d54a5d9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app13; @@ -38,7 +38,7 @@ class HelloController { /** * Persons string. * - * @param dto the dto + * @param dto the dto * @return the string */ @GetMapping(value = "/persons") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java index 5d318b4b2..5b7f3b265 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app13; @@ -58,9 +58,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java index e930103d3..bc4b1f2d6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app13/SpringDocApp13Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/HelloController.java index b4d9d0fdd..82fddd6d8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app130; @@ -39,7 +39,7 @@ class HelloController { /** * List tracker data. * - * @param toto the toto + * @param toto the toto * @return the tracker data */ @PostMapping(value = "/values/data") @@ -50,7 +50,7 @@ TrackerData list(TrackerData toto) { /** * Get tracker data. * - * @param toto the toto + * @param toto the toto * @return the tracker data */ @GetMapping(value = "/values/datakk") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/SpringDocApp130Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/SpringDocApp130Test.java index 887f9fc25..352375e85 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/SpringDocApp130Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/SpringDocApp130Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app130; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/TrackerData.java index 3f78002e8..2c72827d9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/TrackerData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app130/TrackerData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app130; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/HelloController.java index 889c8a91b..ad3e190eb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app131; @@ -43,7 +43,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/Organization.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/Organization.java index 711d470d8..e7e0ff381 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/Organization.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/Organization.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app131; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/RestControllerError.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/RestControllerError.java index ba37d7029..281664fe2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/RestControllerError.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/RestControllerError.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app131; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/SpringDocApp131Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/SpringDocApp131Test.java index 91fbad6fe..7f319e519 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/SpringDocApp131Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app131/SpringDocApp131Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app131; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/HelloController.java index 534f34cc3..741a64f8e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app132; @@ -43,7 +43,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/Organization.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/Organization.java index 99d40d7a9..aee759f21 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/Organization.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/Organization.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app132; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/RestControllerError.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/RestControllerError.java index d688524e2..ade333e91 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/RestControllerError.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/RestControllerError.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app132; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/SpringDocApp132Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/SpringDocApp132Test.java index 53f278f4f..788b9bcfe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/SpringDocApp132Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app132/SpringDocApp132Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app132; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/HelloController.java index 58a735433..ebee9afe1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app133; @@ -42,7 +42,7 @@ class HelloController { /** * Gets message from header 1. * - * @param header the header + * @param header the header * @return the message from header 1 */ @GetMapping(path = "/test1", headers = { "myHeader" }) @@ -56,7 +56,7 @@ public String getMessageFromHeader1( /** * Gets message from header 2. * - * @param header the header + * @param header the header * @return the message from header 2 */ @GetMapping("/test2") @@ -70,7 +70,7 @@ public String getMessageFromHeader2( /** * Gets message from header 3. * - * @param header the header + * @param header the header * @return the message from header 3 */ @GetMapping(path = "/test3", headers = { "myHeader" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/SpringDocApp133Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/SpringDocApp133Test.java index f7734a8b8..9d817e1d4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/SpringDocApp133Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app133/SpringDocApp133Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app133; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/HelloController.java index fc365013c..ac59da2e4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app134; @@ -80,7 +80,7 @@ class HelloController { /** * Gets sample v 1. * - * @param id the id + * @param id the id * @return the sample v 1 */ @GetMapping(value = "/{id}", produces = VERSION_1, headers = HEADER_1) @@ -96,7 +96,7 @@ public SampleV1 getSampleV1(@Parameter(description = "The sample's id", required /** * Gets sample v 2. * - * @param id the id + * @param id the id * @return the sample v 2 */ @GetMapping(value = "/{id}", produces = VERSION_2, headers = { HEADER_2, HEADER_1 }) @@ -111,7 +111,7 @@ public SampleV2 getSampleV2(@Parameter(description = "The sample's id", required /** * Search samples list. * - * @param searchRequest the search request + * @param searchRequest the search request * @return the list */ @PostMapping(path = "/search", consumes = VERSION_2, produces = VERSION_2) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/OpenApiConfig.java index 36368c352..3c76b9e5f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app134; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/SpringDocApp134Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/SpringDocApp134Test.java index 45a01232f..6aeddd557 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/SpringDocApp134Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app134/SpringDocApp134Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app134; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/Book.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/Book.java index c85b5f537..e10514dbf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/Book.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app135; @@ -49,8 +49,8 @@ class Book { /** * Instantiates a new Book. * - * @param id the id - * @param title the title + * @param id the id + * @param title the title * @param author the author */ public Book(String id, String title, String author) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRepository.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRepository.java index bbb48969d..ac6bf42cb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app135; @@ -40,7 +40,7 @@ class BookRepository { /** * Find by author list. * - * @param author the author + * @param author the author * @return the list */ List findByAuthor(String author) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRouter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRouter.java index 7b368cb3c..f4494c0ea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRouter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app135; @@ -53,7 +53,7 @@ class BookRouter { /** * Routes router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -74,7 +74,7 @@ RouterFunction routes(BookRepository br) { /** * Routes 1 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -93,7 +93,7 @@ RouterFunction routes1(BookRepository br) { /** * Routes 3 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -119,7 +119,7 @@ RouterFunction routes3(BookRepository br) { /** * Routes 4 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/SpringDocApp135Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/SpringDocApp135Test.java index f8a6bfa83..8f28fe628 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/SpringDocApp135Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app135/SpringDocApp135Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app135; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/HelloController.java index f3d9f38eb..d4cf6630e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app137; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/OpenApiConfig.java index f90dffeff..51da68717 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app137; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/SpringDocApp137Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/SpringDocApp137Test.java index 362368f00..ff950183b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/SpringDocApp137Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app137/SpringDocApp137Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app137; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/HelloController.java index 90bf11f4f..df795c949 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app138; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/SpringDocApp138Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/SpringDocApp138Test.java index c3363de18..348c292a1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/SpringDocApp138Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app138/SpringDocApp138Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app138; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/HelloController.java index 68aa09885..71ae4de09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app139; @@ -40,7 +40,7 @@ class HelloController { /** * Echo 1 string. * - * @param text the text + * @param text the text * @return the string */ @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE, path = "/test1") @@ -51,7 +51,7 @@ public String echo1(@RequestParam(name = "${test.name}", defaultValue = "${test. /** * Echo 2 string. * - * @param text the text + * @param text the text * @return the string */ @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE, path = "/test2") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/SpringDocApp139Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/SpringDocApp139Test.java index d3f2b1173..050187b38 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/SpringDocApp139Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app139/SpringDocApp139Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app139; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java index 489d31c1f..db614013d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java index 60f25e133..c298d6c45 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app14/SpringDocApp14Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/HelloApplication.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/HelloApplication.java index 95d57eae5..35de8e990 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/HelloApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/HelloApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app140; @@ -68,9 +68,9 @@ class HelloApplication { /** * Filter server response. * - * @param serverRequest the server request - * @param handlerFunction the handler function - * @return the server response + * @param serverRequest the server request + * @param handlerFunction the handler function + * @return the server response * @throws Exception the exception */ private static ServerResponse filter(ServerRequest serverRequest, HandlerFunction handlerFunction) throws Exception { @@ -80,7 +80,7 @@ private static ServerResponse filter(ServerRequest serverRequest, HandlerFunctio /** * Routes router function. * - * @param ph the ph + * @param ph the ph * @return the router function */ @Bean @@ -107,10 +107,10 @@ class SimpleFilter extends GenericFilter { /** * Do filter. * - * @param req the req - * @param res the res - * @param filterChain the filter chain - * @throws IOException the io exception + * @param req the req + * @param res the res + * @param filterChain the filter chain + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override @@ -143,7 +143,7 @@ class PersonHandler { /** * Handle get all people server response. * - * @param serverRequest the server request + * @param serverRequest the server request * @return the server response */ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { @@ -153,10 +153,10 @@ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { /** * Handle post person server response. * - * @param r the r - * @return the server response - * @throws ServletException the servlet exception - * @throws IOException the io exception + * @param r the r + * @return the server response + * @throws ServletException the servlet exception + * @throws IOException the io exception */ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOException { Person result = personService.save(new Person(null, r.body(Person.class).getName())); @@ -167,7 +167,7 @@ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOExce /** * Handle get person by id server response. * - * @param r the r + * @param r the r * @return the server response */ ServerResponse handleGetPersonById(ServerRequest r) { @@ -184,7 +184,7 @@ class GreetingsRestController { /** * Greet string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping("/greet/{name}") @@ -217,7 +217,7 @@ class PersonService { /** * Save person. * - * @param p the p + * @param p the p * @return the person */ Person save(Person p) { @@ -238,7 +238,7 @@ Set all() { /** * By id person. * - * @param id the id + * @param id the id * @return the person */ Person byId(@Parameter(in = ParameterIn.PATH) Long id) { @@ -268,7 +268,7 @@ class Person { /** * Instantiates a new Person. * - * @param id the id + * @param id the id * @param name the name */ public Person(Long id, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/SpringDocApp140Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/SpringDocApp140Test.java index 8d69d9202..508938c15 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/SpringDocApp140Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app140/SpringDocApp140Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app140; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/Book.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/Book.java index b62163cad..7de4d02a2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/Book.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app141; @@ -49,8 +49,8 @@ class Book { /** * Instantiates a new Book. * - * @param id the id - * @param title the title + * @param id the id + * @param title the title * @param author the author */ public Book(String id, String title, String author) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRepository.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRepository.java index 12d55beb4..af4c59708 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app141; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRouter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRouter.java index bed051c1b..81edc30cd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRouter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app141; @@ -53,7 +53,7 @@ class BookRouter { /** * Routes router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -75,7 +75,7 @@ RouterFunction routes(BookRepository br) { /** * Routes 1 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -93,7 +93,7 @@ RouterFunction routes1(BookRepository br) { /** * Routes 3 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -115,7 +115,7 @@ RouterFunction routes3(BookRepository br) { /** * Routes 4 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/SpringDocApp141Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/SpringDocApp141Test.java index 4258ec311..fccb76b5e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/SpringDocApp141Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app141/SpringDocApp141Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app141; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/HelloApplication.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/HelloApplication.java index 9f9755355..ed3a86e49 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/HelloApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/HelloApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app142; @@ -89,10 +89,10 @@ class SimpleFilter extends GenericFilter { /** * Do filter. * - * @param req the req - * @param res the res + * @param req the req + * @param res the res * @param filterChain the filter chain - * @throws IOException the io exception + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override @@ -138,7 +138,7 @@ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { * @param r the r * @return the server response * @throws ServletException the servlet exception - * @throws IOException the io exception + * @throws IOException the io exception */ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOException { Person result = personService.save(new Person(null, r.body(Person.class).getName())); @@ -250,7 +250,7 @@ class Person { /** * Instantiates a new Person. * - * @param id the id + * @param id the id * @param name the name */ public Person(Long id, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/SpringDocApp142Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/SpringDocApp142Test.java index 3826b1462..a1d81b7c0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/SpringDocApp142Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app142/SpringDocApp142Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app142; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java index b14431f63..ad6d8cfcf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app149; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java index 4acda09a8..8072091c6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/HelloMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app149; @@ -43,7 +43,7 @@ class HelloMessage { /** * Instantiates a new Hello message. * - * @param text the text + * @param text the text * @param number the number */ public HelloMessage(String text, int number) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java index 7a50ca415..5c5c3ed2d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app149/SpringDocApp149Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app149; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java index 90e01758f..5cc95dcfe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java index 25fbf4c03..4f872be1e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app15/SpringDocApp15Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/HelloController.java index e468b3c8f..85735b806 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app150; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java index 47afbcaf0..c6131ad8b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app150/SpringDocApp150Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app150; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/HelloController.java index f0a38d220..bc0f6aaec 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app151; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java index f4ea0be20..cada2a654 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app151/SpringDocApp151Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app151; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java index 1c83adb6b..7cb858e67 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app152; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java index 8dbd6a524..f8ddc2b42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app152/SpringDocApp152Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app152; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderState.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderState.java index a4034d84a..1ddee9f4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderState.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderState.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; @@ -35,11 +35,11 @@ @Schema(type = "string", allowableValues = { "finished", "new" }) public enum OrderState { /** - *Finished order state. + * Finished order state. */ FINISHED("finished"), /** - *New order state. + * New order state. */ NEW("new"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderStateMapper.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderStateMapper.java index c1e26d8a3..c6c7943cf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderStateMapper.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/OrderStateMapper.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java index 6c0c71983..99f0ab780 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/SpringDocApp153Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/TestController.java index 742239b89..9bf8f8e04 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app153/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app153; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/HelloController.java index f9ac10cfc..d93edfd06 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app154; @@ -55,8 +55,8 @@ public String hello() { /** * Create. * - * @param id the id - * @param o the o + * @param id the id + * @param o the o */ @PostMapping(value = "/persons") public void create(@ParameterObject Long id, @RequestBody Object o) { @@ -66,8 +66,8 @@ public void create(@ParameterObject Long id, @RequestBody Object o) { /** * Createone. * - * @param id the id - * @param o the o + * @param id the id + * @param o the o */ @PostMapping(value = "/personsone") public void createone(Long id, @RequestBody Object o) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/OpenApiConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/OpenApiConfiguration.java index 0c4ff3658..f96f9296d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/OpenApiConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/OpenApiConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app154; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/SpringDocApp154Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/SpringDocApp154Test.java index 089299b23..a838f559f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/SpringDocApp154Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app154/SpringDocApp154Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app154; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractIntParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractIntParameterObject.java index 76bc5207c..d3f34ab72 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractIntParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractIntParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app155; @@ -29,7 +29,7 @@ /** * The type Abstract int parameter object. * - * @param the type parameter + * @param the type parameter */ class AbstractIntParameterObject { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractParameterObject.java index 37e7e27da..b56796704 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/AbstractParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app155; @@ -32,7 +32,7 @@ /** * The type Abstract parameter object. * - * @param the type parameter + * @param the type parameter */ class AbstractParameterObject> { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteEnum.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteEnum.java index 97cfc60e9..013cf4ecb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteEnum.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteEnum.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app155; @@ -32,11 +32,11 @@ */ enum ConcreteEnum { /** - *One concrete enum. + * One concrete enum. */ ONE, /** - *Two concrete enum. + * Two concrete enum. */ TWO diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteIntParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteIntParameterObject.java index 57a0822b4..9dc61d224 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteIntParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteIntParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app155; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteParameterObject.java index 11f5a59c4..50a21e9b8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/ConcreteParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app155; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/HelloController.java index 7c6431c60..92d742533 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app155; @@ -42,7 +42,7 @@ class HelloController { /** * Say hello response entity. * - * @param test the test + * @param test the test * @return the response entity */ @GetMapping("/test1") @@ -54,7 +54,7 @@ public ResponseEntity sayHello(@ParameterObject final ConcreteParameterO /** * Say hello response entity. * - * @param test the test + * @param test the test * @return the response entity */ @GetMapping("/test2") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/SpringDocApp155Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/SpringDocApp155Test.java index bf3487dfd..fdeac5890 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/SpringDocApp155Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app155/SpringDocApp155Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app155; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/HelloController.java index a2daa3652..4048471ba 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app156; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SomeEnum.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SomeEnum.java index 7737cbe33..4e3cb2cc0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SomeEnum.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SomeEnum.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app156; @@ -31,11 +31,11 @@ */ public enum SomeEnum { /** - *First some enum. + * First some enum. */ FIRST, /** - *Second some enum. + * Second some enum. */ SECOND } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SpringDocApp156Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SpringDocApp156Test.java index 7052cea34..9399eb144 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SpringDocApp156Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/SpringDocApp156Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app156; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/User.java index 5e1fd9837..0fd91e3f2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app156/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app156; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Bar.java index 95afc897e..511a8a923 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Foo.java index ad636dba6..90eb1f7fa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/HelloController.java index 411392f28..35605a7ba 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/SpringDocApp157Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/SpringDocApp157Test.java index 9aa716151..a82405ae8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/SpringDocApp157Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/SpringDocApp157Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/StringyConverter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/StringyConverter.java index ac74ead63..7ebfdb840 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/StringyConverter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app157/StringyConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/CommonFooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/CommonFooErrorHandler.java index 83e286b46..16ea92831 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/CommonFooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/CommonFooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app158; @@ -38,7 +38,7 @@ class CommonFooErrorHandler { /** * On exception error dto. * - * @param e the e + * @param e the e * @return the error dto */ @ExceptionHandler diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/ErrorDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/ErrorDTO.java index 5b9b24be9..bb4232247 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/ErrorDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/ErrorDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/HelloController.java index 1fe6051dd..ed055fbdf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SimpleDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SimpleDTO.java index 5180b27a1..37ed4ab26 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SimpleDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SimpleDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpecificFooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpecificFooErrorHandler.java index 5ed6c035f..5517042c0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpecificFooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpecificFooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpringDocApp158Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpringDocApp158Test.java index 26a839caf..829b12c5d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpringDocApp158Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app158/SpringDocApp158Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/CustomException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/CustomException.java index 12398844a..f4ef9637d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/CustomException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/CustomException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooBean.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooBean.java index 51d744f05..0687bd731 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooBean.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooBean.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app159; @@ -48,7 +48,7 @@ class FooBean { * Instantiates a new Foo bean. * * @param message the message - * @param code the code + * @param code the code */ public FooBean(String message, int code) { this.message = message; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooErrorHandler.java index a7460696f..16311bbcd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/FooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/HelloController.java index a4845e0be..338a4f815 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/SpringDocApp159Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/SpringDocApp159Test.java index ce831d4f5..e49028805 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/SpringDocApp159Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/SpringDocApp159Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/Views.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/Views.java index 758d652a1..93e0a5edd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/Views.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app159/Views.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/HelloController.java index e717e6bf9..cb91af057 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java index 557a3ff56..d2de2261f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app16/SpringDocApp16Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/HelloController.java index 5a62e821e..fbbdb19dd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app160; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/SpringDocApp160Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/SpringDocApp160Test.java index 047f9948a..1f8f7dec8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/SpringDocApp160Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app160/SpringDocApp160Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app160; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/HelloController.java index 6f71e0ce2..cc10ef3e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app161; @@ -45,8 +45,8 @@ class HelloController { /** * Add response entity. * - * @param content the content - * @return the response entity + * @param content the content + * @return the response entity * @throws Exception the exception */ @Operation(summary = "add") @@ -59,8 +59,8 @@ public ResponseEntity add(@Parameter(description = "content") @RequestPart /** * Add 2 response entity. * - * @param content the content - * @param type the type + * @param content the content + * @param type the type * @return the response entity */ @Operation(summary = "add2") @@ -75,7 +75,7 @@ public ResponseEntity add2( /** * Test. * - * @param strValue the str value + * @param strValue the str value * @param intValue the int value */ @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/SpringDocApp161Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/SpringDocApp161Test.java index 79db3addb..57e4d42a8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/SpringDocApp161Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app161/SpringDocApp161Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app161; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/SpringDocApp162Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/SpringDocApp162Test.java index 6b0548936..76934ca92 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/SpringDocApp162Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/SpringDocApp162Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app162; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NoResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NoResultException.java index 00c94c4d5..926b9c07b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NoResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NoResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app162.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NonUniqueResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NonUniqueResultException.java index 1a24d02a5..089ef8cd3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NonUniqueResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/exception/NonUniqueResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app162.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/JavadocOnlyRestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/JavadocOnlyRestController.java index 5994516f5..2acc99df2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/JavadocOnlyRestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/JavadocOnlyRestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app162.rest; @@ -106,7 +106,7 @@ public ResponseEntity find(@PathVariable String guid) throws * * @param prefix the {@code @param prefix} javadoc for the {@code #findStartsBy(String)} method * @return the {@code @return} javadoc for the {@code #findStartsBy(String)} method - * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method + * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method * @throws NonUniqueResultException the {@code @throws NonUniqueResultException} javadoc for the {@code #findStartsBy(String)} method */ @GetMapping(path = "startsBy/{prefix}", produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/dto/JavadocOnlyRestDto.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/dto/JavadocOnlyRestDto.java index c972ca1f5..ec2c9cd22 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/dto/JavadocOnlyRestDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/dto/JavadocOnlyRestDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app162.rest.dto; @@ -37,7 +37,6 @@ public class JavadocOnlyRestDto { /** * This is the private {@code #inner} field's javadoc. - * * This javadoc description is ignored by the REST documentation: * the {@code $ref} can't have a description as any sibling elements of a $ref are ignored. */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/util/RestExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/util/RestExceptionHandler.java index bf46ebfe7..810129711 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/util/RestExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app162/rest/util/RestExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app162.rest.util; @@ -37,14 +37,12 @@ /** * REST exception handlers. - * * This javadoc description is ignored by the REST documentation. */ @RestControllerAdvice class RestExceptionHandler { /** * REST exception handler for {@code NoResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNotFoundException(NoResultException)} method @@ -57,7 +55,6 @@ public ResponseEntity handleNotFoundException(NoResultException exceptio /** * REST exception handler for {@code NonUniqueResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNonUniqueResultException(NonUniqueResultException)} method diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/SpringDocApp163Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/SpringDocApp163Test.java index b2017462d..d135dd53c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/SpringDocApp163Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/SpringDocApp163Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NoResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NoResultException.java index 7e7236dc7..760c35016 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NoResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NoResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NonUniqueResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NonUniqueResultException.java index a9c5521ab..221067189 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NonUniqueResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/exception/NonUniqueResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/AnnotationOverrideForJavadocRestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/AnnotationOverrideForJavadocRestController.java index e84986430..66b1a6f39 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/AnnotationOverrideForJavadocRestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/AnnotationOverrideForJavadocRestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163.rest; @@ -103,7 +103,7 @@ public ResponseEntity create(@RequestBody A * * @param prefix the {@code @param prefix} javadoc for the {@code #findStartsBy(String)} method * @return the {@code @return} javadoc for the {@code #findStartsBy(String)} method - * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method + * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method * @throws NonUniqueResultException the {@code @throws NonUniqueResultException} javadoc for the {@code #findStartsBy(String)} method */ @Operation( diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java index 13ca7ae39..58f450f34 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163.rest.dto; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java index 886d36aa5..e05c13b44 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163.rest.dto; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java index ff558a2e1..382833b5a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163.rest.dto; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/util/RestExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/util/RestExceptionHandler.java index b17fef094..4791b4504 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/util/RestExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app163/rest/util/RestExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app163.rest.util; @@ -37,14 +37,12 @@ /** * REST exception handlers. - * * This javadoc description is ignored by the REST documentation. */ @RestControllerAdvice class RestExceptionHandler { /** * REST exception handler for {@code NoResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNotFoundException(NoResultException)} method @@ -57,7 +55,6 @@ public ResponseEntity handleNotFoundException(NoResultException exceptio /** * REST exception handler for {@code NonUniqueResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNonUniqueResultException(NonUniqueResultException)} method diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocApp164Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocApp164Test.java index dc9f9122e..b91ac9e73 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocApp164Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocApp164Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app164; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocJavadocProviderTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocJavadocProviderTest.java index 316d07972..077d1b19e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocJavadocProviderTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/SpringDocJavadocProviderTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app164; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NoResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NoResultException.java index cf9169219..30c8a5d83 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NoResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NoResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app164.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NonUniqueResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NonUniqueResultException.java index b5ab92305..0b743bffa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NonUniqueResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/exception/NonUniqueResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app164.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/NoGenericOverrideRestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/NoGenericOverrideRestController.java index 61aae0169..6c198173a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/NoGenericOverrideRestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/NoGenericOverrideRestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app164.rest; @@ -65,7 +65,7 @@ public ResponseEntity create(@RequestBody String input) { * * @param prefix the {@code @param prefix} javadoc for the {@code #findStartsBy(String)} method * @return the {@code @return} javadoc for the {@code #findStartsBy(String)} method - * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method + * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method * @throws NonUniqueResultException the {@code @throws NonUniqueResultException} javadoc for the {@code #findStartsBy(String)} method */ @GetMapping(path = "startsBy/{prefix}", produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/util/RestExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/util/RestExceptionHandler.java index 0d53703df..613d51ffd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/util/RestExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app164/rest/util/RestExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app164.rest.util; @@ -37,14 +37,12 @@ /** * REST exception handlers. - * * This javadoc description is ignored by the REST documentation. */ @RestControllerAdvice class RestExceptionHandler { /** * REST exception handler for {@code NoResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNotFoundException(NoResultException)} method @@ -57,7 +55,6 @@ public ResponseEntity handleNotFoundException(NoResultException exceptio /** * REST exception handler for {@code NonUniqueResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNonUniqueResultException(NonUniqueResultException)} method diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/ConcreteSubclassFromGeneric.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/ConcreteSubclassFromGeneric.java index 98ac4ad72..b873b1c52 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/ConcreteSubclassFromGeneric.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/ConcreteSubclassFromGeneric.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/HelloController.java index 837ce9ce2..d5c74fdd2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/MyData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/MyData.java index 9479fabec..0881c1c39 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/MyData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/MyData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleGeneric.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleGeneric.java index 7fe3657f8..5ddd8cb85 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleGeneric.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleGeneric.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerClass.java index bb4674085..8cbdcf05e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerInnerClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerInnerClass.java index 9f9d922a6..32f2bfa5d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerInnerClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleInnerInnerClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleOuterClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleOuterClass.java index cbe7fa343..b3e1a7420 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleOuterClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SimpleOuterClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java index 90bf83540..150332025 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app166/SpringDocApp166Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/HelloController.java index d913705b5..c4979a383 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app167; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/SpringDocApp167Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/SpringDocApp167Test.java index b99885767..2a7084748 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/SpringDocApp167Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app167/SpringDocApp167Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app167; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/DescriptionFieldInRequestBodyIsNullController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/DescriptionFieldInRequestBodyIsNullController.java index 60d917abb..d37ddaf16 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/DescriptionFieldInRequestBodyIsNullController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/DescriptionFieldInRequestBodyIsNullController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app168; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/Person.java index 7369d2897..0d11f0674 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app168; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/SpringDocApp168Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/SpringDocApp168Test.java index bd7ccd819..91a45f0e7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/SpringDocApp168Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app168/SpringDocApp168Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app168; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/RecordController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/RecordController.java index e4c9fd29a..2743e1e24 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/RecordController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/RecordController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app169; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleInnerClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleInnerClass.java index 8fc3f0217..ebbc05aa9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleInnerClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleInnerClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app169; @@ -29,7 +29,7 @@ /** * simple inner class * - * @param name the boolean name + * @param name the boolean name * @param maxNumber the max number */ public record SimpleInnerClass(Boolean name, Integer maxNumber) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleOuterClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleOuterClass.java index f1364bf77..f2c119532 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleOuterClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SimpleOuterClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app169; @@ -29,7 +29,7 @@ /** * simple outer class * - * @param name the name of the outer class + * @param name the name of the outer class * @param simpleInnerClass the inner class */ public record SimpleOuterClass(String name, SimpleInnerClass simpleInnerClass) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SpringDocApp169Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SpringDocApp169Test.java index c80a28009..16c3b39d1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SpringDocApp169Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app169/SpringDocApp169Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app169; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/HelloController.java index 471be5f5a..facb75492 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java index 7bff2dd29..c7f461170 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app17/SpringDocApp17Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Animal.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Animal.java index b94bf7500..624cba411 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Animal.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Animal.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/BasicController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/BasicController.java index 260faed8c..7d471ea77 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/BasicController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/BasicController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Cat.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Cat.java index 4a116dab6..5c91364f3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Cat.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Cat.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Dog.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Dog.java index 892480ceb..0f5e40d42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Dog.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/Dog.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/SpringDocApp170Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/SpringDocApp170Test.java index 17faafdc3..2fa9a572f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/SpringDocApp170Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app170/SpringDocApp170Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/HelloController.java index 5eeef9437..d60c3553d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app171; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonDTO.java index 8ebe74abf..5ab64e44d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app171; @@ -45,9 +45,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonProjection.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonProjection.java index ea663dbe5..700d26c32 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonProjection.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/PersonProjection.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app171; @@ -32,19 +32,16 @@ public interface PersonProjection { /** * The Email. - * */ String getEmail(); /** * The First name. - * */ String getFirstName(); /** * The Last name. - * */ String getLastName(); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/SpringDocApp171Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/SpringDocApp171Test.java index 691922268..3789069ea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/SpringDocApp171Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app171/SpringDocApp171Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app171; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app172/JavadocPropertyCustomizerTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app172/JavadocPropertyCustomizerTest.java index 03dbafc78..8972831a9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app172/JavadocPropertyCustomizerTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app172/JavadocPropertyCustomizerTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app172; @@ -132,7 +132,7 @@ void ifRecordObjectShouldGetField() throws IOException, ClassNotFoundException, .addProperty("name", new StringSchema().name("name")); List propertyDescriptors = Arrays.asList(Introspector.getBeanInfo(cls).getPropertyDescriptors()); - javadocPropertyCustomizer.setJavadocDescription(cls, fields, propertyDescriptors, existingSchema,false); + javadocPropertyCustomizer.setJavadocDescription(cls, fields, propertyDescriptors, existingSchema, false); assertEquals("Record Object", existingSchema.getDescription()); Map properties = existingSchema.getProperties(); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/Example.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/Example.java index 46d6b944c..89c45f879 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/Example.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/Example.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app173; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/ExampleController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/ExampleController.java index b6950a013..d89a08db5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/ExampleController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/ExampleController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app173; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/SpringDocApp173Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/SpringDocApp173Test.java index 4fa2ec170..64dc67a46 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/SpringDocApp173Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app173/SpringDocApp173Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app173; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/ExampleController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/ExampleController.java index f437ca0d0..5915dc9bd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/ExampleController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/ExampleController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app174; @@ -36,7 +36,7 @@ class ExampleController { @PostMapping - public Test post(){ + public Test post() { return null; } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Question.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Question.java index 3b63c1ea8..3ea799228 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Question.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Question.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app174; @@ -43,6 +43,7 @@ }) public abstract class Question { private final String question; + private final String type; public Question(String question, String type) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/SpringDocApp174Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/SpringDocApp174Test.java index 84246cce2..cc513a28c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/SpringDocApp174Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/SpringDocApp174Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app174; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Test.java index 85cda2fd0..4b989a4ed 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app174; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TestQuestion.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TestQuestion.java index 21073cc9c..3ec63e95a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TestQuestion.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TestQuestion.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app174; @@ -38,6 +38,7 @@ class TestQuestion extends Question { * list of variants */ private final List variants; + /** * correct answer */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TextQuestion.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TextQuestion.java index 2a537732b..b739cb454 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TextQuestion.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app174/TextQuestion.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app174; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java index 8a567878e..de71d6fbc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app18; @@ -30,6 +30,7 @@ import jakarta.validation.constraints.NegativeOrZero; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Positive; import jakarta.validation.constraints.PositiveOrZero; import org.springframework.web.bind.annotation.GetMapping; @@ -45,7 +46,7 @@ class HelloController { /** * Persons string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons") @@ -56,7 +57,7 @@ public String persons(@NotBlank String name) { /** * Persons 2 string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons2") @@ -67,7 +68,7 @@ public String persons2(@NotBlank @Parameter(description = "persons name") String /** * Persons 3 string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons3") @@ -78,7 +79,7 @@ public String persons3(@NotBlank @Parameter(description = "persons name") @Reque /** * Persons 4 string. * - * @param age the age + * @param age the age * @return the string */ @GetMapping(value = "/persons4") @@ -89,7 +90,7 @@ public String persons4(@PositiveOrZero int age) { /** * Persons 5 string. * - * @param age the age + * @param age the age * @return the string */ @GetMapping(value = "/persons5") @@ -100,7 +101,7 @@ public String persons5(@NegativeOrZero int age) { /** * Persons 6 string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons6") @@ -108,4 +109,14 @@ public String persons6(@NotEmpty @Parameter(description = "persons name") String return "OK"; } + /** + * Persons 7 string. + * + * @param age the age + * @return the string + */ + @GetMapping(value = "/persons7") + public String persons7(@Positive int age) { + return "OK"; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java index 0a78466d8..c837dbcda 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app18/SpringDocApp18Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/HelloController.java index 9c934de7a..7454223fe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app19; @@ -42,7 +42,7 @@ class HelloController { /** * Persons string. * - * @param name the name + * @param name the name * @return the string */ @PostMapping(value = "/persons") @@ -53,7 +53,7 @@ public String persons(@RequestBody(description = "requestBody description as par /** * Persons 2 string. * - * @param name the name + * @param name the name * @return the string */ @RequestBody(description = "requestBody description outside") @@ -65,7 +65,7 @@ public String persons2(String name) { /** * Persons 3 string. * - * @param name the name + * @param name the name * @return the string */ @Operation(requestBody = @RequestBody(description = "requestBody inside operation annotation")) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java index 575afa798..b38ee79ac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app19/SpringDocApp19Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java index b890eb8b4..d03eaac73 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ApiUtil.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ApiUtil.java index aae08d565..2e71e3eb4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ApiUtil.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ApiUtil.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; @@ -42,9 +42,9 @@ class ApiUtil { /** * Sets example response. * - * @param req the req + * @param req the req * @param contentType the content type - * @param example the example + * @param example the example */ public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { try { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ExceptionTranslator.java index a79041463..9dc75f21b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/HomeController.java index 6bc9fc4fe..8393faa5c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApi.java index 47142103d..054214e91 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -102,7 +102,7 @@ default void addPet( /** * Delete pet response entity. * - * @param petId the pet id + * @param petId the pet id * @param apiKey the api key * @return the response entity */ @@ -189,8 +189,8 @@ default ResponseEntity updatePet( /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name + * @param petId the pet id + * @param name the name * @param status the status * @return the response entity */ @@ -208,9 +208,9 @@ default ResponseEntity updatePetWithForm( /** * Upload file response entity. * - * @param petId the pet id + * @param petId the pet id * @param additionalMetadata the additional metadata - * @param file the file + * @param file the file * @return the response entity */ @Operation(summary = "uploads an image", description = "", security = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiController.java index 224b691f2..62e924c03 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegate.java index 9cd0e4201..71b4ab4ca 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; @@ -69,7 +69,7 @@ default void addPet(Pet pet) { /** * Delete pet response entity. * - * @param petId the pet id + * @param petId the pet id * @param apiKey the api key * @return the response entity * @see PetApi#deletePet PetApi#deletePet @@ -152,8 +152,8 @@ default ResponseEntity updatePet(Pet pet) { /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name + * @param petId the pet id + * @param name the name * @param status the status * @return the response entity * @see PetApi#updatePetWithForm PetApi#updatePetWithForm @@ -168,9 +168,9 @@ default ResponseEntity updatePetWithForm(Long petId, /** * Upload file response entity. * - * @param petId the pet id + * @param petId the pet id * @param additionalMetadata the additional metadata - * @param file the file + * @param file the file * @return the response entity * @see PetApi#uploadFile PetApi#uploadFile */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegateImpl.java index e2771a869..a061de37c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/PetApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApi.java index 0f92f20d1..8e786ac6f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiController.java index 5f0204831..7ae17569d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegate.java index 59cafb2b2..decd328be 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegateImpl.java index d7bc3e5c0..29acca021 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/StoreApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApi.java index d69daa354..47e952bde 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -181,7 +181,7 @@ default ResponseEntity logoutUser() { * Update user response entity. * * @param username the username - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Updated user", tags = { "user" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiController.java index 1bf19064b..20e727135 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegate.java index 00a3666c8..b5165b2c3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; @@ -154,7 +154,7 @@ default ResponseEntity logoutUser() { * Update user response entity. * * @param username the username - * @param user the user + * @param user the user * @return the response entity * @see UserApi#updateUser UserApi#updateUser */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegateImpl.java index 0362cb087..7540859cc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/api/UserApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Category.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Category.java index 25acbb51a..6a9e2a23b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Category.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Category.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.model; @@ -46,6 +46,7 @@ class Category { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/ModelApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/ModelApiResponse.java index f9dd5efeb..8ce7e0b9c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/ModelApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/ModelApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.model; @@ -51,6 +51,7 @@ public class ModelApiResponse { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Order.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Order.java index 8ca543cae..20a4b9291 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Order.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Order.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.model; @@ -76,6 +76,7 @@ public class Order { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ @@ -295,15 +296,15 @@ public String toString() { */ public enum StatusEnum { /** - *Placed status enum. + * Placed status enum. */ PLACED("placed"), /** - *Approved status enum. + * Approved status enum. */ APPROVED("approved"), /** - *Delivered status enum. + * Delivered status enum. */ DELIVERED("delivered"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Pet.java index 57064373d..4408da561 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.model; @@ -82,6 +82,7 @@ public class Pet { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ @@ -327,15 +328,15 @@ public String toString() { */ public enum StatusEnum { /** - *Available status enum. + * Available status enum. */ AVAILABLE("available"), /** - *Pending status enum. + * Pending status enum. */ PENDING("pending"), /** - *Sold status enum. + * Sold status enum. */ SOLD("sold"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Tag.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Tag.java index c2f1a11a1..71654effd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Tag.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/Tag.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.model; @@ -49,6 +49,7 @@ class Tag { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/User.java index 9248a9036..77acb70c7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app2/model/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2.model; @@ -84,6 +84,7 @@ public class User { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/HelloController.java index 3e899721e..138697450 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java index 1d4fecbcd..7746dd784 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app20/SpringDocApp20Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/HelloController.java index 7a6e67727..e92f8399d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java index 17cd76363..9f2cade5b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/HelloController.java index 8098c0d31..04959109a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonDTO.java index 4045bacc0..4622de697 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app22; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java index b041e7144..a052ff4c7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app22/SpringDocApp22Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/HelloController.java index 7da8708d2..89e3938eb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java index 5bce0629d..0602a2c35 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app23/SpringDocApp23Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/HelloController.java index bc254a5fc..77ef9c63f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java index d4051f6be..b2ab3ef10 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocApp24Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocTestApp.java index 2b94d5432..111e58ff2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app24/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/HelloController.java index f2999f6e3..fa54e4621 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25; @@ -58,9 +58,9 @@ void check() { /** * List. * - * @param trackerId the tracker id - * @param startDate the start date - * @param endDate the end date + * @param trackerId the tracker id + * @param startDate the start date + * @param endDate the end date */ @GetMapping(value = "/list/{trackerId}") void list( @@ -75,7 +75,7 @@ void list( * * @param trackerId the tracker id * @param startDate the start date - * @param endDate the end date + * @param endDate the end date */ @GetMapping(value = "/secondlist/{trackerId}") void secondlist( @@ -88,10 +88,10 @@ void secondlist( /** * Third list. * - * @param trackerId the tracker id - * @param start the start - * @param end the end - * @param limit the limit + * @param trackerId the tracker id + * @param start the start + * @param end the end + * @param limit the limit */ @Operation(description = "Get last data from a tracker", parameters = { @Parameter(name = "trackerId", in = ParameterIn.PATH, required = true, schema = @Schema(type = "string", example = "the-tracker-id")), diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java index acfba1b74..888f05359 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app25/SpringDocApp25Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app25; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Bar.java index 05348a36b..dd3a26f13 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Foo.java index 6422501c6..79b2e23f2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/HelloController.java index b3fa71199..9b7ce4cdb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; @@ -38,7 +38,7 @@ class HelloController { /** * Persons my model. * - * @param myModel the my model + * @param myModel the my model * @return the my model */ @PostMapping(value = "/persons") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/MyModel.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/MyModel.java index 0bb4e9424..0a3f8a3ec 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/MyModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/MyModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java index 676e1211d..8540b6338 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app26/SpringDocApp26Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Advice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Advice.java index d5800a0c5..0e10d5913 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Advice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Advice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; @@ -43,8 +43,8 @@ class Advice { /** * Handle exception foo. * - * @param ex the ex - * @param request the request + * @param ex the ex + * @param request the request * @return the foo */ @ExceptionHandler(Exception.class) @@ -56,8 +56,8 @@ public Foo handleException(Exception ex, WebRequest request) { /** * Handle my exception bar. * - * @param ex the ex - * @param request the request + * @param ex the ex + * @param request the request * @return the bar */ @ExceptionHandler(MyException.class) @@ -69,8 +69,8 @@ public Bar handleMyException(MyException ex, WebRequest request) { /** * Handle my exception 2 bar. * - * @param ex the ex - * @param request the request + * @param ex the ex + * @param request the request * @return the bar */ @Hidden diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Bar.java index 232eb2b14..0a52cef1b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Foo.java index 14d650eb7..5e31fbf88 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java index 1fd75f436..f48452962 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/MyException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/MyException.java index 1a7451889..7e4b6397f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/MyException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/MyException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java index 7131c9db4..a4fcca190 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app27/SpringDocApp27Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java index 59b4a0d93..03803c41a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app28; @@ -41,8 +41,8 @@ class HelloController { /** * Upload 2 string. * - * @param one the one - * @param two the two + * @param one the one + * @param two the two * @return the string */ @PostMapping(value = "/upload2", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java index eda40b964..2bc307b03 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app28/SpringDocApp28Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/HelloController.java index 9d0e6dd28..e1c0b1989 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app29; @@ -47,7 +47,7 @@ class HelloController { /** * Post entity list. * - * @param postEntity the post entity + * @param postEntity the post entity * @return the list */ @PostMapping(value = "/post-entity") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java index 24f07d2d2..e520c2c97 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/SpringDocApp29Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/TrackerData.java index d05f6c62b..27b4694dd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/TrackerData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app29/TrackerData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java index 436d62124..abd696dbc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PersonDTO.java index 8b930f831..8de9beeff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; @@ -55,9 +55,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PlayingCard.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PlayingCard.java index 6575be910..7bc0da97b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PlayingCard.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/PlayingCard.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; @@ -108,19 +108,19 @@ public void setValue(Integer value) { */ public enum Suit { /** - *Hearts suit. + * Hearts suit. */ HEARTS("Hearts"), /** - *Diamonds suit. + * Diamonds suit. */ DIAMONDS("Diamonds"), /** - *Clubs suit. + * Clubs suit. */ CLUBS("Clubs"), /** - *Spades suit. + * Spades suit. */ SPADES("Spades"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java index 293b12b37..4572c2f6b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java index bd35f10a7..880daa714 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java index 3968b0316..97fceada2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app30/SpringDocApp30Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java index 2e8d6b126..24a9997ed 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app31; @@ -47,8 +47,8 @@ class HelloController { /** * Subscribe subscription response. * - * @param token the token - * @param url the url + * @param token the token + * @param url the url * @return the subscription response */ @PostMapping("/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java index 0364650ca..857fc1357 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app31/SpringDocApp31Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java index 201f11499..14d37a3d8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app32; @@ -43,7 +43,7 @@ class HelloController { /** * Filter post string. * - * @param filter the filter + * @param filter the filter * @return the string */ @RequestMapping(value = "/filter", method = RequestMethod.POST) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java index f845e714b..2707139b5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app32/SpringDocApp32Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java index 1a060e058..f94e74646 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app33; @@ -36,7 +36,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -44,8 +44,8 @@ class HelloController { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java index fb5c63a63..c7858a3a3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app33/SpringDocApp33Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/HelloController.java index 24483ad61..499f59b0d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; @@ -36,7 +36,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -44,8 +44,8 @@ class HelloController { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/MyExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/MyExceptionHandler.java index 757eab474..c624cf60f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/MyExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/MyExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; @@ -43,7 +43,7 @@ class MyExceptionHandler extends ResponseEntityExceptionHandler { /** * Bad object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(IllegalArgumentException.class) @@ -55,7 +55,7 @@ public Object bad(IllegalArgumentException e) { /** * Gateway object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(RuntimeException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java index b25bed593..6292cb72e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app34/SpringDocApp34Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/HelloController.java index 8023984ad..3aabba20d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java index 102d0c163..51acf1ba9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app35/SpringDocApp35Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Bar.java index 54516162e..253f89449 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Car.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Car.java index d557c4abb..d69e83c56 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Car.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Car.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Foo.java index 90f94ebd6..0172361d8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/HelloController.java index 5126211ad..a1941128e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; @@ -44,7 +44,7 @@ class HelloController { /** * Process foo. * - * @param a the a + * @param a the a * @return the foo */ @PostMapping(path = "/bar/baz", consumes = "application/x.a+json", produces = MediaType.TEXT_PLAIN_VALUE) @@ -55,7 +55,7 @@ public Foo process(@RequestBody Foo a) { /** * Process bar. * - * @param b the b + * @param b the b * @return the bar */ @PostMapping(path = "/bar/baz", consumes = "application/x.b+json", produces = MediaType.TEXT_PLAIN_VALUE) @@ -66,7 +66,7 @@ public Bar process(@RequestBody Bar b) { /** * Process car. * - * @param c the c + * @param c the c * @return the car */ @PostMapping(path = "/bar/baz", consumes = "application/x.c+json", produces = MediaType.APPLICATION_JSON_VALUE) @@ -78,7 +78,7 @@ public Car process(@RequestBody Car c) { /** * Pets post response entity. * - * @param pet the pet + * @param pet the pet * @return the response entity */ @PostMapping(value = "/pets1", consumes = "text/plain") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Pet.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Pet.java index 4ebad7d77..24200628a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java index 1019d24f1..a39a54bb4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app37/SpringDocApp37Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/HelloController.java index 1a20a7ff5..ce7f2049f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java index 26e02e666..03ecb7ced 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app38/SpringDocApp38Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java index 0f6e2b8b4..104114602 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app39; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java index c1fc8b815..f7064ea6c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocApp39Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app39; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java index 8af3b7043..bef23b2e4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app39/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app39; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java index 46c19fdd2..86756c696 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java index f81ae0c11..650081fb3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/TrackerData.java index cfa99ec6c..16f67f3b7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/TrackerData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app4/TrackerData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/HelloController.java index e8ef58a7d..d188d6bfd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app40; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/SpringDocApp40Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/SpringDocApp40Test.java index 5a0c6b75d..5433210d0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/SpringDocApp40Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app40/SpringDocApp40Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app40; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/HelloController.java index e85122053..c3e9e8992 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app41; @@ -51,7 +51,7 @@ class HelloController { /** * Gets file. * - * @param path the path + * @param path the path * @return the file */ @Operation(description = "Download file") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp411Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp411Test.java index c4c34d1cb..f69c10c4e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp411Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp411Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app41; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp41Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp41Test.java index 258a6c9d6..5fa863ea6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp41Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app41/SpringDocApp41Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app41; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/HelloController.java index 59ee9c8f2..5eef70069 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app42; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/SpringDocApp42Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/SpringDocApp42Test.java index 64f06b051..53b5b4eb0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/SpringDocApp42Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/SpringDocApp42Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app42; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/TweetId.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/TweetId.java index ded1a4b3d..2ab74756a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/TweetId.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app42/TweetId.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app42; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/HelloController.java index 5717612e9..235929b9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app43; @@ -43,7 +43,7 @@ class HelloController { /** * Upload documents response entity. * - * @param multipartFiles the multipart files + * @param multipartFiles the multipart files * @return the response entity */ @PostMapping(path = "/documents", consumes = "multipart/form-data") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/SpringDocApp43Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/SpringDocApp43Test.java index 67e8ff37f..456efd37e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/SpringDocApp43Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app43/SpringDocApp43Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app43; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/HelloController.java index 8758ad533..4c46c7b81 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app44; @@ -46,7 +46,7 @@ class HelloController { /** * Hello response entity. * - * @param request the request + * @param request the request * @return the response entity */ @PostMapping(value = "/helloworld", produces = "application/json", consumes = "application/vnd.v1+json") @@ -64,7 +64,7 @@ public ResponseEntity hello(@RequestBody RequestV1 request) { /** * Hello response entity. * - * @param request the request + * @param request the request * @return the response entity */ @PostMapping(value = "/helloworld", produces = "application/json", consumes = "application/vnd.v2+json") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/SpringDocApp44Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/SpringDocApp44Test.java index c2c9c52a5..2130db3d4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/SpringDocApp44Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app44/SpringDocApp44Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app44; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController.java index 01f3f23a5..f17f99089 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController2.java index 4d9ec2913..189f573a9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/HelloController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/OpenApiConfig.java index b1d5d3752..a8897a365 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/PersonDTO.java index 3600f7d80..d996912d9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app45; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/SpringDocApp45Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/SpringDocApp45Test.java index 8f605d577..512307e56 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/SpringDocApp45Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app45/SpringDocApp45Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/HelloController.java index d67822c5a..7a318c2fb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app46; @@ -46,7 +46,7 @@ class HelloController { /** * Persons string. * - * @param subscriptionId the subscription id + * @param subscriptionId the subscription id * @return the string */ @GetMapping("/persons/{subscriptionId}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/SpringDocApp46Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/SpringDocApp46Test.java index 1fc002c08..906414088 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/SpringDocApp46Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app46/SpringDocApp46Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app46; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/HelloController.java index db5b688ae..79292f8f8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app47; @@ -44,7 +44,7 @@ class HelloController { /** * Gets documents with locale. * - * @param locale the locale + * @param locale the locale * @return the documents with locale */ @GetMapping(path = "/documents/{locale}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/SpringDocApp47Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/SpringDocApp47Test.java index c571f0437..01c5d3750 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/SpringDocApp47Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app47/SpringDocApp47Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app47; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/AbstractHelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/AbstractHelloController.java index 79bbe1aa6..2b0bcf86e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/AbstractHelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/AbstractHelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app48; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/HelloController.java index 2d8d1d394..6b66a91b4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app48; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/SpringDocApp48Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/SpringDocApp48Test.java index f173d2df1..174713f68 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/SpringDocApp48Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app48/SpringDocApp48Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app48; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/HelloController.java index 99c2959af..f67e3aed9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app49; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocApp49Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocApp49Test.java index 4047cc135..77d6c592f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocApp49Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocApp49Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app49; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocTestApp.java index 711f49f78..fd8e1ac71 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app49/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app49; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/CustomOpenAPIConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/CustomOpenAPIConfig.java index 18c2c5c8a..8dcf80e7e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/CustomOpenAPIConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/CustomOpenAPIConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java index 8e3124f43..7e975fa21 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5.sample; @@ -58,6 +58,7 @@ class OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest extends Abst * Given: Bean configuration with security scheme http basic (shouldDefineComponentsSecuritySchemesForHttpBasic) * When: Get api-docs * Then: Return security definitions http basic + * * @throws Exception the exception */ @Test @@ -75,6 +76,7 @@ protected void testApp() throws Exception { * Given: Bean configuration with security scheme API key * When: Get api-docs * Then: Return security definitions with API key + * * @throws Exception the exception */ @Test @@ -92,6 +94,7 @@ void shouldDefineComponentsSecuritySchemesForApiKey() throws Exception { * Given: Bean configuration with security scheme OAuth2 * When: Get api-docs * Then: Return security definitions with OAuth + * * @throws Exception the exception */ @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceCustomConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceCustomConfigurationTest.java index 3763326b9..139fa3b0b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceCustomConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceCustomConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5.sample; @@ -49,6 +49,7 @@ class OpenApiResourceCustomConfigurationTest extends AbstractSpringDocTest { /** * givenNoConfiguration_whenGetApiJson_returnsDefaultEmptyDocs - should return * {"openapi":"3.0.1","info":{"title":"Custom API","version":"100"},"paths":{},"components":{}} + * * @throws Exception the exception */ @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceNoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceNoConfigurationTest.java index 1b42a913d..fc5375a00 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceNoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app5/sample/OpenApiResourceNoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5.sample; @@ -46,6 +46,7 @@ class OpenApiResourceNoConfigurationTest extends AbstractSpringDocTest { /** * givenNoConfiguration_whenGetApiJson_returnsDefaultEmptyDocs - should return * {"openapi":"3.0.1","info":{"title":"OpenAPI definition","version":"v0"},"paths":{},"components":{}} + * * @throws Exception the exception */ @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/HelloController.java index 65a7bfa90..d1d0512b8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app50; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocApp50Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocApp50Test.java index 935a662b6..9498e76da 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocApp50Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocApp50Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app50; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocTestApp.java index 5c0e07b52..011bfa799 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app50/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app50; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/HelloController.java index c290c3f2d..ff63c49e6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app51; @@ -63,7 +63,7 @@ public String test1() { /** * Test 2 string. * - * @param param1 the param 1 + * @param param1 the param 1 * @return the string */ @Operation(parameters = { @@ -76,7 +76,7 @@ public String test2(@RequestParam(name = "param1") String param1) { /** * Test 3 string. * - * @param param1 the param 1 + * @param param1 the param 1 * @return the string */ @Operation(parameters = { @@ -91,8 +91,8 @@ public String test3( /** * Get string. * - * @param path the path - * @param params the params + * @param path the path + * @param params the params * @return the string */ @GetMapping("/test/{path}") @@ -105,7 +105,7 @@ public String get( /** * Hello response entity. * - * @param map the map + * @param map the map * @return the response entity */ @PostMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/SpringDocApp51Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/SpringDocApp51Test.java index 9ca3c390b..f8bab4804 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/SpringDocApp51Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app51/SpringDocApp51Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app51; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java index 26c219e90..f8d84f11b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app52; @@ -44,9 +44,9 @@ class HelloController { /** * Create test 1 string. * - * @param username the username - * @param test the test - * @param imageFile the image file + * @param username the username + * @param test the test + * @param imageFile the image file * @return the string */ @PostMapping(value = "/test1/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @@ -58,9 +58,9 @@ public String createTest1(@PathVariable String username, @RequestPart("test") My /** * Create test 2 string. * - * @param username the username - * @param imageFile the image file - * @param test the test + * @param username the username + * @param imageFile the image file + * @param test the test * @return the string */ @PostMapping(value = "/test2/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @@ -72,8 +72,8 @@ public String createTest2(@PathVariable String username, @RequestPart("image") M /** * Create test 3 string. * - * @param test the test - * @param multipartFiles the multipart files + * @param test the test + * @param multipartFiles the multipart files * @return the string */ @PostMapping(value = "/test3", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/SpringDocApp52Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/SpringDocApp52Test.java index aef9dfa1d..bf19e02ba 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/SpringDocApp52Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app52/SpringDocApp52Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app52; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloController.java index 8b8d694a8..fe9e87192 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app53; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloControllerWithGlobalApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloControllerWithGlobalApiResponse.java index 8999fbd28..98eadac08 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloControllerWithGlobalApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/HelloControllerWithGlobalApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app53; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/SpringDocApp53Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/SpringDocApp53Test.java index 952e2319a..c72e8569f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/SpringDocApp53Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app53/SpringDocApp53Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app53; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/HelloController.java index 17e4e4390..3b3b5e5c6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app54; @@ -47,7 +47,7 @@ class HelloController { /** * Gets meal party. * - * @param mealPartyId the meal party id + * @param mealPartyId the meal party id * @return the meal party */ @GetMapping(value = "/parties/{id}") @@ -61,7 +61,7 @@ public MealParty getMealParty(@PathVariable("id") long mealPartyId) { /** * Save meal party response entity. * - * @param p the p + * @param p the p * @return the response entity */ @JsonView(Views.MealPartyAdmin.class) @@ -73,7 +73,7 @@ public ResponseEntity saveMealParty(@JsonView(Views.Public.class) @Re /** * Save meal new party response entity. * - * @param p the p + * @param p the p * @return the response entity */ @JsonView(Views.MealPartyAdmin.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/MealParty.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/MealParty.java index ac1291fc7..f6726d069 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/MealParty.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/MealParty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app54; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/SpringDocApp54Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/SpringDocApp54Test.java index 07632de24..9663b0325 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/SpringDocApp54Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/SpringDocApp54Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app54; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/Views.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/Views.java index a48628620..787a03e2c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/Views.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app54/Views.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app54; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/HelloController.java index f35b32f8b..0dd7c4527 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app55; @@ -47,6 +47,7 @@ class HelloController { /** * Ping endpoint used for health checks. + * * @return the boolean */ @RequestMapping(value = "/ping", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/SpringDocApp55Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/SpringDocApp55Test.java index 9f5d45444..8862eb4b2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/SpringDocApp55Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app55/SpringDocApp55Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app55; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/GlobalExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/GlobalExceptionHandler.java index f1ba375c9..77bf6d5d6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/GlobalExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/GlobalExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app56; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/HelloController.java index 0e4464166..9d3f09af4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app56; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/SpringDocApp56Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/SpringDocApp56Test.java index 9dcbcd8f3..6d01b1798 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/SpringDocApp56Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app56/SpringDocApp56Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app56; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/HelloController.java index d7ead7493..f0c442eb9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app57; @@ -42,7 +42,7 @@ class HelloController { /** * Gets text. * - * @param name the name + * @param name the name * @return the text */ @GetMapping("/{name:.+}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/SpringDocApp57Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/SpringDocApp57Test.java index 3511822c8..ef851f227 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/SpringDocApp57Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app57/SpringDocApp57Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app57; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/HelloController.java index cf782375f..52b7d63ce 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app58; @@ -46,7 +46,7 @@ class HelloController { /** * Example object. * - * @param json the json + * @param json the json * @return the object */ @PostMapping("/examplePost") @@ -115,9 +115,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/SpringDocApp58Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/SpringDocApp58Test.java index 4f05365a9..a4085ba69 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/SpringDocApp58Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app58/SpringDocApp58Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app58; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/HelloController.java index 9cec571c8..4834e25ac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app59; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/SpringDocApp59Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/SpringDocApp59Test.java index 429381cb8..a4d5d7544 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/SpringDocApp59Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app59/SpringDocApp59Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app59; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/HelloController.java index e5c7af757..5839a68fd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java index 01cb8c177..62e0e4e3a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/HelloController.java index 2540f06c5..ee91939fa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app60; @@ -44,8 +44,8 @@ class HelloController { /** * List 1 list. * - * @param page the page - * @param size the size + * @param page the page + * @param size the size * @return the list */ @GetMapping("/hello1") @@ -61,9 +61,9 @@ public List list1(String page, String size) { /** * List 2 list. * - * @param page the page - * @param size the size - * @param sort the sort + * @param page the page + * @param size the size + * @param sort the sort * @return the list */ @GetMapping("/hello2") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QueryPaging.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QueryPaging.java index 6a161b7fa..be67d7ec1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QueryPaging.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QueryPaging.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app60; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QuerySort.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QuerySort.java index 4d8739dee..5ddf174ad 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QuerySort.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/QuerySort.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app60; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/SpringDocApp60Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/SpringDocApp60Test.java index 45d3b2fbf..8eb995eea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/SpringDocApp60Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app60/SpringDocApp60Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app60; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/HelloController.java index 040410960..e1bf18e03 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app61; @@ -46,10 +46,10 @@ class HelloController { /** * Persons string. * - * @param name the name - * @param phone the phone - * @param createdFrom the created from - * @param createdRange the created range + * @param name the name + * @param phone the phone + * @param createdFrom the created from + * @param createdRange the created range * @return the string */ @Operation(description = "List", parameters = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/SpringDocApp61Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/SpringDocApp61Test.java index c0632a6a1..c56a3fa21 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/SpringDocApp61Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app61/SpringDocApp61Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app61; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/BaseController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/BaseController.java index 672120f2e..4e4b19ef4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/BaseController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app62; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/SpringDocApp62Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/SpringDocApp62Test.java index c2c58df37..4498b3be1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/SpringDocApp62Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/SpringDocApp62Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app62; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/TestController.java index 11e4e920f..dd288ab46 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app62/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app62; @@ -43,7 +43,7 @@ class TestController { /** * Test string. * - * @param accept the accept + * @param accept the accept * @return the string */ @RequestMapping(value = "/test", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java index 168c96215..a25442519 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app63; @@ -44,11 +44,11 @@ class HelloController { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java index 6c5ef5552..573179ce1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app63/SpringDocApp63Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app63; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java index b3bd2447e..9b126671c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app64; @@ -49,7 +49,7 @@ public void test1(String hello) { /** * Test 2 string. * - * @param from the from + * @param from the from * @return the string */ @GetMapping(value = "/api/balance/abcd") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java index a867eddb8..63e942c5c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app64/SpringDocApp64Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app64; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java index e8402c1a7..367f2386c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app65; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java index 9af63f98b..596a9f6c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app65/SpringDocApp65Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app65; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/DefaultHealthCheckApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/DefaultHealthCheckApi.java index 42c3ee8d0..94ef552c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/DefaultHealthCheckApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/DefaultHealthCheckApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66; @@ -46,7 +46,7 @@ class DefaultHealthCheckApi { /** * Test date echo string. * - * @param date the date + * @param date the date * @return the string */ @GetMapping("/test/date/echo/{date}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/HelloController.java index 85104d338..5d4690624 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66; @@ -44,7 +44,7 @@ class HelloController { /** * Ping response entity. * - * @param possiblyInjectedByAspect the possibly injected by aspect + * @param possiblyInjectedByAspect the possibly injected by aspect * @return the response entity */ @Operation(summary = "Check server status", description = "Check server status, will return 200 with simple string if alive. Do nothing else.") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java index 1ff1c5b44..da3816173 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/SpringDocApp66Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/UndocumentedClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/UndocumentedClass.java index 949bfc690..d5bc95c39 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/UndocumentedClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app66/UndocumentedClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app66; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java index e0715d068..69a9b5225 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app67; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java index dca46fd91..ea40f9e0d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app67/SpringDocApp67Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app67; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/HelloController.java index a4890693d..03eec7a4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; @@ -42,7 +42,7 @@ class HelloController { /** * Gets tasks. * - * @param str the str + * @param str the str * @return the tasks */ @RequestMapping(value = "/tasks", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/PersonDTO.java index 017406145..3f77e9378 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java index 7700a90a4..461ba3e8e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app69/SpringDocApp69Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app69; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java index 30975a6f4..b224b9112 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java index 4cbd4373b..a0bceec11 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/HelloController.java index 91559c0e5..b1249b3db 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; @@ -45,7 +45,7 @@ class HelloController { /** * Test api type. * - * @param test the test + * @param test the test * @return the api type */ @CustomizedOperation diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java index 29de676fe..d779c0763 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/SpringDocApp70Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedOperation.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedOperation.java index 43d2df3d2..2ba37a976 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedOperation.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedOperation.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70.customizer; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedParameter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedParameter.java index bcbb8590d..2ef792296 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedParameter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedParameter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70.customizer; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedProperty.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedProperty.java index 6722f8387..3c65a16f1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedProperty.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/CustomizedProperty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70.customizer; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/OperationCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/OperationCustomizer.java index 46aba35a4..a905c44eb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/OperationCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/OperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70.customizer; @@ -39,8 +39,8 @@ class OperationCustomizer implements org.springdoc.core.customizers.OperationCus /** * Customize operation. * - * @param operation the operation - * @param handlerMethod the handler method + * @param operation the operation + * @param handlerMethod the handler method * @return the operation */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/ParameterCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/ParameterCustomizer.java index b0c8e99f7..aeeaaaa2e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/ParameterCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/ParameterCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70.customizer; @@ -39,8 +39,8 @@ class ParameterCustomizer implements org.springdoc.core.customizers.ParameterCus /** * Customize parameter. * - * @param parameterModel the parameter model - * @param methodParameter the method parameter + * @param parameterModel the parameter model + * @param methodParameter the method parameter * @return the parameter */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/PropertyCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/PropertyCustomizer.java index a09a3292e..934c64e7d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/PropertyCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/customizer/PropertyCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70.customizer; @@ -53,8 +53,8 @@ class PropertyCustomizer implements org.springdoc.core.customizers.PropertyCusto /** * Customize schema. * - * @param property the property - * @param type the type + * @param property the property + * @param type the type * @return the schema */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/model/ApiType.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/model/ApiType.java index 5a6f86a9e..29554196b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/model/ApiType.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app70/model/ApiType.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app70.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/Dog.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/Dog.java index e7a5e9b24..7346fcb45 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/Dog.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/Dog.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app71; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/HelloController.java index 03c21171b..bc73aa2cd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app71; @@ -38,7 +38,7 @@ class HelloController { /** * Persons string. * - * @param dog the dog + * @param dog the dog * @return the string */ @PostMapping("/persons") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java index 9e35bf5e2..4bcc86ab1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app71/SpringDocApp71Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app71; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java index e1c284b74..fa1de2f27 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/BlockingAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java index d7aca3501..8f5aa0f72 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/CacheAutoConfigurationTest1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java index 1c4ef5862..1c1a680aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app72/GroupAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/HelloController.java index a909b0fe3..ed047757d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app73; @@ -48,8 +48,8 @@ class HelloController { /** * Delete. * - * @param countryCode the country code - * @param id the id + * @param countryCode the country code + * @param id the id */ @DeleteMapping("/{id}") @ResponseStatus(HttpStatus.NO_CONTENT) @@ -61,7 +61,7 @@ public void delete(@Parameter(name = "country_code", in = ParameterIn.QUERY) Str * Get string. * * @param countryCode the country code - * @param id the id + * @param id the id * @return the string */ @GetMapping("/{id}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java index 1d7d8fc88..8dad5b0da 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app73/SpringDocApp73Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app73; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/HelloController.java index 35b32bd1a..b2f148d85 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app74; @@ -43,7 +43,7 @@ class HelloController { /** * Post my request body string. * - * @param myRequestBody the my request body + * @param myRequestBody the my request body * @return the string */ @PostMapping("/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java index 169cbf8cd..dfc974c4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app74/SpringDocApp74Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app74; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/HelloController.java index da686a248..cf87c8ee5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/PersonDTO.java index 53feafd13..182c469fd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/RestResponseEntityExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/RestResponseEntityExceptionHandler.java index 01dfc2d68..e47975081 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/RestResponseEntityExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/RestResponseEntityExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; @@ -46,8 +46,8 @@ class RestResponseEntityExceptionHandler /** * Bad request response entity. * - * @param req the req - * @param exception the exception + * @param req the req + * @param exception the exception * @return the response entity */ @ResponseStatus(value = HttpStatus.OK) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java index b43ab18c1..739be51d1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app75/SpringDocApp75Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app75; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/HelloController.java index 2685c3dcf..65d43465b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app76; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/SpringDocApp76Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/SpringDocApp76Test.java index 2e37f74b5..49a046c72 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/SpringDocApp76Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app76/SpringDocApp76Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app76; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/HelloController.java index 7a30804b3..51282c25c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app77; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/SpringDocApp77Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/SpringDocApp77Test.java index 46f805d5b..6d65a1aae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/SpringDocApp77Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app77/SpringDocApp77Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app77; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java index 001a4367b..e945e1751 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app78; @@ -43,7 +43,7 @@ class HelloController { /** * Gets person 1. * - * @param str the str + * @param str the str * @return the person 1 */ @RequestMapping(value = "/person1", method = RequestMethod.GET) @@ -54,7 +54,7 @@ private CompletionStage> getPerson1(String str) { /** * Gets person 2. * - * @param str the str + * @param str the str * @return the person 2 */ @RequestMapping(value = "/person2", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/PersonDTO.java index 0ffb34f70..98707cb15 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app78; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java index f6e6360fd..69fd669e5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app78/SpringDocApp78Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app78; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/HelloController.java index 297f66ea2..b7035419c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app79; @@ -42,7 +42,7 @@ class HelloController { /** * Echo string. * - * @param text the text + * @param text the text * @return the string */ @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE, path = "/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java index ece32eeee..20969485a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app79/SpringDocApp79Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app79; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/HelloController.java index 72994c474..a85eefc89 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java index 261a1bef3..7d8cd4b2d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/HelloController.java index 4a70e5ecf..afa5889d0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app80; @@ -46,8 +46,8 @@ class HelloController { /** * Testpost 1 response entity. * - * @param dto the dto - * @return the response entity + * @param dto the dto + * @return the response entity * @throws URISyntaxException the uri syntax exception */ @RequestMapping(value = "/testpost1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @@ -58,8 +58,8 @@ public ResponseEntity testpost1(@RequestBody TestObject dto) throws /** * Testpost 2 response entity. * - * @param dto the dto - * @return the response entity + * @param dto the dto + * @return the response entity * @throws URISyntaxException the uri syntax exception */ @RequestMapping(value = "/testpost2", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @@ -70,7 +70,7 @@ public ResponseEntity testpost2(@RequestBody TestObject dto) throws /** * Hello response entity. * - * @return the response entity + * @return the response entity * @throws URISyntaxException the uri syntax exception */ @RequestMapping(value = "/hello", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java index d696b7f07..83782af1e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/SpringDocApp80Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app80; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/TestObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/TestObject.java index 58c957f54..d079cc5bc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/TestObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app80/TestObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app80; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/HelloController.java index add396316..7756fd9c2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app81; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java index 6ce67cf8c..e2d6c47ff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app81/SpringDocApp81Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app81; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/HelloController.java index beed630e7..51e796566 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; @@ -40,9 +40,9 @@ class HelloController { /** * Put response entity. * - * @param configuration the configuration - * @param second the second - * @param personDTO the person dto + * @param configuration the configuration + * @param second the second + * @param personDTO the person dto * @return the response entity */ @PutMapping(value = "/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/PersonDTO.java index 5e4818438..2cc23e9e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java index 9ea40348b..c4d77a098 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app82/SpringDocApp82Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app82; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/HelloController.java index 898a92105..a3577164a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; @@ -48,9 +48,9 @@ class HelloController { /** * Put response entity. * - * @param config the config - * @param configuration the configuration - * @param aFile the a file + * @param config the config + * @param configuration the configuration + * @param aFile the a file * @return the response entity */ @RequestMapping(value = "/{config}", diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/PersonDTO.java index cca50b971..98399196a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java index 07ad1db4d..bbde77797 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app83/SpringDocApp83Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app83; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/HelloController.java index 3f8aaa020..f4419157a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app84; @@ -50,7 +50,7 @@ public String persons() { /** * Persons string. * - * @param toto the toto + * @param toto the toto * @return the string */ @GetMapping("/persons1") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java index 6b305a50c..0e8628bf5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app84/SpringDocApp84Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app84; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/HelloController.java index c96c2c93a..491493a18 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java index 52b9f6d52..4a309c029 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app85/SpringDocApp85Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app85; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/HelloController.java index ca37fb711..3ec531636 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86; @@ -44,11 +44,11 @@ class HelloController { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java index d42da0ad2..b946048fe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/SpringDocApp86Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/test/HelloController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/test/HelloController2.java index 887022a44..0b9b75c42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/test/HelloController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app86/test/HelloController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app86.test; @@ -44,11 +44,11 @@ class HelloController2 { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test2") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/HelloController.java index af460d82d..3c56cb869 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app87; @@ -49,7 +49,7 @@ class HelloController { * * @param cookie the cookie * @param itemId the item id - * @param item the item + * @param item the item * @return the response entity */ @PutMapping("/{itemId}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java index 8a148885c..14a161966 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app87/SpringDocApp87Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app87; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/HelloController.java index 972684e93..6aa830b66 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app88; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java index dc5bd3618..2280cfb42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app88/SpringDocApp88Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app88; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/HelloController.java index 6434aa907..a93008444 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app89; @@ -43,7 +43,7 @@ class HelloController { /** * Gets address. * - * @param id the id + * @param id the id * @return the address */ @Operation(summary = "Get Status") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java index 1ae41bca4..0262eb226 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app89/SpringDocApp89Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app89; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApi.java index b0e7ed46e..febed2085 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; @@ -44,7 +44,7 @@ public interface MyApi { /** * Get string. * - * @param language the language + * @param language the language * @return the string */ @Operation(description = "Annotations from interfaces test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApiController.java index bc0c835a6..6cb5edfa0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/MyApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; @@ -40,7 +40,7 @@ class MyApiController implements MyApi { /** * Get string. * - * @param language the language + * @param language the language * @return the string */ public String get(String language) { @@ -51,7 +51,7 @@ public String get(String language) { /** * Gets code. * - * @param code the code + * @param code the code * @return the code */ @Operation(description = "Annotations from class with hidden parameter code") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java index e2268f485..6cdaffcb0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/HelloController.java index d8a5d7479..c1a84c3dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java index f9cefdf96..1c7a7177b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocApp90Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocTestApp.java index 039ab29a7..f64702bbc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/User.java index d378af816..ceef126c1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app90/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app90; @@ -35,8 +35,6 @@ * User */ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2019-11-30T09:49:26.034469-01:00[Atlantic/Azores]") - - class User { /** @@ -106,7 +104,7 @@ class User { /** * Id user. * - * @param id the id + * @param id the id * @return the user */ public User id(Long id) { @@ -140,7 +138,7 @@ public void setId(Long id) { /** * Username user. * - * @param username the username + * @param username the username * @return the user */ public User username(String username) { @@ -174,7 +172,7 @@ public void setUsername(String username) { /** * First name user. * - * @param firstName the first name + * @param firstName the first name * @return the user */ public User firstName(String firstName) { @@ -208,7 +206,7 @@ public void setFirstName(String firstName) { /** * Last name user. * - * @param lastName the last name + * @param lastName the last name * @return the user */ public User lastName(String lastName) { @@ -242,7 +240,7 @@ public void setLastName(String lastName) { /** * Email user. * - * @param email the email + * @param email the email * @return the user */ public User email(String email) { @@ -276,7 +274,7 @@ public void setEmail(String email) { /** * Password user. * - * @param password the password + * @param password the password * @return the user */ public User password(String password) { @@ -310,7 +308,7 @@ public void setPassword(String password) { /** * Phone user. * - * @param phone the phone + * @param phone the phone * @return the user */ public User phone(String phone) { @@ -344,7 +342,7 @@ public void setPhone(String phone) { /** * User status user. * - * @param userStatus the user status + * @param userStatus the user status * @return the user */ public User userStatus(Integer userStatus) { @@ -378,7 +376,7 @@ public void setUserStatus(Integer userStatus) { /** * Equals boolean. * - * @param o the o + * @param o the o * @return the boolean */ @Override @@ -435,7 +433,8 @@ public String toString() { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private String toIndentedString(Object o) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Advice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Advice.java index d49dc80b3..aedcb72d5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Advice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Advice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app91; @@ -49,8 +49,8 @@ class Advice { /** * Bad request response entity. * - * @param req the req - * @param exception the exception + * @param req the req + * @param exception the exception * @return the response entity */ @ExceptionHandler(TypeMismatchException.class) @@ -80,8 +80,8 @@ public ResponseEntity badRequest(HttpServletRequest req, Exception exc /** * Internal server error response entity. * - * @param req the req - * @param exception the exception + * @param req the req + * @param exception the exception * @return the response entity */ @ExceptionHandler(Exception.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/ApiError.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/ApiError.java index 8e02bb9e7..a35c8574b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/ApiError.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/ApiError.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app91; @@ -67,9 +67,9 @@ class ApiError { /** * Instantiates a new Api error. * - * @param status the status - * @param errorCode the error code - * @param message the message + * @param status the status + * @param errorCode the error code + * @param message the message */ public ApiError(int status, String errorCode, String message) { this.status = status; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Greeting.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Greeting.java index 74de2eb62..6db25d784 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Greeting.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/Greeting.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app91; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/GreetingController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/GreetingController.java index 744d4832f..ee3478afa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/GreetingController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/GreetingController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app91; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/SpringDocApp91Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/SpringDocApp91Test.java index 53292a5a8..5c7e9a1e1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/SpringDocApp91Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app91/SpringDocApp91Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app91; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/HelloController.java index 5f814955a..70d246e48 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app92; @@ -42,7 +42,7 @@ class HelloController { /** * Index string. * - * @param test the test + * @param test the test * @return the string */ @GetMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/ParameterCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/ParameterCustomizer.java index 617c2befd..1515b3270 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/ParameterCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/ParameterCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app92; @@ -40,8 +40,8 @@ class ParameterCustomizer implements org.springdoc.core.customizers.ParameterCus /** * Customize parameter. * - * @param parameterModel the parameter model - * @param methodParameter the method parameter + * @param parameterModel the parameter model + * @param methodParameter the method parameter * @return the parameter */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/SpringDocApp92Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/SpringDocApp92Test.java index 5a8839d36..40676fe00 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/SpringDocApp92Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app92/SpringDocApp92Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app92; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseClientModel.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseClientModel.java index bfca1bbc1..5e048fa73 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseClientModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseController.java index 70bf8fc7e..9b730c9cd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app93; @@ -33,13 +33,13 @@ /** * The type Base controller. * - * @param the type parameter + * @param the type parameter */ public abstract class BaseController { /** * Get t client model. * - * @param param the param + * @param param the param * @return the t client model */ @Operation diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificClientModel.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificClientModel.java index 301a05524..8a5d56cb9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificClientModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificController.java index 729eaaddd..2f3b72b44 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpecificController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpringDocApp93Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpringDocApp93Test.java index 8fae2b218..b57a6f801 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpringDocApp93Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app93/SpringDocApp93Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/Greeting.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/Greeting.java index 3acdad822..51412e6e8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/Greeting.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/Greeting.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app94; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java index 4ce7f653d..39b866064 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app94/SpringDocApp94Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app94; @@ -102,8 +102,8 @@ public OpenApiBuilderCustomizer customOpenAPI() { /** * Default test handler mapping request mapping handler mapping. * - * @param greetingController the greeting controller - * @return the request mapping handler mapping + * @param greetingController the greeting controller + * @return the request mapping handler mapping * @throws NoSuchMethodException the no such method exception */ @Bean @@ -122,12 +122,12 @@ public RequestMappingHandlerMapping defaultTestHandlerMapping(GreetingController * Open api resource open api web mvc resource. * * @param openAPIBuilderObjectFactory the open api builder object factory - * @param requestBuilder the request builder - * @param responseBuilder the response builder - * @param operationParser the operation parser - * @param springDocConfigProperties the spring doc config properties - * @param springDocProviders the spring doc providers - * @param springDocCustomizers the spring doc customizers + * @param requestBuilder the request builder + * @param responseBuilder the response builder + * @param operationParser the operation parser + * @param springDocConfigProperties the spring doc config properties + * @param springDocProviders the spring doc providers + * @param springDocCustomizers the spring doc customizers * @return the open api web mvc resource */ @Bean(name = "openApiResource") @@ -142,7 +142,7 @@ public OpenApiWebMvcResource openApiResource(ObjectFactory openA /** * Sets application context. * - * @param applicationContext the application context + * @param applicationContext the application context * @throws BeansException the beans exception */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/HelloController.java index 645a1ded4..b41641271 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app95; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/SpringDocApp95Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/SpringDocApp95Test.java index 5825c21ae..f0b71a550 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/SpringDocApp95Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app95/SpringDocApp95Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app95; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/HelloController.java index 5a1e98c5b..65d13a901 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app96; @@ -43,7 +43,7 @@ class HelloController { /** * Test 1 string. * - * @param test the test + * @param test the test * @return the string */ @PostMapping("/api1") @@ -54,7 +54,7 @@ String test1(@RequestBody @Min(2) int test) { /** * Test 2 string. * - * @param test the test + * @param test the test * @return the string */ @PostMapping("/api2") @@ -65,7 +65,7 @@ String test2(@RequestBody String test) { /** * Test 3 string. * - * @param test the test + * @param test the test * @return the string */ @PostMapping("/api3") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/SpringDocApp96Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/SpringDocApp96Test.java index 4047322f7..1259b1eb2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/SpringDocApp96Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app96/SpringDocApp96Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app96; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/HelloController.java index 96656d538..796923b56 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/SpringDocApp97Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/SpringDocApp97Test.java index ef92e1ecd..719b51ae5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/SpringDocApp97Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/SpringDocApp97Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV1.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV1.java index 19df77966..47981cc34 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV1.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV2.java index 424465428..e8a9cd659 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV3.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV3.java index 5ed3c6859..ba6e44c58 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV3.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app97/StudentV3.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/HelloController.java index 187887983..3ab4b79f5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app98; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/IgnoredAnnotationParameter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/IgnoredAnnotationParameter.java index 43d67d01c..cdda0f19a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/IgnoredAnnotationParameter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/IgnoredAnnotationParameter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app98; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/SpringDocApp98Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/SpringDocApp98Test.java index 904f44bda..8ff8e556d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/SpringDocApp98Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app98/SpringDocApp98Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app98; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/HelloController.java index 1d7974240..35b27ff73 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app99; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/SpringDocApp99Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/SpringDocApp99Test.java index 09403cf14..a08c94b26 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/SpringDocApp99Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v30/app99/SpringDocApp99Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app99; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index b8893cc2d..43bc8b281 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiException.java index dad236231..1b92dae6e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -47,7 +47,7 @@ public final class ApiException extends Exception { * Instantiates a new Api exception. * * @param code the code - * @param msg the msg + * @param msg the msg */ public ApiException(int code, String msg) { super(msg); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiOriginFilter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiOriginFilter.java index 5e90f1014..e9e051317 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiOriginFilter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiOriginFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -42,10 +42,10 @@ class ApiOriginFilter implements jakarta.servlet.Filter { /** * Do filter. * - * @param request the request + * @param request the request * @param response the response - * @param chain the chain - * @throws IOException the io exception + * @param chain the chain + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiResponseMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiResponseMessage.java index 085d1feab..b52b36f20 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiResponseMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ApiResponseMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -83,7 +83,7 @@ public ApiResponseMessage() { /** * Instantiates a new Api response message. * - * @param code the code + * @param code the code * @param message the message */ public ApiResponseMessage(int code, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ErrorMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ErrorMessage.java index 6ca3d831a..b8c786b14 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ErrorMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ErrorMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -44,7 +44,7 @@ class ErrorMessage { /** * Instantiates a new Error message. * - * @param id the id + * @param id the id * @param message2 the message 2 */ public ErrorMessage(String id, String message2) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ExceptionTranslator.java index dd71a4cfe..be04b6005 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -65,7 +65,7 @@ public ResponseEntity handleRunTimeException(RuntimeException e) { * Error response entity. * * @param status the status - * @param e the e + * @param e the e * @return the response entity */ private ResponseEntity error(HttpStatus status, Exception e) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java index c28db707c..ce5c00197 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -44,7 +44,7 @@ class HelloController { /** * Index string. * - * @param numTel the num tel + * @param numTel the num tel * @param adresse the adresse * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HomeController.java index e4d4638cd..7b0ff7b7b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApi.java index 1c9d5ed95..28af45a75 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -74,8 +74,8 @@ ResponseEntity addInventory( * Search inventory response entity. * * @param searchString the search string - * @param skip the skip - * @param limit the limit + * @param skip the skip + * @param limit the limit * @return the response entity */ @Operation(description = "searches inventory", operationId = "searchInventory", summary = "By passing in the appropriate options, you can search for available inventory in the system ", tags = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApiController.java index e7bf184d8..7d327375a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -64,7 +64,7 @@ class InventoryApiController implements InventoryApi { * Instantiates a new Inventory api controller. * * @param objectMapper the object mapper - * @param request the request + * @param request the request */ @org.springframework.beans.factory.annotation.Autowired public InventoryApiController(ObjectMapper objectMapper, HttpServletRequest request) { @@ -89,8 +89,8 @@ public ResponseEntity addInventory( * Search inventory response entity. * * @param searchString the search string - * @param skip the skip - * @param limit the limit + * @param skip the skip + * @param limit the limit * @return the response entity */ public ResponseEntity> searchInventory( diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryItem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryItem.java index de0c974c8..7b83c8835 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryItem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/InventoryItem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -249,6 +249,7 @@ public String toString() { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemController.java index 40de6bb1e..f4cec6328 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -60,9 +60,9 @@ class ItemController { * Show items list. * * @param customerID the customer id - * @param toto the toto - * @param startDate the start date - * @param filterIds the filter ids + * @param toto the toto + * @param startDate the start date + * @param filterIds the filter ids * @return the list */ @GetMapping("/items") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemDTO.java index 84bfe48e1..b3ffef85a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -30,6 +30,7 @@ /** * The type Item dto. + * * @author bnasslahsen */ class ItemDTO implements Serializable { @@ -70,7 +71,7 @@ public ItemDTO() { * Instantiates a new Item dto. * * @param description description - * @param price price + * @param price price */ public ItemDTO(final String description, final int price) { this.description = description; @@ -80,9 +81,9 @@ public ItemDTO(final String description, final int price) { /** * Instantiates a new Item dto. * - * @param itemID itemID + * @param itemID itemID * @param description description - * @param price price + * @param price price */ public ItemDTO(final String itemID, final String description, final int price) { this.itemID = itemID; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemLightDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemLightDTO.java index 3e8cf7dd4..ec8546c0a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemLightDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/ItemLightDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -30,6 +30,7 @@ /** * The type Item light dto. + * * @author bnasslahsen */ class ItemLightDTO implements Serializable { @@ -65,7 +66,7 @@ public ItemLightDTO() { * Instantiates a new Item light dto. * * @param description the description - * @param price the price + * @param price the price */ public ItemLightDTO(String description, int price) { super(); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/Manufacturer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/Manufacturer.java index bcc1b1382..f8c6a12ce 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/Manufacturer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/Manufacturer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -203,6 +203,7 @@ public String toString() { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java index 3d6e71f24..19332882b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PeopleRestService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -100,9 +100,9 @@ public PersonDTO findPerson( /** * Add person response entity. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name * @return the response entity */ @PostMapping(value = "/{email}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PersonDTO.java index 175db8fba..4284e1bb1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java index 9ede493c8..198da6430 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java index 48a47847e..5e1535a2b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -45,11 +45,11 @@ class HelloController { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, @@ -59,8 +59,8 @@ public void test(HttpSession header, HttpServletRequest request, HttpServletResp /** * Test request attribute. * - * @param sample the sample - * @param s the s + * @param sample the sample + * @param s the s */ @GetMapping("/testreq") public void testRequestAttribute(@RequestAttribute String sample, String s) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java index 5ad2dcd97..546dc289b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/HelloController.java index 33d254e74..0ca59f79d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app100; @@ -43,7 +43,7 @@ class HelloController { /** * Gets all pets. * - * @param toto the toto + * @param toto the toto * @return the all pets */ @GetMapping(value = "/search", produces = { "application/xml", "application/json" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/PersonDTO.java index aa9c3767b..2b6de09a7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app100; @@ -57,9 +57,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/SpringDocApp100Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/SpringDocApp100Test.java index 63c3c0c3a..352d84567 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/SpringDocApp100Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app100/SpringDocApp100Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app100; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloController.java index 3e3aed723..6c8348a81 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app101; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloDTO.java index 67fac5268..b000ebbd3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/HelloDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app101; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/SpringDocApp101Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/SpringDocApp101Test.java index 02cd66864..1d1395cb3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/SpringDocApp101Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app101/SpringDocApp101Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app101; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java index b108c4264..3a61f7ea3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/InheritedRequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java index 158e49fdf..537b5f8c3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/RequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java index b2ea1347f..a56563b33 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/SpringDocApp102Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/TestController.java index 4347f44d4..1ff43fcd8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app102/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app102; @@ -41,7 +41,7 @@ class TestController { /** * Gets test. * - * @param param the param + * @param param the param * @param requestParams the request params */ @GetMapping("test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/ExampleBody.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/ExampleBody.java index be96d9581..3b971aa8d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/ExampleBody.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/ExampleBody.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app103; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/HelloController.java index eeb08d164..840359550 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app103; @@ -47,8 +47,8 @@ class HelloController { /** * Post my request body string. * - * @param body the body - * @param file the file + * @param body the body + * @param file the file * @return the string */ @PostMapping(value = "/test/103", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/SpringDocApp103Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/SpringDocApp103Test.java index 7cae09b43..1ae2a4adf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/SpringDocApp103Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app103/SpringDocApp103Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app103; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/CrudController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/CrudController.java index e12a74785..3735f7ad1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/CrudController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/CrudController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app104; @@ -39,7 +39,7 @@ /** * The type Crud controller. * - * @param the type parameter + * @param the type parameter */ @Controller @SuppressWarnings("rawtypes") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/Design.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/Design.java index a062261fd..0935e199b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/Design.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/Design.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/DesignController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/DesignController.java index c7f5097d2..0c4125b75 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/DesignController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/DesignController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/HavingPK.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/HavingPK.java index 58cae1773..b8cb8f497 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/HavingPK.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/HavingPK.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/SpringDocApp104Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/SpringDocApp104Test.java index 2f20b5ff4..f3aa02187 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/SpringDocApp104Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app104/SpringDocApp104Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app104; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java index 74e764d07..f37951e7b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/SpringDocApp105Test.java @@ -21,17 +21,24 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105; +import java.util.Optional; + +import io.swagger.v3.core.converter.ModelConverter; +import io.swagger.v3.core.converter.ModelConverters; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; +import org.springdoc.core.converters.OAS31ModelConverter; import org.springdoc.core.utils.Constants; import test.org.springdoc.api.v31.AbstractSpringDocTest; @@ -40,6 +47,7 @@ import org.springframework.test.context.TestPropertySource; import static org.hamcrest.Matchers.is; +import static org.springdoc.core.utils.Constants.SPRINGDOC_EXPLICIT_OBJECT_SCHEMA; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; @@ -49,6 +57,8 @@ * The type Spring doc app 105 test. */ @TestPropertySource(properties = { + SPRINGDOC_EXPLICIT_OBJECT_SCHEMA + "=true", + "springdoc.explicit-object-schema=true", "springdoc.group-configs[0].group=stores", "springdoc.group-configs[0].paths-to-match=/store/**", "springdoc.group-configs[1].group=users", @@ -62,10 +72,15 @@ }) class SpringDocApp105Test extends AbstractSpringDocTest { - /** - * The constant className. - */ - public static String className; + @AfterAll + public static void reset() { + System.setProperty(Schema.EXPLICIT_OBJECT_SCHEMA_PROPERTY, "false"); + ModelConverters instance = ModelConverters.getInstance(true); + Optional oas31ModelConverter = + instance.getConverters() + .stream().filter(modelConverter -> modelConverter instanceof OAS31ModelConverter).findAny(); + oas31ModelConverter.ifPresent(instance::removeConverter); + } /** * Test app. diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ApiUtil.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ApiUtil.java index b87168d0f..de4823823 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ApiUtil.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ApiUtil.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api; @@ -42,9 +42,9 @@ public class ApiUtil { /** * Sets example response. * - * @param req the req - * @param contentType the content type - * @param example the example + * @param req the req + * @param contentType the content type + * @param example the example */ public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { try { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ExceptionTranslator.java index 11c5f1364..8982d96d5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api; @@ -62,7 +62,7 @@ public ExceptionTranslator(ErrorAttributes errorAttributes) { /** * Process constraint violation exception map. * - * @param request the request + * @param request the request * @return the map */ @ExceptionHandler(ConstraintViolationException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/HomeController.java index 69a4d2cf8..5f30154ea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApi.java index 36ce9c43a..4a4f41624 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -100,8 +100,8 @@ default void addPet( /** * Delete pet response entity. * - * @param petId the pet id - * @param apiKey the api key + * @param petId the pet id + * @param apiKey the api key * @return the response entity */ @Operation(summary = "Deletes a pet", description = "", security = { @@ -118,7 +118,7 @@ default ResponseEntity deletePet( /** * Find pets by status response entity. * - * @param status the status + * @param status the status * @return the response entity */ @Operation(summary = "Finds Pets by status", description = "Multiple status values can be provided with comma separated strings", security = { @@ -135,7 +135,7 @@ default ResponseEntity> findPetsByStatus( /** * Find pets by tags response entity. * - * @param tags the tags + * @param tags the tags * @return the response entity */ @Operation(summary = "Finds Pets by tags", description = "Muliple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", security = { @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByTags( /** * Gets pet by id. * - * @param petId the pet id + * @param petId the pet id * @return the pet by id */ @Operation(summary = "Find pet by ID", description = "Returns a single pet", security = { @@ -170,7 +170,7 @@ default ResponseEntity getPetById( /** * Update pet response entity. * - * @param pet the pet + * @param pet the pet * @return the response entity */ @Operation(summary = "Update an existing pet", description = "", security = { @@ -187,9 +187,9 @@ default ResponseEntity updatePet( /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name - * @param status the status + * @param petId the pet id + * @param name the name + * @param status the status * @return the response entity */ @Operation(summary = "Updates a pet in the store with form data", description = "", security = { @@ -206,9 +206,9 @@ default ResponseEntity updatePetWithForm( /** * Upload file response entity. * - * @param petId the pet id - * @param additionalMetadata the additional metadata - * @param file the file + * @param petId the pet id + * @param additionalMetadata the additional metadata + * @param file the file * @return the response entity */ @Operation(summary = "uploads an image", description = "", security = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiController.java index d12e3f0f7..afa985db0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegate.java index fad4feab6..ce256d4aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.pet; @@ -70,8 +70,8 @@ default void addPet(Pet pet) { /** * Delete pet response entity. * - * @param petId the pet id - * @param apiKey the api key + * @param petId the pet id + * @param apiKey the api key * @return the response entity * @see PetApi#deletePet PetApi#deletePet */ @@ -84,7 +84,7 @@ default ResponseEntity deletePet(Long petId, /** * Find pets by status response entity. * - * @param status the status + * @param status the status * @return the response entity * @see PetApi#findPetsByStatus PetApi#findPetsByStatus */ @@ -115,7 +115,7 @@ default void extract() { /** * Find pets by tags response entity. * - * @param tags the tags + * @param tags the tags * @return the response entity * @see PetApi#findPetsByTags PetApi#findPetsByTags */ @@ -128,7 +128,7 @@ default ResponseEntity> findPetsByTags(List tags) { /** * Gets pet by id. * - * @param petId the pet id + * @param petId the pet id * @return the pet by id * @see PetApi#getPetById PetApi#getPetById */ @@ -141,7 +141,7 @@ default ResponseEntity getPetById(Long petId) { /** * Update pet response entity. * - * @param pet the pet + * @param pet the pet * @return the response entity * @see PetApi#updatePet PetApi#updatePet */ @@ -153,9 +153,9 @@ default ResponseEntity updatePet(Pet pet) { /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name - * @param status the status + * @param petId the pet id + * @param name the name + * @param status the status * @return the response entity * @see PetApi#updatePetWithForm PetApi#updatePetWithForm */ @@ -169,9 +169,9 @@ default ResponseEntity updatePetWithForm(Long petId, /** * Upload file response entity. * - * @param petId the pet id - * @param additionalMetadata the additional metadata - * @param file the file + * @param petId the pet id + * @param additionalMetadata the additional metadata + * @param file the file * @return the response entity * @see PetApi#uploadFile PetApi#uploadFile */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegateImpl.java index d35f0c526..42f100274 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/pet/PetApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.pet; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApi.java index b3a4f1976..27becf586 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -76,7 +76,7 @@ default StoreApiDelegate getDelegate() { /** * Delete order response entity. * - * @param orderId the order id + * @param orderId the order id * @return the response entity */ @Operation(summary = "Delete purchase order by ID", tags = { "store" }) @@ -105,7 +105,7 @@ default ResponseEntity> getInventory() { /** * Gets order by id. * - * @param orderId the order id + * @param orderId the order id * @return the order by id */ @Operation(summary = "Find purchase order by ID", tags = { "store" }) @@ -122,7 +122,7 @@ default ResponseEntity getOrderById( /** * Place order response entity. * - * @param order the order + * @param order the order * @return the response entity */ @Operation(summary = "Place an order for a pet", tags = { "store" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiController.java index 7e1e5bd16..a43cd0334 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegate.java index d56c2f330..a24a212eb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.store; @@ -57,7 +57,7 @@ default Optional getRequest() { /** * Delete order response entity. * - * @param orderId the order id + * @param orderId the order id * @return the response entity * @see StoreApi#deleteOrder StoreApi#deleteOrder */ @@ -80,7 +80,7 @@ default ResponseEntity> getInventory() { /** * Gets order by id. * - * @param orderId the order id + * @param orderId the order id * @return the order by id * @see StoreApi#getOrderById StoreApi#getOrderById */ @@ -111,7 +111,7 @@ default void extract() { /** * Place order response entity. * - * @param order the order + * @param order the order * @return the response entity * @see StoreApi#placeOrder StoreApi#placeOrder */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegateImpl.java index 6695b9602..dd6169f46 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/store/StoreApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.store; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApi.java index 5625cb956..5786b3d77 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -74,7 +74,7 @@ default UserApiDelegate getDelegate() { /** * Create user response entity. * - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Create user", tags = { "user" }) @@ -88,7 +88,7 @@ default ResponseEntity createUser( /** * Create users with array input response entity. * - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Creates list of users with given input array", tags = { "user" }) @@ -103,7 +103,7 @@ default ResponseEntity createUsersWithArrayInput( /** * Create users with list input response entity. * - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Creates list of users with given input array", tags = { "user" }) @@ -117,7 +117,7 @@ default ResponseEntity createUsersWithListInput( /** * Delete user response entity. * - * @param username the username + * @param username the username * @return the response entity */ @Operation(summary = "Creates list of users with given input array", tags = { "user" }) @@ -132,7 +132,7 @@ default ResponseEntity deleteUser( /** * Gets user by name. * - * @param username the username + * @param username the username * @return the user by name */ @Operation(summary = "Get user by user name", tags = { "user" }) @@ -150,8 +150,8 @@ default ResponseEntity getUserByName( /** * Login user response entity. * - * @param username the username - * @param password the password + * @param username the username + * @param password the password * @return the response entity */ @Operation(summary = "Logs user into the system", tags = { "user" }) @@ -180,8 +180,8 @@ default ResponseEntity logoutUser() { /** * Update user response entity. * - * @param username the username - * @param user the user + * @param username the username + * @param user the user * @return the response entity */ @Operation(summary = "Updated user", tags = { "user" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiController.java index 6dcad17c7..037a604fe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegate.java index 35d51c6d6..91de016f1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.user; @@ -57,7 +57,7 @@ default Optional getRequest() { /** * Create user response entity. * - * @param user the user + * @param user the user * @return the response entity * @see UserApi#createUser UserApi#createUser */ @@ -69,7 +69,7 @@ default ResponseEntity createUser(User user) { /** * Create users with array input response entity. * - * @param user the user + * @param user the user * @return the response entity * @see UserApi#createUsersWithArrayInput UserApi#createUsersWithArrayInput */ @@ -81,7 +81,7 @@ default ResponseEntity createUsersWithArrayInput(List user) { /** * Create users with list input response entity. * - * @param user the user + * @param user the user * @return the response entity * @see UserApi#createUsersWithListInput UserApi#createUsersWithListInput */ @@ -93,7 +93,7 @@ default ResponseEntity createUsersWithListInput(List user) { /** * Delete user response entity. * - * @param username the username + * @param username the username * @return the response entity * @see UserApi#deleteUser UserApi#deleteUser */ @@ -105,7 +105,7 @@ default ResponseEntity deleteUser(String username) { /** * Gets user by name. * - * @param username the username + * @param username the username * @return the user by name * @see UserApi#getUserByName UserApi#getUserByName */ @@ -129,8 +129,8 @@ default ResponseEntity getUserByName(String username) { /** * Login user response entity. * - * @param username the username - * @param password the password + * @param username the username + * @param password the password * @return the response entity * @see UserApi#loginUser UserApi#loginUser */ @@ -154,8 +154,8 @@ default ResponseEntity logoutUser() { /** * Update user response entity. * - * @param username the username - * @param user the user + * @param username the username + * @param user the user * @return the response entity * @see UserApi#updateUser UserApi#updateUser */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegateImpl.java index 1482be035..8273b40b9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/api/user/UserApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.api.user; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Category.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Category.java index e45fc486b..7dfd58b19 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Category.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Category.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.model; @@ -49,7 +49,8 @@ class Category { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -81,7 +82,7 @@ public void setId(Long id) { /** * Id category. * - * @param id the id + * @param id the id * @return the category */ public Category id(Long id) { @@ -111,7 +112,7 @@ public void setName(String name) { /** * Name category. * - * @param name the name + * @param name the name * @return the category */ public Category name(String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/ModelApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/ModelApiResponse.java index dbec36222..afe906831 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/ModelApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/ModelApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.model; @@ -55,7 +55,8 @@ public class ModelApiResponse { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -87,7 +88,7 @@ public void setCode(Integer code) { /** * Code model api response. * - * @param code the code + * @param code the code * @return the model api response */ public ModelApiResponse code(Integer code) { @@ -117,7 +118,7 @@ public void setType(String type) { /** * Type model api response. * - * @param type the type + * @param type the type * @return the model api response */ public ModelApiResponse type(String type) { @@ -147,7 +148,7 @@ public void setMessage(String message) { /** * Message model api response. * - * @param message the message + * @param message the message * @return the model api response */ public ModelApiResponse message(String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Order.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Order.java index 3f03494f0..1bf999129 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Order.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Order.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.model; @@ -80,7 +80,8 @@ public class Order { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -112,7 +113,7 @@ public void setId(Long id) { /** * Id order. * - * @param id the id + * @param id the id * @return the order */ public Order id(Long id) { @@ -142,7 +143,7 @@ public void setPetId(Long petId) { /** * Pet id order. * - * @param petId the pet id + * @param petId the pet id * @return the order */ public Order petId(Long petId) { @@ -172,7 +173,7 @@ public void setQuantity(Integer quantity) { /** * Quantity order. * - * @param quantity the quantity + * @param quantity the quantity * @return the order */ public Order quantity(Integer quantity) { @@ -202,7 +203,7 @@ public void setShipDate(Date shipDate) { /** * Ship date order. * - * @param shipDate the ship date + * @param shipDate the ship date * @return the order */ public Order shipDate(Date shipDate) { @@ -235,7 +236,7 @@ public void setStatus(StatusEnum status) { /** * Status order. * - * @param status the status + * @param status the status * @return the order */ public Order status(StatusEnum status) { @@ -265,7 +266,7 @@ public void setComplete(Boolean complete) { /** * Complete order. * - * @param complete the complete + * @param complete the complete * @return the order */ public Order complete(Boolean complete) { @@ -299,15 +300,15 @@ public String toString() { */ public enum StatusEnum { /** - *Placed status enum. + * Placed status enum. */ PLACED("placed"), /** - *Approved status enum. + * Approved status enum. */ APPROVED("approved"), /** - *Delivered status enum. + * Delivered status enum. */ DELIVERED("delivered"); @@ -328,7 +329,7 @@ public enum StatusEnum { /** * From value status enum. * - * @param text the text + * @param text the text * @return the status enum */ @JsonCreator diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Pet.java index 69def5ee0..b09639303 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.model; @@ -82,7 +82,8 @@ public class Pet { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -114,7 +115,7 @@ public void setId(Long id) { /** * Id pet. * - * @param id the id + * @param id the id * @return the pet */ public Pet id(Long id) { @@ -144,7 +145,7 @@ public void setCategory(Category category) { /** * Category pet. * - * @param category the category + * @param category the category * @return the pet */ public Pet category(Category category) { @@ -175,7 +176,7 @@ public void setName(String name) { /** * Name pet. * - * @param name the name + * @param name the name * @return the pet */ public Pet name(String name) { @@ -206,7 +207,7 @@ public void setPhotoUrls(List photoUrls) { /** * Photo urls pet. * - * @param photoUrls the photo urls + * @param photoUrls the photo urls * @return the pet */ public Pet photoUrls(List photoUrls) { @@ -217,7 +218,7 @@ public Pet photoUrls(List photoUrls) { /** * Add photo urls item pet. * - * @param photoUrlsItem the photo urls item + * @param photoUrlsItem the photo urls item * @return the pet */ public Pet addPhotoUrlsItem(String photoUrlsItem) { @@ -247,7 +248,7 @@ public void setTags(List tags) { /** * Tags pet. * - * @param tags the tags + * @param tags the tags * @return the pet */ public Pet tags(List tags) { @@ -258,7 +259,7 @@ public Pet tags(List tags) { /** * Add tags item pet. * - * @param tagsItem the tags item + * @param tagsItem the tags item * @return the pet */ public Pet addTagsItem(Tag tagsItem) { @@ -294,7 +295,7 @@ public void setStatus(StatusEnum status) { /** * Status pet. * - * @param status the status + * @param status the status * @return the pet */ public Pet status(StatusEnum status) { @@ -327,15 +328,15 @@ public String toString() { */ public enum StatusEnum { /** - *Available status enum. + * Available status enum. */ AVAILABLE("available"), /** - *Pending status enum. + * Pending status enum. */ PENDING("pending"), /** - *Sold status enum. + * Sold status enum. */ SOLD("sold"); @@ -356,7 +357,7 @@ public enum StatusEnum { /** * From value status enum. * - * @param text the text + * @param text the text * @return the status enum */ @JsonCreator diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Tag.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Tag.java index 56e1f4c50..f6931ee78 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Tag.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/Tag.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.model; @@ -49,7 +49,8 @@ class Tag { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -81,7 +82,7 @@ public void setId(Long id) { /** * Id tag. * - * @param id the id + * @param id the id * @return the tag */ public Tag id(Long id) { @@ -111,7 +112,7 @@ public void setName(String name) { /** * Name tag. * - * @param name the name + * @param name the name * @return the tag */ public Tag name(String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/User.java index ac272ef57..2dacb7543 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app105/model/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app105.model; @@ -88,7 +88,8 @@ public class User { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private static String toIndentedString(Object o) { @@ -120,7 +121,7 @@ public void setId(Long id) { /** * Id user. * - * @param id the id + * @param id the id * @return the user */ public User id(Long id) { @@ -150,7 +151,7 @@ public void setUsername(String username) { /** * Username user. * - * @param username the username + * @param username the username * @return the user */ public User username(String username) { @@ -180,7 +181,7 @@ public void setFirstName(String firstName) { /** * First name user. * - * @param firstName the first name + * @param firstName the first name * @return the user */ public User firstName(String firstName) { @@ -210,7 +211,7 @@ public void setLastName(String lastName) { /** * Last name user. * - * @param lastName the last name + * @param lastName the last name * @return the user */ public User lastName(String lastName) { @@ -240,7 +241,7 @@ public void setEmail(String email) { /** * Email user. * - * @param email the email + * @param email the email * @return the user */ public User email(String email) { @@ -270,7 +271,7 @@ public void setPassword(String password) { /** * Password user. * - * @param password the password + * @param password the password * @return the user */ public User password(String password) { @@ -300,7 +301,7 @@ public void setPhone(String phone) { /** * Phone user. * - * @param phone the phone + * @param phone the phone * @return the user */ public User phone(String phone) { @@ -330,7 +331,7 @@ public void setUserStatus(Integer userStatus) { /** * User status user. * - * @param userStatus the user status + * @param userStatus the user status * @return the user */ public User userStatus(Integer userStatus) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/HelloController.java index 458143bac..34cde8494 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app106; @@ -48,7 +48,7 @@ class HelloController { /** * Find articles response entity. * - * @param modifiedSince the modified since + * @param modifiedSince the modified since * @return the response entity */ @Operation(summary = "find-articles") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/SpringDocApp106Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/SpringDocApp106Test.java index e3097524a..94c02b456 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/SpringDocApp106Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app106/SpringDocApp106Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app106; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/HelloController.java index 3acf6f970..2a99af3f3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app107; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/SpringDocApp107Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/SpringDocApp107Test.java index 6d3dfd3e4..07ef81f73 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/SpringDocApp107Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app107/SpringDocApp107Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app107; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/ActionResult.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/ActionResult.java index b760324da..b43b83542 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/ActionResult.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/ActionResult.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app108; @@ -29,7 +29,7 @@ /** * The type Action result. * - * @param the type parameter + * @param the type parameter */ class ActionResult { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/HelloController.java index 1f10eddda..d0889ce68 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app108; @@ -38,7 +38,7 @@ class HelloController { /** * Update action result. * - * @param toto the toto + * @param toto the toto * @return the action result */ @PostMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/SpringDocApp108Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/SpringDocApp108Test.java index e591a82eb..5fa1e5b17 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/SpringDocApp108Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app108/SpringDocApp108Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app108; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/HelloController.java index a2c93e7c7..d65f3e111 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app109; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/SpringDocApp109Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/SpringDocApp109Test.java index a26df7e27..4f1cd6227 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/SpringDocApp109Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app109/SpringDocApp109Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app109; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java index 6205298ca..096d84195 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; @@ -48,7 +48,7 @@ class HelloController { /** * Upload documents response entity. * - * @param multipartFiles the multipart files + * @param multipartFiles the multipart files * @return the response entity */ @PostMapping(path = "/documents", consumes = "multipart/form-data") @@ -59,7 +59,7 @@ public ResponseEntity uploadDocuments(@RequestPart("doc") List problem(final Throwable e) { /** * Handle method argument not valid response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(MethodArgumentNotValidException.class) @@ -110,7 +110,7 @@ public ResponseEntity handleMethodArgumentNotValid(MethodArgumentN /** * Handle constraint violated exception response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(ConstraintViolationException.class) @@ -135,7 +135,7 @@ public ResponseEntity handleConstraintViolatedException(Constraint /** * Handle missing servlet request parameter exception response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(MissingServletRequestParameterException.class) @@ -154,7 +154,7 @@ public ResponseEntity handleMissingServletRequestParameterExceptio /** * Handle http media type not supported response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(HttpMediaTypeNotSupportedException.class) @@ -170,7 +170,7 @@ public ResponseEntity handleHttpMediaTypeNotSupported(HttpMediaTyp /** * Handle http message not readable response entity. * - * @param ex the ex + * @param ex the ex * @return the response entity */ @ExceptionHandler(HttpMessageNotReadableException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Person.java index 82baf9544..c2e5efe13 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app110; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController.java index ffcae50a6..6aeea2c48 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app110; @@ -57,7 +57,7 @@ class PersonController { /** * Person person. * - * @param person the person + * @param person the person * @return the person */ @RequestMapping(path = "/person", method = RequestMethod.POST) @@ -73,7 +73,7 @@ public Person person(@Valid @RequestBody Person person) throws HttpMediaTypeNotS /** * Find by last name list. * - * @param lastName the last name + * @param lastName the last name * @return the list */ @RequestMapping(path = "/personByLastName", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController2.java index 42f12befd..a52f317eb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/PersonController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app110; @@ -56,7 +56,7 @@ class PersonController2 { /** * Person person. * - * @param person the person + * @param person the person * @return the person */ @RequestMapping(path = "/person2", method = RequestMethod.POST) @@ -72,7 +72,7 @@ public Person person(@Valid @RequestBody Person person) { /** * Find by last name list. * - * @param lastName the last name + * @param lastName the last name * @return the list */ @RequestMapping(path = "/personByLastName2", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Problem.java index 7261c88ee..f8814928f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app110; @@ -44,7 +44,7 @@ class Problem { /** * Instantiates a new Problem. * - * @param logRef the log ref + * @param logRef the log ref * @param message the message */ public Problem(String logRef, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java index 347c96f54..3c3d14aaf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app110/SpringDocApp110Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app110; @@ -53,18 +53,18 @@ static class SpringDocTestApp { /** * Custom open api open api. * - * @param appDesciption the app desciption - * @param appVersion the app version + * @param appDescription the app description + * @param appVersion the app version * @return the open api */ @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/ErrorMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/ErrorMessage.java index 72b7b278c..f64c2a61f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/ErrorMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/ErrorMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/GlobalControllerAdvice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/GlobalControllerAdvice.java index 29876131d..a8962be68 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/GlobalControllerAdvice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/GlobalControllerAdvice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Person.java index 5dff6e9df..2f325c648 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController.java index 39d373733..695e280ce 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController2.java index 65ea4a129..a4563d2cc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/PersonController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app111; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Problem.java index 4a044c014..af5ce3665 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app111; @@ -44,7 +44,7 @@ class Problem { /** * Instantiates a new Problem. * - * @param logRef the log ref + * @param logRef the log ref * @param message the message */ public Problem(String logRef, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java index edb95c812..ad32088a4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app111/SpringDocApp111Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app111; @@ -53,17 +53,17 @@ static class SpringDocTestApp { /** * Custom open api open api. * - * @param appDesciption the app desciption - * @param appVersion the app version + * @param appDescription the app description + * @param appVersion the app version * @return the open api */ @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/ErrorMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/ErrorMessage.java index 5eab1a068..7b9e57ee1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/ErrorMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/ErrorMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/GlobalControllerAdvice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/GlobalControllerAdvice.java index 5b271e298..836d6b0cc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/GlobalControllerAdvice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/GlobalControllerAdvice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Person.java index 5d56c6e15..dc39036a6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/PersonController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/PersonController.java index 80a4052a0..889af9e4f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/PersonController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/PersonController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app112; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Problem.java index 76979b170..77a0abe30 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app112; @@ -44,7 +44,7 @@ class Problem { /** * Instantiates a new Problem. * - * @param logRef the log ref + * @param logRef the log ref * @param message the message */ public Problem(String logRef, String message) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java index 273f9ab8b..76037264d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/SpringDocApp112Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app112; @@ -53,17 +53,17 @@ static class SpringDocTestApp { /** * Custom open api open api. * - * @param appDesciption the app desciption - * @param appVersion the app version + * @param appDescription the app description + * @param appVersion the app version * @return the open api */ @Bean - public OpenAPI customOpenAPI(@Value("${application-description}") String appDesciption, @Value("${application-version}") String appVersion) { + public OpenAPI customOpenAPI(@Value("${application-description}") String appDescription, @Value("${application-version}") String appVersion) { return new OpenAPI() .info(new Info() .title("sample application API") .version(appVersion) - .description(appDesciption) + .description(appDescription) .termsOfService("http://swagger.io/terms/") .license(new License().name("Apache 2.0").url("http://springdoc.org"))); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/sample/PersonController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/sample/PersonController2.java index e9671ca32..0d3c797e4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/sample/PersonController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app112/sample/PersonController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app112.sample; @@ -58,7 +58,7 @@ class PersonController2 { /** * Person person. * - * @param person the person + * @param person the person * @return the person */ @RequestMapping(path = "/person2", method = RequestMethod.POST) @@ -74,7 +74,7 @@ public Person person(@Valid @RequestBody Person person) throws HttpMediaTypeNotS /** * Find by last name list. * - * @param lastName the last name + * @param lastName the last name * @return the list */ @RequestMapping(path = "/personByLastName2", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/HelloController.java index 54367c21e..d953c098b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app113; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/SpringDocApp113Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/SpringDocApp113Test.java index 6257df6cf..787548f9e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/SpringDocApp113Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app113/SpringDocApp113Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app113; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/HelloController.java index 835a68f85..6e2c62e39 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app114; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/SpringDocApp114Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/SpringDocApp114Test.java index 559c6c985..ddeeff819 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/SpringDocApp114Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app114/SpringDocApp114Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app114; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/HelloController.java index e17ecaa17..aea1b619f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app115; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java index 161d18bd4..1c6bc7723 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/JavaTimeOperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app115; @@ -47,8 +47,8 @@ class JavaTimeOperationCustomizer implements OperationCustomizer { /** * Customize operation. * - * @param operation the operation - * @param handlerMethod the handler method + * @param operation the operation + * @param handlerMethod the handler method * @return the operation */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java index 3565fd02f..bf7d78ec1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app115/SpringDocApp115Test.java @@ -21,21 +21,38 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app115; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import test.org.springdoc.api.v31.AbstractSpringDocTest; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; + +import static org.springdoc.core.utils.Constants.SPRINGDOC_ENABLE_EXTRA_SCHEMAS; +import static org.springdoc.core.utils.SpringDocUtils.getConfig; /** * The type Spring doc app 115 test. */ +@TestPropertySource(properties = SPRINGDOC_ENABLE_EXTRA_SCHEMAS + "=false") class SpringDocApp115Test extends AbstractSpringDocTest { + @BeforeAll + public static void clear() { + getConfig().resetExtraSchemas(); + } + + @AfterAll + public static void restore() { + getConfig().initExtraSchemas(); + } + /** * The type Spring doc test app. */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/FooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/FooErrorHandler.java index f3e5fd944..0f0bd32a4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/FooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/FooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app116; @@ -40,7 +40,7 @@ class FooErrorHandler { /** * Store assignment publishing error response entity. * - * @param e the e + * @param e the e * @return the response entity */ @ExceptionHandler diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/HelloController.java index 358875905..b95f9c651 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app116; @@ -46,7 +46,7 @@ class HelloController { /** * Create string. * - * @param foo the foo + * @param foo the foo * @return the string */ @PostMapping("/foo") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/SpringDocApp116Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/SpringDocApp116Test.java index b72c20e0f..24044bb94 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/SpringDocApp116Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app116/SpringDocApp116Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app116; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/HelloApplication.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/HelloApplication.java index 354c45a84..5d2bdb033 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/HelloApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/HelloApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app117; @@ -68,7 +68,7 @@ class HelloApplication { /** * Routes router function. * - * @param ph the ph + * @param ph the ph * @return the router function */ @Bean @@ -97,10 +97,10 @@ class SimpleFilter extends GenericFilter { /** * Do filter. * - * @param req the req - * @param res the res - * @param filterChain the filter chain - * @throws IOException the io exception + * @param req the req + * @param res the res + * @param filterChain the filter chain + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override @@ -133,7 +133,7 @@ class PersonHandler { /** * Handle get all people server response. * - * @param serverRequest the server request + * @param serverRequest the server request * @return the server response */ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { @@ -143,10 +143,10 @@ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { /** * Handle post person server response. * - * @param r the r - * @return the server response - * @throws ServletException the servlet exception - * @throws IOException the io exception + * @param r the r + * @return the server response + * @throws ServletException the servlet exception + * @throws IOException the io exception */ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOException { Person result = personService.save(new Person(null, r.body(Person.class).getName())); @@ -157,7 +157,7 @@ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOExce /** * Handle get person by id server response. * - * @param r the r + * @param r the r * @return the server response */ ServerResponse handleGetPersonById(ServerRequest r) { @@ -174,7 +174,7 @@ class GreetingsRestController { /** * Greet string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping("/greet/{name}") @@ -207,7 +207,7 @@ class PersonService { /** * Save person. * - * @param p the p + * @param p the p * @return the person */ Person save(Person p) { @@ -228,7 +228,7 @@ Set all() { /** * By id person. * - * @param id the id + * @param id the id * @return the person */ Person byId(@Parameter(in = ParameterIn.PATH) Long id) { @@ -258,7 +258,7 @@ class Person { /** * Instantiates a new Person. * - * @param id the id + * @param id the id * @param name the name */ public Person(Long id, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/SpringDocApp117Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/SpringDocApp117Test.java index 2b33aba3c..4dca0ae88 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/SpringDocApp117Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app117/SpringDocApp117Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app117; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/AbstractParent.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/AbstractParent.java index e5791e3f3..e02b64240 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/AbstractParent.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/AbstractParent.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app118; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/ConcreteParent.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/ConcreteParent.java index 40b62736b..2215870f7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/ConcreteParent.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/ConcreteParent.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app118; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/Controller.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/Controller.java index f4178cae8..db7edf880 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/Controller.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/Controller.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app118; @@ -42,7 +42,7 @@ class Controller { /** * Abstract parent response. * - * @param payload the payload + * @param payload the payload * @return the response */ @PostMapping("abstract-parent") @@ -53,7 +53,7 @@ public Response abstractParent(@RequestBody AbstractParent payload) { /** * Concrete parent response. * - * @param payload the payload + * @param payload the payload * @return the response */ @PostMapping("concrete-parent") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/SpringDocApp118Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/SpringDocApp118Test.java index c73c4624d..569d2cf41 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/SpringDocApp118Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app118/SpringDocApp118Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app118; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java index 4e62767ad..56f6b3c6a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app119; @@ -45,9 +45,9 @@ class HelloController { /** * Multi files in multi part string. * - * @param jsonRequest the json request - * @param file1 the file 1 - * @param file2 the file 2 + * @param jsonRequest the json request + * @param file1 the file 1 + * @param file2 the file 2 * @return the string */ @Operation(summary = "Multiple files and JSON payloads as multi part request") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/JsonRequest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/JsonRequest.java index 23283d513..04d783f44 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/JsonRequest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/JsonRequest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app119; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/SpringDocApp119Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/SpringDocApp119Test.java index 179d5c641..3d7a65f52 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/SpringDocApp119Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app119/SpringDocApp119Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app119; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java index 9b54d3ea1..a7de7bd75 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java index af6fd5085..dbd77affe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/AccountId.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/AccountId.java index cd7a0ede9..1491bc999 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/AccountId.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/AccountId.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app120; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/MetaAnnotationController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/MetaAnnotationController.java index 677f7c3b5..aacaee376 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/MetaAnnotationController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/MetaAnnotationController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app120; @@ -69,6 +69,7 @@ String simpleTest(@PathVariable @AccountId String accountId) { /** * When there is a top level {@code @Parameter} annotation it has precedence over the meta-annotation * So the id parameter should have all the defaults, with a name of "id" + * * @param accountId the account id * @return the string */ @@ -90,6 +91,7 @@ String testQueryParam(@RequestParam @AccountId String accountId) { /** * {@code @AliasFor} in the {@code @AccountId} annotation allows us to override the default it provides. + * * @param accountId the account id * @return the string */ @@ -102,7 +104,7 @@ String testAliasFor(@RequestParam @AccountId(example = "OVERRIDDEN EXAMPLE") Str * Test meta meta annotation string. * * @param queryAccountId the query account id - * @param accountId the account id + * @param accountId the account id * @return the string */ @GetMapping(value = "/testMetaMetaAnnotation/{accountId}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/SpringDocApp120Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/SpringDocApp120Test.java index af28211a8..a102d2495 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/SpringDocApp120Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app120/SpringDocApp120Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app120; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/InheritedRequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/InheritedRequestParams.java index b9d8d0394..837fc9bc4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/InheritedRequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/InheritedRequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app121; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/RequestParams.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/RequestParams.java index 1b095570b..c8a8f679d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/RequestParams.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/RequestParams.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app121; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/SpringDocApp121Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/SpringDocApp121Test.java index 3d1fd7d92..446b858d7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/SpringDocApp121Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/SpringDocApp121Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app121; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/TestController.java index 790e56222..944c2328c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app121/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app121; @@ -41,8 +41,8 @@ class TestController { /** * Gets test. * - * @param param the param - * @param requestParams the request params + * @param param the param + * @param requestParams the request params * @return the test */ @PostMapping("test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseController.java index e15877baf..458deb84a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app122; @@ -36,7 +36,7 @@ /** * The type Base controller. * - * @param the type parameter + * @param the type parameter */ @RestController public abstract class BaseController { @@ -44,7 +44,7 @@ public abstract class BaseController { /** * Create response entity. * - * @param payload the payload + * @param payload the payload * @return the response entity */ @PostMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseObject.java index 3c315d623..1d2249e97 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/BaseObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/CustomerDto.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/CustomerDto.java index bc537139b..eb3bea6fe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/CustomerDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/CustomerDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/FirstController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/FirstController.java index 7eb2dcaa7..4d597c2c5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/FirstController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/FirstController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/SpringDocApp122Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/SpringDocApp122Test.java index 49a49a132..f410a0d3e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/SpringDocApp122Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/SpringDocApp122Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app122; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/Wrapper.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/Wrapper.java index 2b1d94b3a..de8354410 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/Wrapper.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app122/Wrapper.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app122; @@ -31,7 +31,7 @@ /** * The type Wrapper. * - * @param the type parameter + * @param the type parameter */ class Wrapper { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/HelloController.java index 514534398..279b89447 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app123; @@ -36,7 +36,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -44,8 +44,8 @@ class HelloController { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/MyExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/MyExceptionHandler.java index 3cddf30e4..1a352df61 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/MyExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/MyExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app123; @@ -55,7 +55,7 @@ public void bad(IllegalArgumentException e) { /** * Gateway object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(RuntimeException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/SpringDocApp123Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/SpringDocApp123Test.java index c9e769330..8e4decb7c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/SpringDocApp123Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app123/SpringDocApp123Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app123; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/HelloController.java index c894f9255..a8cf9ca4e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app124; @@ -40,7 +40,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -60,8 +60,8 @@ public void bad(IllegalArgumentException e) { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java index d94b1ddcb..fb5cd24ae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/MyExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app124; @@ -40,7 +40,7 @@ class MyExceptionHandler { /** * Gateway object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(RuntimeException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java index a77177c79..28086d96f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app124/SpringDocApp124Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app124; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/DeprecatedEntity.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/DeprecatedEntity.java index 41a29eb3c..b89fe3581 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/DeprecatedEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/DeprecatedEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app125; @@ -30,6 +30,7 @@ /** * The type Deprecated entity. + * * @author bnasslahsen */ class DeprecatedEntity { @@ -57,7 +58,7 @@ public String getMyNonDeprecatedField() { /** * Sets my non deprecated field. * - * @param myNonDeprecatedField the my non deprecated field + * @param myNonDeprecatedField the my non deprecated field * @return the my non deprecated field */ @Deprecated diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/HelloController.java index cdce5b128..a030ef898 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app125; @@ -33,6 +33,7 @@ /** * The type Hello controller. + * * @author bnasslahsen */ @RestController @@ -41,7 +42,7 @@ class HelloController { /** * Gets all pets. * - * @param toto the toto + * @param toto the toto * @return the all pets */ @GetMapping(value = "/search", produces = { "application/xml", "application/json" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/SpringDocApp125Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/SpringDocApp125Test.java index 7e6380c6d..4dc900117 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/SpringDocApp125Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app125/SpringDocApp125Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app125; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/HelloController.java index a696c3cf1..b0d210705 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app126; @@ -42,7 +42,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController @ApiResponses(value = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/Problem.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/Problem.java index c2bd815ec..e8cf817d9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/Problem.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/Problem.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app126; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SecurityProblemResponsesConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SecurityProblemResponsesConfiguration.java index e833187b2..b3ffb0d09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SecurityProblemResponsesConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SecurityProblemResponsesConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app126; @@ -80,7 +80,7 @@ class SecurityProblemResponsesConfiguration { /** * Http 401 no token response map . entry. * - * @return the map . entry + * @return the map . entry * @throws IOException the io exception */ @Bean @@ -91,7 +91,7 @@ public Map.Entry http401NoTokenResponse() throws IOExceptio /** * Http 401 bad token response map . entry. * - * @return the map . entry + * @return the map . entry * @throws IOException the io exception */ @Bean @@ -102,7 +102,7 @@ public Map.Entry http401BadTokenResponse() throws IOExcepti /** * Http 403 example map . entry. * - * @return the map . entry + * @return the map . entry * @throws IOException the io exception */ @Bean @@ -113,9 +113,9 @@ public Map.Entry http403Example() throws IOException { /** * Simple response map . entry. * - * @param code the code - * @param description the description - * @return the map . entry + * @param code the code + * @param description the description + * @return the map . entry * @throws IOException the io exception */ private Map.Entry simpleResponse(String code, String description) throws IOException { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SpringDocApp126Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SpringDocApp126Test.java index ddb92c0be..95746c2dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SpringDocApp126Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app126/SpringDocApp126Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app126; @@ -53,7 +53,7 @@ static class SpringDocTestApp { /** * Response registration customizer open api customiser. * - * @param responsesToRegister the responses to register + * @param responsesToRegister the responses to register * @return the open api customiser */ @Bean diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/AbstractObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/AbstractObject.java index 6dfeafb8e..efa5a2d6b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/AbstractObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/AbstractObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app127; @@ -55,7 +55,7 @@ public abstract class AbstractObject { /** * Instantiates a new Abstract object. * - * @param type the type + * @param type the type * @param name the name */ protected AbstractObject(ConcreteType type, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteObjectA.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteObjectA.java index 23006a170..0d0c7f0bf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteObjectA.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteObjectA.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app127; @@ -39,7 +39,7 @@ class ConcreteObjectA extends AbstractObject { /** * Instantiates a new Concrete object a. * - * @param name the name + * @param name the name * @param description the description */ public ConcreteObjectA(String name, String description) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteType.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteType.java index dd15b5ddd..ee7a586d5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteType.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/ConcreteType.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Controller.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Controller.java index f75109cd5..6aabbf161 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Controller.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Controller.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/SpringDocApp127Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/SpringDocApp127Test.java index 49ba546b8..4bec9fd0a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/SpringDocApp127Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/SpringDocApp127Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Umbrella.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Umbrella.java index 6c226d19d..f0d51aba9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Umbrella.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app127/Umbrella.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app127; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/ActualReturnedEntity.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/ActualReturnedEntity.java index deae7559f..2353346fb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/ActualReturnedEntity.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/ActualReturnedEntity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app129; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java index 66d386c2b..6d2c37e12 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app129; @@ -45,8 +45,8 @@ class HelloController { /** * Update deferred result. * - * @param entity the entity - * @return the deferred result + * @param entity the entity + * @return the deferred result * @throws Exception the exception */ @PostMapping("/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/OperationResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/OperationResponse.java index deeebd750..06fe5d8cc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/OperationResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/OperationResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app129; @@ -31,7 +31,7 @@ /** * The type Operation response. * - * @param the type parameter + * @param the type parameter */ class OperationResponse { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/SpringDocApp129Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/SpringDocApp129Test.java index 71c8abbec..ebfc0f737 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/SpringDocApp129Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app129/SpringDocApp129Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app129; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java index eb0b07e62..460b829d7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app13; @@ -38,7 +38,7 @@ class HelloController { /** * Persons string. * - * @param dto the dto + * @param dto the dto * @return the string */ @GetMapping(value = "/persons") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java index 98db80622..409d4faaa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app13; @@ -58,9 +58,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java index 3065d5464..67c9778ad 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app13/SpringDocApp13Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app13; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/HelloController.java index afba85c71..d1e7ae15f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app130; @@ -39,7 +39,7 @@ class HelloController { /** * List tracker data. * - * @param toto the toto + * @param toto the toto * @return the tracker data */ @PostMapping(value = "/values/data") @@ -50,7 +50,7 @@ TrackerData list(TrackerData toto) { /** * Get tracker data. * - * @param toto the toto + * @param toto the toto * @return the tracker data */ @GetMapping(value = "/values/datakk") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/SpringDocApp130Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/SpringDocApp130Test.java index 885be4f01..21fbc9401 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/SpringDocApp130Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/SpringDocApp130Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app130; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/TrackerData.java index dd09c0402..cb22d8d33 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/TrackerData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app130/TrackerData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app130; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/HelloController.java index 0c1045994..b9ada7946 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app131; @@ -43,7 +43,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/Organization.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/Organization.java index 309e3b55d..c3891fbb8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/Organization.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/Organization.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app131; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/RestControllerError.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/RestControllerError.java index 9d258443f..4df20dece 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/RestControllerError.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/RestControllerError.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app131; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/SpringDocApp131Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/SpringDocApp131Test.java index ada5828ce..d41e795b2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/SpringDocApp131Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app131/SpringDocApp131Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app131; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/HelloController.java index 74e80592d..0177d7a85 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app132; @@ -43,7 +43,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/Organization.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/Organization.java index 46bb692fd..d1641cea3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/Organization.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/Organization.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app132; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/RestControllerError.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/RestControllerError.java index ff831d670..820588d71 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/RestControllerError.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/RestControllerError.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app132; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/SpringDocApp132Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/SpringDocApp132Test.java index 090a7d364..be2ebf166 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/SpringDocApp132Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app132/SpringDocApp132Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app132; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/HelloController.java index 986668df6..f98ddb41e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app133; @@ -42,7 +42,7 @@ class HelloController { /** * Gets message from header 1. * - * @param header the header + * @param header the header * @return the message from header 1 */ @GetMapping(path = "/test1", headers = { "myHeader" }) @@ -56,7 +56,7 @@ public String getMessageFromHeader1( /** * Gets message from header 2. * - * @param header the header + * @param header the header * @return the message from header 2 */ @GetMapping("/test2") @@ -70,7 +70,7 @@ public String getMessageFromHeader2( /** * Gets message from header 3. * - * @param header the header + * @param header the header * @return the message from header 3 */ @GetMapping(path = "/test3", headers = { "myHeader" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/SpringDocApp133Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/SpringDocApp133Test.java index f0448d855..f9c147c1e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/SpringDocApp133Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app133/SpringDocApp133Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app133; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/HelloController.java index 82da5f9ba..9bbe55d10 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app134; @@ -80,7 +80,7 @@ class HelloController { /** * Gets sample v 1. * - * @param id the id + * @param id the id * @return the sample v 1 */ @GetMapping(value = "/{id}", produces = VERSION_1, headers = HEADER_1) @@ -96,7 +96,7 @@ public SampleV1 getSampleV1(@Parameter(description = "The sample's id", required /** * Gets sample v 2. * - * @param id the id + * @param id the id * @return the sample v 2 */ @GetMapping(value = "/{id}", produces = VERSION_2, headers = { HEADER_2, HEADER_1 }) @@ -111,7 +111,7 @@ public SampleV2 getSampleV2(@Parameter(description = "The sample's id", required /** * Search samples list. * - * @param searchRequest the search request + * @param searchRequest the search request * @return the list */ @PostMapping(path = "/search", consumes = VERSION_2, produces = VERSION_2) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/OpenApiConfig.java index fd20ab7c6..024a7388d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app134; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/SpringDocApp134Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/SpringDocApp134Test.java index ef2f9bbb8..2910fd5ae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/SpringDocApp134Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app134/SpringDocApp134Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app134; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/Book.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/Book.java index 3d7d48333..5c7974166 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/Book.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app135; @@ -49,8 +49,8 @@ class Book { /** * Instantiates a new Book. * - * @param id the id - * @param title the title + * @param id the id + * @param title the title * @param author the author */ public Book(String id, String title, String author) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRepository.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRepository.java index 91c3a4ea9..6db219005 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app135; @@ -40,7 +40,7 @@ class BookRepository { /** * Find by author list. * - * @param author the author + * @param author the author * @return the list */ List findByAuthor(String author) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRouter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRouter.java index 008d3939f..294481573 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRouter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app135; @@ -53,7 +53,7 @@ class BookRouter { /** * Routes router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -74,7 +74,7 @@ RouterFunction routes(BookRepository br) { /** * Routes 1 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -93,7 +93,7 @@ RouterFunction routes1(BookRepository br) { /** * Routes 3 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -119,7 +119,7 @@ RouterFunction routes3(BookRepository br) { /** * Routes 4 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/SpringDocApp135Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/SpringDocApp135Test.java index 3d0ada9da..5c5c7e9db 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/SpringDocApp135Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app135/SpringDocApp135Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app135; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/HelloController.java index fcef107a9..1e6a8696a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app137; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/OpenApiConfig.java index f14230f86..11167544c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app137; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/SpringDocApp137Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/SpringDocApp137Test.java index 038156fe8..e284ec971 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/SpringDocApp137Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app137/SpringDocApp137Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app137; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/HelloController.java index 2748bb6b1..5b68fdfbb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app138; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/SpringDocApp138Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/SpringDocApp138Test.java index 05758f756..d8d73a449 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/SpringDocApp138Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app138/SpringDocApp138Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app138; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/HelloController.java index 63d6a28a2..0671e54a6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app139; @@ -40,7 +40,7 @@ class HelloController { /** * Echo 1 string. * - * @param text the text + * @param text the text * @return the string */ @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE, path = "/test1") @@ -51,7 +51,7 @@ public String echo1(@RequestParam(name = "${test.name}", defaultValue = "${test. /** * Echo 2 string. * - * @param text the text + * @param text the text * @return the string */ @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE, path = "/test2") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/SpringDocApp139Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/SpringDocApp139Test.java index 0c016018e..39e3ad065 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/SpringDocApp139Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app139/SpringDocApp139Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app139; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java index fdcad2187..a59f6ab2c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java index f2a341dc9..459733caa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app14/SpringDocApp14Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app14; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/HelloApplication.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/HelloApplication.java index 1870c2deb..c637d776b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/HelloApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/HelloApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app140; @@ -68,9 +68,9 @@ class HelloApplication { /** * Filter server response. * - * @param serverRequest the server request - * @param handlerFunction the handler function - * @return the server response + * @param serverRequest the server request + * @param handlerFunction the handler function + * @return the server response * @throws Exception the exception */ private static ServerResponse filter(ServerRequest serverRequest, HandlerFunction handlerFunction) throws Exception { @@ -80,7 +80,7 @@ private static ServerResponse filter(ServerRequest serverRequest, HandlerFunctio /** * Routes router function. * - * @param ph the ph + * @param ph the ph * @return the router function */ @Bean @@ -107,10 +107,10 @@ class SimpleFilter extends GenericFilter { /** * Do filter. * - * @param req the req - * @param res the res - * @param filterChain the filter chain - * @throws IOException the io exception + * @param req the req + * @param res the res + * @param filterChain the filter chain + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override @@ -143,7 +143,7 @@ class PersonHandler { /** * Handle get all people server response. * - * @param serverRequest the server request + * @param serverRequest the server request * @return the server response */ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { @@ -153,10 +153,10 @@ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { /** * Handle post person server response. * - * @param r the r - * @return the server response - * @throws ServletException the servlet exception - * @throws IOException the io exception + * @param r the r + * @return the server response + * @throws ServletException the servlet exception + * @throws IOException the io exception */ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOException { Person result = personService.save(new Person(null, r.body(Person.class).getName())); @@ -167,7 +167,7 @@ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOExce /** * Handle get person by id server response. * - * @param r the r + * @param r the r * @return the server response */ ServerResponse handleGetPersonById(ServerRequest r) { @@ -184,7 +184,7 @@ class GreetingsRestController { /** * Greet string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping("/greet/{name}") @@ -217,7 +217,7 @@ class PersonService { /** * Save person. * - * @param p the p + * @param p the p * @return the person */ Person save(Person p) { @@ -238,7 +238,7 @@ Set all() { /** * By id person. * - * @param id the id + * @param id the id * @return the person */ Person byId(@Parameter(in = ParameterIn.PATH) Long id) { @@ -268,7 +268,7 @@ class Person { /** * Instantiates a new Person. * - * @param id the id + * @param id the id * @param name the name */ public Person(Long id, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/SpringDocApp140Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/SpringDocApp140Test.java index d694b7b65..00b0c45c2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/SpringDocApp140Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app140/SpringDocApp140Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app140; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/Book.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/Book.java index 53d34e09e..6b2901577 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/Book.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/Book.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app141; @@ -49,8 +49,8 @@ class Book { /** * Instantiates a new Book. * - * @param id the id - * @param title the title + * @param id the id + * @param title the title * @param author the author */ public Book(String id, String title, String author) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRepository.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRepository.java index e71f2630d..dcdb6d94a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRepository.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRepository.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app141; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRouter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRouter.java index 9058bc606..0cb32a1c2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRouter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/BookRouter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app141; @@ -53,7 +53,7 @@ class BookRouter { /** * Routes router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -75,7 +75,7 @@ RouterFunction routes(BookRepository br) { /** * Routes 1 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -93,7 +93,7 @@ RouterFunction routes1(BookRepository br) { /** * Routes 3 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean @@ -115,7 +115,7 @@ RouterFunction routes3(BookRepository br) { /** * Routes 4 router function. * - * @param br the br + * @param br the br * @return the router function */ @Bean diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/SpringDocApp141Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/SpringDocApp141Test.java index b73704df6..4e59f5570 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/SpringDocApp141Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app141/SpringDocApp141Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app141; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/HelloApplication.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/HelloApplication.java index 60efd2058..7fa4d1577 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/HelloApplication.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/HelloApplication.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app142; @@ -89,10 +89,10 @@ class SimpleFilter extends GenericFilter { /** * Do filter. * - * @param req the req - * @param res the res + * @param req the req + * @param res the res * @param filterChain the filter chain - * @throws IOException the io exception + * @throws IOException the io exception * @throws ServletException the servlet exception */ @Override @@ -138,7 +138,7 @@ ServerResponse handleGetAllPeople(ServerRequest serverRequest) { * @param r the r * @return the server response * @throws ServletException the servlet exception - * @throws IOException the io exception + * @throws IOException the io exception */ ServerResponse handlePostPerson(ServerRequest r) throws ServletException, IOException { Person result = personService.save(new Person(null, r.body(Person.class).getName())); @@ -250,7 +250,7 @@ class Person { /** * Instantiates a new Person. * - * @param id the id + * @param id the id * @param name the name */ public Person(Long id, String name) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/SpringDocApp142Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/SpringDocApp142Test.java index f81558d98..a64808c6d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/SpringDocApp142Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app142/SpringDocApp142Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app142; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java index b3e9fdaba..7010202e9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app149; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java index 8592c6b1e..edac553b0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/HelloMessage.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app149; @@ -43,7 +43,7 @@ class HelloMessage { /** * Instantiates a new Hello message. * - * @param text the text + * @param text the text * @param number the number */ public HelloMessage(String text, int number) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java index 978fccec9..cc285360b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app149/SpringDocApp149Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app149; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java index 557c22542..99c35e0c3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java index 497473a55..a064d5561 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app15/SpringDocApp15Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app15; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/HelloController.java index 16830e515..955e198c1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app150; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java index 954253b08..5cfca680d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app150/SpringDocApp150Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app150; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/HelloController.java index 9cd5c001e..fd6817879 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app151; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java index c62e734ac..1dec5971f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app151/SpringDocApp151Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app151; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java index 65eeda26c..9846532e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app152; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java index 96a82a7d7..174581f99 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app152/SpringDocApp152Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app152; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderState.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderState.java index b18293602..70d8ed996 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderState.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderState.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; @@ -35,11 +35,11 @@ @Schema(type = "string", allowableValues = { "finished", "new" }) public enum OrderState { /** - *Finished order state. + * Finished order state. */ FINISHED("finished"), /** - *New order state. + * New order state. */ NEW("new"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderStateMapper.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderStateMapper.java index 06f70cdee..e2b5ba4c7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderStateMapper.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/OrderStateMapper.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java index 9d2d97321..2ac40a6d8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/SpringDocApp153Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/TestController.java index 3771e2e3f..ced0385b7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app153/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app153; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/HelloController.java index 974ac26be..29c0fd78d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app154; @@ -55,8 +55,8 @@ public String hello() { /** * Create. * - * @param id the id - * @param o the o + * @param id the id + * @param o the o */ @PostMapping(value = "/persons") public void create(@ParameterObject Long id, @RequestBody Object o) { @@ -66,8 +66,8 @@ public void create(@ParameterObject Long id, @RequestBody Object o) { /** * Createone. * - * @param id the id - * @param o the o + * @param id the id + * @param o the o */ @PostMapping(value = "/personsone") public void createone(Long id, @RequestBody Object o) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/OpenApiConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/OpenApiConfiguration.java index 59b8554cf..3963e0ae9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/OpenApiConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/OpenApiConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app154; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/SpringDocApp154Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/SpringDocApp154Test.java index f058ba119..1afbdaa23 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/SpringDocApp154Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app154/SpringDocApp154Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app154; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractIntParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractIntParameterObject.java index 21722d79a..ee7e8521c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractIntParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractIntParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app155; @@ -29,7 +29,7 @@ /** * The type Abstract int parameter object. * - * @param the type parameter + * @param the type parameter */ class AbstractIntParameterObject { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractParameterObject.java index 641ae9161..9562f9036 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/AbstractParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app155; @@ -32,7 +32,7 @@ /** * The type Abstract parameter object. * - * @param the type parameter + * @param the type parameter */ class AbstractParameterObject> { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteEnum.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteEnum.java index dd1545bc5..915c9772e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteEnum.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteEnum.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app155; @@ -32,11 +32,11 @@ */ enum ConcreteEnum { /** - *One concrete enum. + * One concrete enum. */ ONE, /** - *Two concrete enum. + * Two concrete enum. */ TWO diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteIntParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteIntParameterObject.java index 6dd625e79..d947de9ce 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteIntParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteIntParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app155; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteParameterObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteParameterObject.java index d42bc8242..d010cae31 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteParameterObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/ConcreteParameterObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app155; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/HelloController.java index 713fb1679..719f34f08 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app155; @@ -42,7 +42,7 @@ class HelloController { /** * Say hello response entity. * - * @param test the test + * @param test the test * @return the response entity */ @GetMapping("/test1") @@ -54,7 +54,7 @@ public ResponseEntity sayHello(@ParameterObject final ConcreteParameterO /** * Say hello response entity. * - * @param test the test + * @param test the test * @return the response entity */ @GetMapping("/test2") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/SpringDocApp155Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/SpringDocApp155Test.java index 597ddf730..777ac67fc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/SpringDocApp155Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app155/SpringDocApp155Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app155; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/HelloController.java index c158e0eb4..41bf8de9e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app156; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SomeEnum.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SomeEnum.java index c2b70fc2e..f5dbc28e4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SomeEnum.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SomeEnum.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app156; @@ -31,11 +31,11 @@ */ public enum SomeEnum { /** - *First some enum. + * First some enum. */ FIRST, /** - *Second some enum. + * Second some enum. */ SECOND } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SpringDocApp156Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SpringDocApp156Test.java index c21e1b30a..0ad48ccfd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SpringDocApp156Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/SpringDocApp156Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app156; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/User.java index b9c97aec4..7ce39c87d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app156/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app156; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Bar.java index 60f2b7722..bb7f63db7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Foo.java index d46daa3d6..fc71b3f93 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/HelloController.java index 2dba96357..221db6e5f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java index 029eac331..4944292db 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/SpringDocApp157Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/StringyConverter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/StringyConverter.java index a3faba2a1..49d2b530e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/StringyConverter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app157/StringyConverter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app157; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/CommonFooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/CommonFooErrorHandler.java index 1c04b3c82..ba8ba53e9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/CommonFooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/CommonFooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app158; @@ -38,7 +38,7 @@ class CommonFooErrorHandler { /** * On exception error dto. * - * @param e the e + * @param e the e * @return the error dto */ @ExceptionHandler diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/ErrorDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/ErrorDTO.java index 1dad3f006..fd8a62a86 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/ErrorDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/ErrorDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/HelloController.java index 990de2b1d..69ca28fab 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SimpleDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SimpleDTO.java index 075abc466..fd991c7c2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SimpleDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SimpleDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpecificFooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpecificFooErrorHandler.java index 0aa94ff4f..718671c9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpecificFooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpecificFooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpringDocApp158Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpringDocApp158Test.java index e23eb73c4..5971c20eb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpringDocApp158Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app158/SpringDocApp158Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app158; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/CustomException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/CustomException.java index fdc74dbc0..5059437b8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/CustomException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/CustomException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooBean.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooBean.java index c9b722b99..e43ba12dd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooBean.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooBean.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app159; @@ -48,7 +48,7 @@ class FooBean { * Instantiates a new Foo bean. * * @param message the message - * @param code the code + * @param code the code */ public FooBean(String message, int code) { this.message = message; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooErrorHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooErrorHandler.java index 7e6939ebc..7bd9450c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooErrorHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/FooErrorHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/HelloController.java index 65dc96c49..56065a1a1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/SpringDocApp159Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/SpringDocApp159Test.java index 52307664d..ba8f662ef 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/SpringDocApp159Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/SpringDocApp159Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/Views.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/Views.java index d8cac5486..2378acffa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/Views.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app159/Views.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app159; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/HelloController.java index 0d65d30b8..f22f6aea4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java index 47e6ab3f8..8259a34a4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app16/SpringDocApp16Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app16; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/HelloController.java index 4bb82def1..d72c7b5bb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app160; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/SpringDocApp160Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/SpringDocApp160Test.java index 77aad6817..6be817a7b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/SpringDocApp160Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app160/SpringDocApp160Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app160; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/HelloController.java index 640a7ba8c..b68d79b4c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app161; @@ -45,8 +45,8 @@ class HelloController { /** * Add response entity. * - * @param content the content - * @return the response entity + * @param content the content + * @return the response entity * @throws Exception the exception */ @Operation(summary = "add") @@ -59,8 +59,8 @@ public ResponseEntity add(@Parameter(description = "content") @RequestPart /** * Add 2 response entity. * - * @param content the content - * @param type the type + * @param content the content + * @param type the type * @return the response entity */ @Operation(summary = "add2") @@ -75,7 +75,7 @@ public ResponseEntity add2( /** * Test. * - * @param strValue the str value + * @param strValue the str value * @param intValue the int value */ @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/SpringDocApp161Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/SpringDocApp161Test.java index 93a326b63..939f6a23d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/SpringDocApp161Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app161/SpringDocApp161Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app161; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/SpringDocApp162Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/SpringDocApp162Test.java index cc45b56be..a264a3d82 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/SpringDocApp162Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/SpringDocApp162Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app162; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NoResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NoResultException.java index 057134aa4..24ee6dd5a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NoResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NoResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app162.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NonUniqueResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NonUniqueResultException.java index 4dbb567ce..4c206df22 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NonUniqueResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/exception/NonUniqueResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app162.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/JavadocOnlyRestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/JavadocOnlyRestController.java index acabc68b6..b7a81700e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/JavadocOnlyRestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/JavadocOnlyRestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app162.rest; @@ -106,7 +106,7 @@ public ResponseEntity find(@PathVariable String guid) throws * * @param prefix the {@code @param prefix} javadoc for the {@code #findStartsBy(String)} method * @return the {@code @return} javadoc for the {@code #findStartsBy(String)} method - * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method + * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method * @throws NonUniqueResultException the {@code @throws NonUniqueResultException} javadoc for the {@code #findStartsBy(String)} method */ @GetMapping(path = "startsBy/{prefix}", produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/dto/JavadocOnlyRestDto.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/dto/JavadocOnlyRestDto.java index aaeb78393..41d8cf3aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/dto/JavadocOnlyRestDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/dto/JavadocOnlyRestDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app162.rest.dto; @@ -37,7 +37,6 @@ public class JavadocOnlyRestDto { /** * This is the private {@code #inner} field's javadoc. - * * This javadoc description is ignored by the REST documentation: * the {@code $ref} can't have a description as any sibling elements of a $ref are ignored. */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/util/RestExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/util/RestExceptionHandler.java index 24a644d57..bf71db40d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/util/RestExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app162/rest/util/RestExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app162.rest.util; @@ -37,14 +37,12 @@ /** * REST exception handlers. - * * This javadoc description is ignored by the REST documentation. */ @RestControllerAdvice class RestExceptionHandler { /** * REST exception handler for {@code NoResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNotFoundException(NoResultException)} method @@ -57,7 +55,6 @@ public ResponseEntity handleNotFoundException(NoResultException exceptio /** * REST exception handler for {@code NonUniqueResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNonUniqueResultException(NonUniqueResultException)} method diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/SpringDocApp163Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/SpringDocApp163Test.java index 8fe6958b9..c756c8e42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/SpringDocApp163Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/SpringDocApp163Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NoResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NoResultException.java index 1c4fb94e1..c2e92aa21 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NoResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NoResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NonUniqueResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NonUniqueResultException.java index 4bc6620cb..29104511f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NonUniqueResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/exception/NonUniqueResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/AnnotationOverrideForJavadocRestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/AnnotationOverrideForJavadocRestController.java index c2a8968d6..9066254b9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/AnnotationOverrideForJavadocRestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/AnnotationOverrideForJavadocRestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163.rest; @@ -103,7 +103,7 @@ public ResponseEntity create(@RequestBody A * * @param prefix the {@code @param prefix} javadoc for the {@code #findStartsBy(String)} method * @return the {@code @return} javadoc for the {@code #findStartsBy(String)} method - * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method + * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method * @throws NonUniqueResultException the {@code @throws NonUniqueResultException} javadoc for the {@code #findStartsBy(String)} method */ @Operation( diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java index 48eecb048..22635ac9a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163.rest.dto; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java index 047522cc5..2a9fc3882 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163.rest.dto; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java index 6d476910e..2236e0d3f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/dto/AnnotationOverrideForJavadocRestDto3.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163.rest.dto; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/util/RestExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/util/RestExceptionHandler.java index 980141e06..0f11462c2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/util/RestExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app163/rest/util/RestExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app163.rest.util; @@ -37,14 +37,12 @@ /** * REST exception handlers. - * * This javadoc description is ignored by the REST documentation. */ @RestControllerAdvice class RestExceptionHandler { /** * REST exception handler for {@code NoResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNotFoundException(NoResultException)} method @@ -57,7 +55,6 @@ public ResponseEntity handleNotFoundException(NoResultException exceptio /** * REST exception handler for {@code NonUniqueResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNonUniqueResultException(NonUniqueResultException)} method diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocApp164Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocApp164Test.java index 7b1b89953..5642e71f5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocApp164Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocApp164Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app164; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocJavadocProviderTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocJavadocProviderTest.java index 7e914307d..2929c9625 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocJavadocProviderTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/SpringDocJavadocProviderTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app164; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NoResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NoResultException.java index f63a57ef5..42ee72eb0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NoResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NoResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app164.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NonUniqueResultException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NonUniqueResultException.java index 7a247ff6e..2f44ea416 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NonUniqueResultException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/exception/NonUniqueResultException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app164.exception; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/NoGenericOverrideRestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/NoGenericOverrideRestController.java index 1d4641525..06b8ca8c6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/NoGenericOverrideRestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/NoGenericOverrideRestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app164.rest; @@ -65,7 +65,7 @@ public ResponseEntity create(@RequestBody String input) { * * @param prefix the {@code @param prefix} javadoc for the {@code #findStartsBy(String)} method * @return the {@code @return} javadoc for the {@code #findStartsBy(String)} method - * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method + * @throws NoResultException the {@code @throws NoResultException} javadoc for the {@code #findStartsBy(String)} method * @throws NonUniqueResultException the {@code @throws NonUniqueResultException} javadoc for the {@code #findStartsBy(String)} method */ @GetMapping(path = "startsBy/{prefix}", produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/util/RestExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/util/RestExceptionHandler.java index 9cca4adcc..618e7ba75 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/util/RestExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app164/rest/util/RestExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app164.rest.util; @@ -37,14 +37,12 @@ /** * REST exception handlers. - * * This javadoc description is ignored by the REST documentation. */ @RestControllerAdvice class RestExceptionHandler { /** * REST exception handler for {@code NoResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNotFoundException(NoResultException)} method @@ -57,7 +55,6 @@ public ResponseEntity handleNotFoundException(NoResultException exceptio /** * REST exception handler for {@code NonUniqueResultException}. - * * This javadoc description is ignored by the REST documentation. * * @return the {@code return} javadoc for the {@code #handleNonUniqueResultException(NonUniqueResultException)} method diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/ConcreteSubclassFromGeneric.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/ConcreteSubclassFromGeneric.java index 45fb20c50..88994de8b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/ConcreteSubclassFromGeneric.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/ConcreteSubclassFromGeneric.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/HelloController.java index 9e9a4451b..cb5627ddc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/MyData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/MyData.java index e404105f7..e7a7a94b0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/MyData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/MyData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleGeneric.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleGeneric.java index 28aab7f4a..df9ad756e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleGeneric.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleGeneric.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerClass.java index cdf964cb5..ff81f915f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerInnerClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerInnerClass.java index 841adc1d5..84d154e1b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerInnerClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleInnerInnerClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleOuterClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleOuterClass.java index 9d8a462a0..61a16dbfa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleOuterClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SimpleOuterClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java index 79fe0bb03..aff51ec10 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app166/SpringDocApp166Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app166; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/HelloController.java index e9c986755..fa5ced908 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app167; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/SpringDocApp167Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/SpringDocApp167Test.java index 87b08a283..2ec9bde8a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/SpringDocApp167Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app167/SpringDocApp167Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app167; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/DescriptionFieldInRequestBodyIsNullController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/DescriptionFieldInRequestBodyIsNullController.java index 2eb6efeca..998beb959 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/DescriptionFieldInRequestBodyIsNullController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/DescriptionFieldInRequestBodyIsNullController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app168; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/Person.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/Person.java index c7ee1fd9f..611368b35 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app168; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/SpringDocApp168Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/SpringDocApp168Test.java index 593383161..21c943d87 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/SpringDocApp168Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app168/SpringDocApp168Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app168; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/RecordController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/RecordController.java index b42b79b5a..1f1605e3d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/RecordController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/RecordController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app169; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleInnerClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleInnerClass.java index 197b464c7..60d6b27cc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleInnerClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleInnerClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app169; @@ -29,7 +29,7 @@ /** * simple inner class * - * @param name the boolean name + * @param name the boolean name * @param maxNumber the max number */ public record SimpleInnerClass(Boolean name, Integer maxNumber) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleOuterClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleOuterClass.java index c91fa83f1..923642238 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleOuterClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SimpleOuterClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app169; @@ -29,7 +29,7 @@ /** * simple outer class * - * @param name the name of the outer class + * @param name the name of the outer class * @param simpleInnerClass the inner class */ public record SimpleOuterClass(String name, SimpleInnerClass simpleInnerClass) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SpringDocApp169Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SpringDocApp169Test.java index c0d9ea89c..89bc52305 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SpringDocApp169Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app169/SpringDocApp169Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app169; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/HelloController.java index e2b6bb9c7..790276ed9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java index 9bdca5cd7..a667aa2d5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app17/SpringDocApp17Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app17; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Animal.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Animal.java index ab8e55e4f..867072ac1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Animal.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Animal.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/BasicController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/BasicController.java index cd5141d80..cba84e90f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/BasicController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/BasicController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Cat.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Cat.java index d141ceefd..e8ed8f62c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Cat.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Cat.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Dog.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Dog.java index d1b3b5da0..f5df94ebc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Dog.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/Dog.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app170; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/SpringDocApp170Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/SpringDocApp170Test.java index 8d3c9b2a2..3ffe71660 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/SpringDocApp170Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app170/SpringDocApp170Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app170; @@ -29,10 +29,12 @@ import test.org.springdoc.api.v31.AbstractSpringDocTest; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.test.context.TestPropertySource; /** * The type Spring doc app 193 test. */ +@TestPropertySource(properties = "springdoc.remove-broken-reference-definitions=false") class SpringDocApp170Test extends AbstractSpringDocTest { /** diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/HelloController.java index 55dcac2c3..c8e543257 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app171; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonDTO.java index 7aae78084..1277bd021 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app171; @@ -45,9 +45,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonProjection.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonProjection.java index a84ba422f..91cd47221 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonProjection.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/PersonProjection.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app171; @@ -32,19 +32,16 @@ public interface PersonProjection { /** * The Email. - * */ String getEmail(); /** * The First name. - * */ String getFirstName(); /** * The Last name. - * */ String getLastName(); } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/SpringDocApp171Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/SpringDocApp171Test.java index 4d68deca3..41008b587 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/SpringDocApp171Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app171/SpringDocApp171Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app171; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app172/JavadocPropertyCustomizerTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app172/JavadocPropertyCustomizerTest.java index eef428098..ce4f24f76 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app172/JavadocPropertyCustomizerTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app172/JavadocPropertyCustomizerTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app172; @@ -132,7 +132,7 @@ void ifRecordObjectShouldGetField() throws IOException, ClassNotFoundException, .addProperty("name", new StringSchema().name("name")); List propertyDescriptors = Arrays.asList(Introspector.getBeanInfo(cls).getPropertyDescriptors()); - javadocPropertyCustomizer.setJavadocDescription(cls, fields, propertyDescriptors, existingSchema,false); + javadocPropertyCustomizer.setJavadocDescription(cls, fields, propertyDescriptors, existingSchema, false); assertEquals("Record Object", existingSchema.getDescription()); Map properties = existingSchema.getProperties(); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/Example.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/Example.java index 5faa64638..567abf27b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/Example.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/Example.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app173; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/ExampleController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/ExampleController.java index 7b387cfae..9e506191e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/ExampleController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/ExampleController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app173; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/SpringDocApp173Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/SpringDocApp173Test.java index a65457aa0..493fb1728 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/SpringDocApp173Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app173/SpringDocApp173Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app173; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/ExampleController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/ExampleController.java index 2bd1b3343..db72867bb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/ExampleController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/ExampleController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app174; @@ -36,7 +36,7 @@ class ExampleController { @PostMapping - public Test post(){ + public Test post() { return null; } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Question.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Question.java index c75a33fb5..dfb8efbea 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Question.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Question.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app174; @@ -43,6 +43,7 @@ }) public abstract class Question { private final String question; + private final String type; public Question(String question, String type) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/SpringDocApp174Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/SpringDocApp174Test.java index 17aab26dc..45b64c67a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/SpringDocApp174Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/SpringDocApp174Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app174; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Test.java index 2accb3611..7417dfd3e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app174; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TestQuestion.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TestQuestion.java index d2dfc244a..ce2bd4fb3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TestQuestion.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TestQuestion.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app174; @@ -38,6 +38,7 @@ class TestQuestion extends Question { * list of variants */ private final List variants; + /** * correct answer */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TextQuestion.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TextQuestion.java index 5e806f3e8..1f2f0a2b1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TextQuestion.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app174/TextQuestion.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app174; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java index f02c5bc52..32b22d0b4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app18; @@ -30,6 +30,7 @@ import jakarta.validation.constraints.NegativeOrZero; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Positive; import jakarta.validation.constraints.PositiveOrZero; import org.springframework.web.bind.annotation.GetMapping; @@ -45,7 +46,7 @@ class HelloController { /** * Persons string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons") @@ -56,7 +57,7 @@ public String persons(@NotBlank String name) { /** * Persons 2 string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons2") @@ -67,7 +68,7 @@ public String persons2(@NotBlank @Parameter(description = "persons name") String /** * Persons 3 string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons3") @@ -78,7 +79,7 @@ public String persons3(@NotBlank @Parameter(description = "persons name") @Reque /** * Persons 4 string. * - * @param age the age + * @param age the age * @return the string */ @GetMapping(value = "/persons4") @@ -89,7 +90,7 @@ public String persons4(@PositiveOrZero int age) { /** * Persons 5 string. * - * @param age the age + * @param age the age * @return the string */ @GetMapping(value = "/persons5") @@ -100,7 +101,7 @@ public String persons5(@NegativeOrZero int age) { /** * Persons 6 string. * - * @param name the name + * @param name the name * @return the string */ @GetMapping(value = "/persons6") @@ -108,4 +109,14 @@ public String persons6(@NotEmpty @Parameter(description = "persons name") String return "OK"; } + /** + * Persons 7 string. + * + * @param age the age + * @return the string + */ + @GetMapping(value = "/persons7") + public String persons7(@Positive int age) { + return "OK"; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java index 11df9baa0..067c04d5b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app18/SpringDocApp18Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app18; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/HelloController.java index 34783925d..65f6c3a9f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app19; @@ -42,7 +42,7 @@ class HelloController { /** * Persons string. * - * @param name the name + * @param name the name * @return the string */ @PostMapping(value = "/persons") @@ -53,7 +53,7 @@ public String persons(@RequestBody(description = "requestBody description as par /** * Persons 2 string. * - * @param name the name + * @param name the name * @return the string */ @RequestBody(description = "requestBody description outside") @@ -65,7 +65,7 @@ public String persons2(String name) { /** * Persons 3 string. * - * @param name the name + * @param name the name * @return the string */ @Operation(requestBody = @RequestBody(description = "requestBody inside operation annotation")) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java index ff9d09593..9f2093d63 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app19/SpringDocApp19Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app19; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java index 5d842a40a..649b3080a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ApiUtil.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ApiUtil.java index c222e7370..de5511931 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ApiUtil.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ApiUtil.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; @@ -42,9 +42,9 @@ class ApiUtil { /** * Sets example response. * - * @param req the req + * @param req the req * @param contentType the content type - * @param example the example + * @param example the example */ public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { try { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ExceptionTranslator.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ExceptionTranslator.java index 4dbf76309..c13e63fc2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ExceptionTranslator.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/ExceptionTranslator.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/HomeController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/HomeController.java index 8012916e6..373ae2be3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/HomeController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/HomeController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApi.java index 06e129896..21806f39f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -102,7 +102,7 @@ default void addPet( /** * Delete pet response entity. * - * @param petId the pet id + * @param petId the pet id * @param apiKey the api key * @return the response entity */ @@ -189,8 +189,8 @@ default ResponseEntity updatePet( /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name + * @param petId the pet id + * @param name the name * @param status the status * @return the response entity */ @@ -208,9 +208,9 @@ default ResponseEntity updatePetWithForm( /** * Upload file response entity. * - * @param petId the pet id + * @param petId the pet id * @param additionalMetadata the additional metadata - * @param file the file + * @param file the file * @return the response entity */ @Operation(summary = "uploads an image", description = "", security = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiController.java index 69e0d92e4..e337a0922 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegate.java index dd5c111de..38066aa12 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; @@ -69,7 +69,7 @@ default void addPet(Pet pet) { /** * Delete pet response entity. * - * @param petId the pet id + * @param petId the pet id * @param apiKey the api key * @return the response entity * @see PetApi#deletePet PetApi#deletePet @@ -152,8 +152,8 @@ default ResponseEntity updatePet(Pet pet) { /** * Update pet with form response entity. * - * @param petId the pet id - * @param name the name + * @param petId the pet id + * @param name the name * @param status the status * @return the response entity * @see PetApi#updatePetWithForm PetApi#updatePetWithForm @@ -168,9 +168,9 @@ default ResponseEntity updatePetWithForm(Long petId, /** * Upload file response entity. * - * @param petId the pet id + * @param petId the pet id * @param additionalMetadata the additional metadata - * @param file the file + * @param file the file * @return the response entity * @see PetApi#uploadFile PetApi#uploadFile */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegateImpl.java index 655a2b2c0..479f8b546 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/PetApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApi.java index 61e8e2533..525d74b8b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiController.java index e95635ee0..69ae7ea2e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegate.java index a63e1710d..5fbd7353e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegateImpl.java index bc1c56a18..3078987c0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/StoreApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApi.java index 2c48d2dd5..f1e2c2598 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ /** @@ -181,7 +181,7 @@ default ResponseEntity logoutUser() { * Update user response entity. * * @param username the username - * @param user the user + * @param user the user * @return the response entity */ @Operation(summary = "Updated user", tags = { "user" }) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiController.java index de5f376fb..0bcaa73a6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegate.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegate.java index 7cc7e9245..cbf871d27 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegate.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegate.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; @@ -154,7 +154,7 @@ default ResponseEntity logoutUser() { * Update user response entity. * * @param username the username - * @param user the user + * @param user the user * @return the response entity * @see UserApi#updateUser UserApi#updateUser */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegateImpl.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegateImpl.java index e28deb1ba..14a82cc87 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegateImpl.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/api/UserApiDelegateImpl.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.api; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Category.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Category.java index 2c6d0cf26..dddd5d5db 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Category.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Category.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.model; @@ -46,6 +46,7 @@ class Category { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/ModelApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/ModelApiResponse.java index f90368566..448bc2840 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/ModelApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/ModelApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.model; @@ -51,6 +51,7 @@ public class ModelApiResponse { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Order.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Order.java index 3a41f1aeb..e66c65426 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Order.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Order.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.model; @@ -76,6 +76,7 @@ public class Order { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ @@ -295,15 +296,15 @@ public String toString() { */ public enum StatusEnum { /** - *Placed status enum. + * Placed status enum. */ PLACED("placed"), /** - *Approved status enum. + * Approved status enum. */ APPROVED("approved"), /** - *Delivered status enum. + * Delivered status enum. */ DELIVERED("delivered"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Pet.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Pet.java index f131d6e77..dd1b11582 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.model; @@ -82,6 +82,7 @@ public class Pet { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ @@ -327,15 +328,15 @@ public String toString() { */ public enum StatusEnum { /** - *Available status enum. + * Available status enum. */ AVAILABLE("available"), /** - *Pending status enum. + * Pending status enum. */ PENDING("pending"), /** - *Sold status enum. + * Sold status enum. */ SOLD("sold"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Tag.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Tag.java index b5f3a80ef..b9270d04f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Tag.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/Tag.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.model; @@ -49,6 +49,7 @@ class Tag { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/User.java index ae89052a3..1be2b0de7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app2/model/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2.model; @@ -84,6 +84,7 @@ public class User { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). + * * @param o the o * @return the string */ diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/HelloController.java index 8978a9b0d..1e21cc613 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java index 42680d7ad..7b11fe05b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app20/SpringDocApp20Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app20; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/HelloController.java index bc7c700a8..ef3906fe4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java index a1b4ed732..327f32f3f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app21/SpringDocApp21Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app21; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/HelloController.java index 436695a3a..65d02523d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonDTO.java index 788ceaf13..c86130864 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app22; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java index 7f5028b5a..543116017 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app22/SpringDocApp22Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app22; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/HelloController.java index dc3eb1225..4f323fe31 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java index 7fb60a75e..da70623bd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app23/SpringDocApp23Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app23; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/HelloController.java index 1adb6ecd7..bca1db0c7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java index cf71627c4..07f004648 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocApp24Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocTestApp.java index ba0cb7c28..48d95db8b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app24/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app24; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/HelloController.java index 3de3fd55f..8dedbc90b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25; @@ -58,9 +58,9 @@ void check() { /** * List. * - * @param trackerId the tracker id - * @param startDate the start date - * @param endDate the end date + * @param trackerId the tracker id + * @param startDate the start date + * @param endDate the end date */ @GetMapping(value = "/list/{trackerId}") void list( @@ -75,7 +75,7 @@ void list( * * @param trackerId the tracker id * @param startDate the start date - * @param endDate the end date + * @param endDate the end date */ @GetMapping(value = "/secondlist/{trackerId}") void secondlist( @@ -88,10 +88,10 @@ void secondlist( /** * Third list. * - * @param trackerId the tracker id - * @param start the start - * @param end the end - * @param limit the limit + * @param trackerId the tracker id + * @param start the start + * @param end the end + * @param limit the limit */ @Operation(description = "Get last data from a tracker", parameters = { @Parameter(name = "trackerId", in = ParameterIn.PATH, required = true, schema = @Schema(type = "string", example = "the-tracker-id")), diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java index 55ddeee1e..079973397 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app25/SpringDocApp25Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app25; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Bar.java index 380124398..f8cd18a49 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Foo.java index 67ea50630..931ec1ef0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/HelloController.java index 8fb5d7ec4..bb7dc535f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; @@ -38,7 +38,7 @@ class HelloController { /** * Persons my model. * - * @param myModel the my model + * @param myModel the my model * @return the my model */ @PostMapping(value = "/persons") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java index 3ce6f8bd5..40862a21c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/MyModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java index 1cc622d7b..4132eb42e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app26/SpringDocApp26Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app26; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Advice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Advice.java index e7a4309a2..f3c8e2661 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Advice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Advice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; @@ -43,8 +43,8 @@ class Advice { /** * Handle exception foo. * - * @param ex the ex - * @param request the request + * @param ex the ex + * @param request the request * @return the foo */ @ExceptionHandler(Exception.class) @@ -56,8 +56,8 @@ public Foo handleException(Exception ex, WebRequest request) { /** * Handle my exception bar. * - * @param ex the ex - * @param request the request + * @param ex the ex + * @param request the request * @return the bar */ @ExceptionHandler(MyException.class) @@ -69,8 +69,8 @@ public Bar handleMyException(MyException ex, WebRequest request) { /** * Handle my exception 2 bar. * - * @param ex the ex - * @param request the request + * @param ex the ex + * @param request the request * @return the bar */ @Hidden diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Bar.java index 373ed987e..b44aa7f42 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Foo.java index e529033ed..7bab42bff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java index 14bcfc64f..2267919f8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/MyException.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/MyException.java index 565f89f70..6f85dbdc5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/MyException.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/MyException.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java index 270ef4af5..1e71f4be3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app27/SpringDocApp27Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app27; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java index b781ecce0..128d1119b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app28; @@ -41,8 +41,8 @@ class HelloController { /** * Upload 2 string. * - * @param one the one - * @param two the two + * @param one the one + * @param two the two * @return the string */ @PostMapping(value = "/upload2", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java index 330f4dd78..30a1d7df0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app28/SpringDocApp28Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app28; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/HelloController.java index 554764b72..d7c1768c6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app29; @@ -47,7 +47,7 @@ class HelloController { /** * Post entity list. * - * @param postEntity the post entity + * @param postEntity the post entity * @return the list */ @PostMapping(value = "/post-entity") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java index c0b1381fe..7daa06000 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/SpringDocApp29Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java index e76eeb89c..c79bef79c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app29/TrackerData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app29; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java index b27de8ee1..7f4b37b1b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PersonDTO.java index 961d50fad..9eeab5f4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; @@ -55,9 +55,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email + * @param email the email * @param firstName the first name - * @param lastName the last name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PlayingCard.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PlayingCard.java index ed40e6d9c..95cc4d78a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PlayingCard.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/PlayingCard.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; @@ -108,19 +108,19 @@ public void setValue(Integer value) { */ public enum Suit { /** - *Hearts suit. + * Hearts suit. */ HEARTS("Hearts"), /** - *Diamonds suit. + * Diamonds suit. */ DIAMONDS("Diamonds"), /** - *Clubs suit. + * Clubs suit. */ CLUBS("Clubs"), /** - *Spades suit. + * Spades suit. */ SPADES("Spades"); diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java index 9019092bc..7188c995c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringDocApp3Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java index 01b850cb6..c677d7317 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java index 880ea67c9..5ed6af983 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app30/SpringDocApp30Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app30; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java index 30586d903..0fd26740e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app31; @@ -47,8 +47,8 @@ class HelloController { /** * Subscribe subscription response. * - * @param token the token - * @param url the url + * @param token the token + * @param url the url * @return the subscription response */ @PostMapping("/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java index 8c7ad8400..267191c25 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app31/SpringDocApp31Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app31; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java index f8f970d68..1fc31e1c5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app32; @@ -43,7 +43,7 @@ class HelloController { /** * Filter post string. * - * @param filter the filter + * @param filter the filter * @return the string */ @RequestMapping(value = "/filter", method = RequestMethod.POST) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java index 7fe71b1bb..bdc896b9f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app32/SpringDocApp32Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app32; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java index 20e91c3fc..7e4296909 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app33; @@ -36,7 +36,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -44,8 +44,8 @@ class HelloController { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java index de945d6a8..f3c042f3f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app33/SpringDocApp33Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app33; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/HelloController.java index 0151eeb43..349082dc5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; @@ -36,7 +36,7 @@ /** * The type Hello controller. * - * @param the type parameter + * @param the type parameter */ @RestController class HelloController { @@ -44,8 +44,8 @@ class HelloController { /** * Index t. * - * @param numTel the num tel - * @param adresse the adresse + * @param numTel the num tel + * @param adresse the adresse * @return the t */ @GetMapping(value = "/hello/{numTelco}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/MyExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/MyExceptionHandler.java index b732bb1be..566dcc2f1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/MyExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/MyExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; @@ -43,7 +43,7 @@ class MyExceptionHandler extends ResponseEntityExceptionHandler { /** * Bad object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(IllegalArgumentException.class) @@ -55,7 +55,7 @@ public Object bad(IllegalArgumentException e) { /** * Gateway object. * - * @param e the e + * @param e the e * @return the object */ @ExceptionHandler(RuntimeException.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java index 7350ac83b..b92565cd3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app34/SpringDocApp34Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app34; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/HelloController.java index ae49d2967..456819881 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java index fced6caca..f535d3534 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app35/SpringDocApp35Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app35; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Bar.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Bar.java index 918128fec..b40e77c46 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Bar.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Bar.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Car.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Car.java index b6619cb90..0f34c46be 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Car.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Car.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Foo.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Foo.java index 6c2032280..ba8f9c32f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Foo.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Foo.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/HelloController.java index 9ebaee7bd..f8237f411 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; @@ -44,7 +44,7 @@ class HelloController { /** * Process foo. * - * @param a the a + * @param a the a * @return the foo */ @PostMapping(path = "/bar/baz", consumes = "application/x.a+json", produces = MediaType.TEXT_PLAIN_VALUE) @@ -55,7 +55,7 @@ public Foo process(@RequestBody Foo a) { /** * Process bar. * - * @param b the b + * @param b the b * @return the bar */ @PostMapping(path = "/bar/baz", consumes = "application/x.b+json", produces = MediaType.TEXT_PLAIN_VALUE) @@ -66,7 +66,7 @@ public Bar process(@RequestBody Bar b) { /** * Process car. * - * @param c the c + * @param c the c * @return the car */ @PostMapping(path = "/bar/baz", consumes = "application/x.c+json", produces = MediaType.APPLICATION_JSON_VALUE) @@ -78,7 +78,7 @@ public Car process(@RequestBody Car c) { /** * Pets post response entity. * - * @param pet the pet + * @param pet the pet * @return the response entity */ @PostMapping(value = "/pets1", consumes = "text/plain") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Pet.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Pet.java index a850b0449..1aede8c4c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Pet.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/Pet.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java index 7becb66d9..9043129c0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app37/SpringDocApp37Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app37; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/HelloController.java index aeb946bb5..369d67b68 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java index 868f68d93..d2338ff09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app38/SpringDocApp38Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app38; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java index 53331dcf8..9c7ed9e59 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app39; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java index 749a8459f..44b0b8839 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocApp39Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app39; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java index 24d355c1e..b966eb65c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app39/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app39; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java index 5d6c56414..e37b4d917 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java index 2d1fa8037..1aa97c6b1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/SpringDocApp4Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java index 206bed595..040eb091a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app4/TrackerData.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app4; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/HelloController.java index b41b528d3..1e4b6757b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app40; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/SpringDocApp40Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/SpringDocApp40Test.java index ceb14ac59..bdb9b01e9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/SpringDocApp40Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app40/SpringDocApp40Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app40; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/HelloController.java index e7ca6b814..0e665aeb6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app41; @@ -51,7 +51,7 @@ class HelloController { /** * Gets file. * - * @param path the path + * @param path the path * @return the file */ @Operation(description = "Download file") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp411Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp411Test.java index a6ad70be7..99fd6128f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp411Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp411Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app41; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp41Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp41Test.java index bc43882a1..c166a0500 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp41Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app41/SpringDocApp41Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app41; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/HelloController.java index 70805316a..8338f364b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app42; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/SpringDocApp42Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/SpringDocApp42Test.java index 2a6ff46bc..079e90042 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/SpringDocApp42Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/SpringDocApp42Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app42; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/TweetId.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/TweetId.java index c8afcde6a..3823a483c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/TweetId.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app42/TweetId.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app42; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/HelloController.java index a3b6f2310..e38bca3fa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app43; @@ -43,7 +43,7 @@ class HelloController { /** * Upload documents response entity. * - * @param multipartFiles the multipart files + * @param multipartFiles the multipart files * @return the response entity */ @PostMapping(path = "/documents", consumes = "multipart/form-data") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/SpringDocApp43Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/SpringDocApp43Test.java index 4dafc1a19..f8f18d108 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/SpringDocApp43Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app43/SpringDocApp43Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app43; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/HelloController.java index 47c4dd70f..8872bbf24 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app44; @@ -46,7 +46,7 @@ class HelloController { /** * Hello response entity. * - * @param request the request + * @param request the request * @return the response entity */ @PostMapping(value = "/helloworld", produces = "application/json", consumes = "application/vnd.v1+json") @@ -64,7 +64,7 @@ public ResponseEntity hello(@RequestBody RequestV1 request) { /** * Hello response entity. * - * @param request the request + * @param request the request * @return the response entity */ @PostMapping(value = "/helloworld", produces = "application/json", consumes = "application/vnd.v2+json") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/SpringDocApp44Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/SpringDocApp44Test.java index c3ea040a9..d730a3c1f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/SpringDocApp44Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app44/SpringDocApp44Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app44; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController.java index af78a50c9..17e480535 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController2.java index f3fd8b513..16d9fbfca 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/HelloController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/OpenApiConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/OpenApiConfig.java index d1b5e4b94..ec58dc163 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/OpenApiConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/OpenApiConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/PersonDTO.java index bd943d434..19633b427 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app45; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/SpringDocApp45Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/SpringDocApp45Test.java index 98c7355a0..7f366da8a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/SpringDocApp45Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app45/SpringDocApp45Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app45; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/HelloController.java index 9ad99155b..d1a0e164f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app46; @@ -46,7 +46,7 @@ class HelloController { /** * Persons string. * - * @param subscriptionId the subscription id + * @param subscriptionId the subscription id * @return the string */ @GetMapping("/persons/{subscriptionId}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/SpringDocApp46Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/SpringDocApp46Test.java index 06490f5a1..e93cd24df 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/SpringDocApp46Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app46/SpringDocApp46Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app46; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/HelloController.java index 52f79e1bd..96a6b9059 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app47; @@ -44,7 +44,7 @@ class HelloController { /** * Gets documents with locale. * - * @param locale the locale + * @param locale the locale * @return the documents with locale */ @GetMapping(path = "/documents/{locale}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/SpringDocApp47Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/SpringDocApp47Test.java index 7882cd709..8067aff31 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/SpringDocApp47Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app47/SpringDocApp47Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app47; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/AbstractHelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/AbstractHelloController.java index ed8119cb1..6c5a9ce69 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/AbstractHelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/AbstractHelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app48; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/HelloController.java index edb352534..07036ce56 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app48; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/SpringDocApp48Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/SpringDocApp48Test.java index 0d5db3517..42b304e63 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/SpringDocApp48Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app48/SpringDocApp48Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app48; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/HelloController.java index 72442d74d..0dd8e5203 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app49; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocApp49Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocApp49Test.java index bafdc085c..a41dddea8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocApp49Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocApp49Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app49; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocTestApp.java index 2bda19fb3..4443a746e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app49/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app49; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/CustomOpenAPIConfig.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/CustomOpenAPIConfig.java index e1622cd5e..7a025e57c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/CustomOpenAPIConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/CustomOpenAPIConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java index d960a556c..8d631c63a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5.sample; @@ -58,6 +58,7 @@ class OpenAPIResourceBeanConfigurationComponentsSecuritySchemesTest extends Abst * Given: Bean configuration with security scheme http basic (shouldDefineComponentsSecuritySchemesForHttpBasic) * When: Get api-docs * Then: Return security definitions http basic + * * @throws Exception the exception */ @Test @@ -75,6 +76,7 @@ protected void testApp() throws Exception { * Given: Bean configuration with security scheme API key * When: Get api-docs * Then: Return security definitions with API key + * * @throws Exception the exception */ @Test @@ -92,6 +94,7 @@ void shouldDefineComponentsSecuritySchemesForApiKey() throws Exception { * Given: Bean configuration with security scheme OAuth2 * When: Get api-docs * Then: Return security definitions with OAuth + * * @throws Exception the exception */ @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceCustomConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceCustomConfigurationTest.java index ad7c317fd..ceb3ea417 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceCustomConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceCustomConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5.sample; @@ -49,6 +49,7 @@ class OpenApiResourceCustomConfigurationTest extends AbstractSpringDocTest { /** * givenNoConfiguration_whenGetApiJson_returnsDefaultEmptyDocs - should return * {"openapi":"3.1.0","info":{"title":"Custom API","version":"100"},"paths":{},"components":{}} + * * @throws Exception the exception */ @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceNoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceNoConfigurationTest.java index 639f7aa00..76899b2c4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceNoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app5/sample/OpenApiResourceNoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5.sample; @@ -46,6 +46,7 @@ class OpenApiResourceNoConfigurationTest extends AbstractSpringDocTest { /** * givenNoConfiguration_whenGetApiJson_returnsDefaultEmptyDocs - should return * {"openapi":"3.1.0","info":{"title":"OpenAPI definition","version":"v0"},"paths":{},"components":{}} + * * @throws Exception the exception */ @Test diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/HelloController.java index 1365038ad..01bf6e588 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app50; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocApp50Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocApp50Test.java index 1e77b933d..38b6e6261 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocApp50Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocApp50Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app50; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocTestApp.java index 65c4c4631..ad7ae87f0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app50/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app50; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/HelloController.java index c166fe506..61d402c45 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app51; @@ -63,7 +63,7 @@ public String test1() { /** * Test 2 string. * - * @param param1 the param 1 + * @param param1 the param 1 * @return the string */ @Operation(parameters = { @@ -76,7 +76,7 @@ public String test2(@RequestParam(name = "param1") String param1) { /** * Test 3 string. * - * @param param1 the param 1 + * @param param1 the param 1 * @return the string */ @Operation(parameters = { @@ -91,8 +91,8 @@ public String test3( /** * Get string. * - * @param path the path - * @param params the params + * @param path the path + * @param params the params * @return the string */ @GetMapping("/test/{path}") @@ -105,7 +105,7 @@ public String get( /** * Hello response entity. * - * @param map the map + * @param map the map * @return the response entity */ @PostMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/SpringDocApp51Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/SpringDocApp51Test.java index 0be77d21c..90955412a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/SpringDocApp51Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app51/SpringDocApp51Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app51; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/HelloController.java index 3034ad0f5..96dc04d6c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app52; @@ -44,9 +44,9 @@ class HelloController { /** * Create test 1 string. * - * @param username the username - * @param test the test - * @param imageFile the image file + * @param username the username + * @param test the test + * @param imageFile the image file * @return the string */ @PostMapping(value = "/test1/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @@ -58,9 +58,9 @@ public String createTest1(@PathVariable String username, @RequestPart("test") My /** * Create test 2 string. * - * @param username the username - * @param imageFile the image file - * @param test the test + * @param username the username + * @param imageFile the image file + * @param test the test * @return the string */ @PostMapping(value = "/test2/{username}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @@ -72,8 +72,8 @@ public String createTest2(@PathVariable String username, @RequestPart("image") M /** * Create test 3 string. * - * @param test the test - * @param multipartFiles the multipart files + * @param test the test + * @param multipartFiles the multipart files * @return the string */ @PostMapping(value = "/test3", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/SpringDocApp52Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/SpringDocApp52Test.java index 0da503eb2..24d2e96f2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/SpringDocApp52Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app52/SpringDocApp52Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app52; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloController.java index 2ad6f5a94..8ef5b8bc1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app53; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloControllerWithGlobalApiResponse.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloControllerWithGlobalApiResponse.java index 7b57433d9..24d1aa3cb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloControllerWithGlobalApiResponse.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/HelloControllerWithGlobalApiResponse.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app53; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/SpringDocApp53Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/SpringDocApp53Test.java index 91ffba758..4e0f388a9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/SpringDocApp53Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app53/SpringDocApp53Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app53; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/HelloController.java index 8822520e2..3727f0c94 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app54; @@ -47,7 +47,7 @@ class HelloController { /** * Gets meal party. * - * @param mealPartyId the meal party id + * @param mealPartyId the meal party id * @return the meal party */ @GetMapping(value = "/parties/{id}") @@ -61,7 +61,7 @@ public MealParty getMealParty(@PathVariable("id") long mealPartyId) { /** * Save meal party response entity. * - * @param p the p + * @param p the p * @return the response entity */ @JsonView(Views.MealPartyAdmin.class) @@ -73,7 +73,7 @@ public ResponseEntity saveMealParty(@JsonView(Views.Public.class) @Re /** * Save meal new party response entity. * - * @param p the p + * @param p the p * @return the response entity */ @JsonView(Views.MealPartyAdmin.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/MealParty.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/MealParty.java index 19e4df19a..33d6d6cae 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/MealParty.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/MealParty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app54; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/SpringDocApp54Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/SpringDocApp54Test.java index 47a45d231..86248d3b8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/SpringDocApp54Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/SpringDocApp54Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app54; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/Views.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/Views.java index 7e37781a1..3201e4f9c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/Views.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app54/Views.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app54; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/HelloController.java index 86cc786b4..7b4550999 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app55; @@ -47,6 +47,7 @@ class HelloController { /** * Ping endpoint used for health checks. + * * @return the boolean */ @RequestMapping(value = "/ping", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/SpringDocApp55Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/SpringDocApp55Test.java index cc4a756f0..662a51b0f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/SpringDocApp55Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app55/SpringDocApp55Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app55; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/GlobalExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/GlobalExceptionHandler.java index d651df665..bcc9ef5ee 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/GlobalExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/GlobalExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app56; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/HelloController.java index 5c8e8a991..077f3d5e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app56; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/SpringDocApp56Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/SpringDocApp56Test.java index 7b34847a2..16398235a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/SpringDocApp56Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app56/SpringDocApp56Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app56; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/HelloController.java index bf6d9085b..a076772bc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app57; @@ -42,7 +42,7 @@ class HelloController { /** * Gets text. * - * @param name the name + * @param name the name * @return the text */ @GetMapping("/{name:.+}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/SpringDocApp57Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/SpringDocApp57Test.java index 5cdc79e9d..52a76132b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/SpringDocApp57Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app57/SpringDocApp57Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app57; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/HelloController.java index c181b92fe..a48895a09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app58; @@ -46,7 +46,7 @@ class HelloController { /** * Example object. * - * @param json the json + * @param json the json * @return the object */ @PostMapping("/examplePost") @@ -115,9 +115,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/SpringDocApp58Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/SpringDocApp58Test.java index 07676f642..22b11d919 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/SpringDocApp58Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app58/SpringDocApp58Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app58; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/HelloController.java index e84dcf92f..99233cc31 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app59; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/SpringDocApp59Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/SpringDocApp59Test.java index ff32d078d..1c811862d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/SpringDocApp59Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app59/SpringDocApp59Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app59; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/HelloController.java index 51d789bc3..a5da14719 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java index 822927bd7..d1ca076ca 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/HelloController.java index e4623cb87..740fb1842 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app60; @@ -44,8 +44,8 @@ class HelloController { /** * List 1 list. * - * @param page the page - * @param size the size + * @param page the page + * @param size the size * @return the list */ @GetMapping("/hello1") @@ -61,9 +61,9 @@ public List list1(String page, String size) { /** * List 2 list. * - * @param page the page - * @param size the size - * @param sort the sort + * @param page the page + * @param size the size + * @param sort the sort * @return the list */ @GetMapping("/hello2") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QueryPaging.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QueryPaging.java index f80fb53c8..0d0ce7994 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QueryPaging.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QueryPaging.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app60; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QuerySort.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QuerySort.java index 1e958b1b3..c55de183d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QuerySort.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/QuerySort.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app60; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/SpringDocApp60Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/SpringDocApp60Test.java index 6a200d274..6a4658ae3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/SpringDocApp60Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app60/SpringDocApp60Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app60; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/HelloController.java index 1bf5498d9..c327bcb07 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app61; @@ -46,10 +46,10 @@ class HelloController { /** * Persons string. * - * @param name the name - * @param phone the phone - * @param createdFrom the created from - * @param createdRange the created range + * @param name the name + * @param phone the phone + * @param createdFrom the created from + * @param createdRange the created range * @return the string */ @Operation(description = "List", parameters = { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/SpringDocApp61Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/SpringDocApp61Test.java index cad6e2c20..8ea22009e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/SpringDocApp61Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app61/SpringDocApp61Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app61; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/BaseController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/BaseController.java index 4bcbdafa5..b72b995e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/BaseController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app62; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/SpringDocApp62Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/SpringDocApp62Test.java index ecc033658..17fd424c8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/SpringDocApp62Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/SpringDocApp62Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app62; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/TestController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/TestController.java index e439ecde9..ea9668c80 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/TestController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app62/TestController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app62; @@ -43,7 +43,7 @@ class TestController { /** * Test string. * - * @param accept the accept + * @param accept the accept * @return the string */ @RequestMapping(value = "/test", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java index 5e802b243..c15cd66d9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app63; @@ -44,11 +44,11 @@ class HelloController { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java index d772a9e33..198a34c11 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app63/SpringDocApp63Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app63; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java index d9c64e48c..5e66707e9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app64; @@ -49,7 +49,7 @@ public void test1(String hello) { /** * Test 2 string. * - * @param from the from + * @param from the from * @return the string */ @GetMapping(value = "/api/balance/abcd") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java index 9bd6a6ade..f430441e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app64/SpringDocApp64Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app64; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java index 71f28af06..e8c126ff2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app65; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java index a8f366b63..e31fdfc8b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app65/SpringDocApp65Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app65; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/DefaultHealthCheckApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/DefaultHealthCheckApi.java index bff94f38d..86e9e76dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/DefaultHealthCheckApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/DefaultHealthCheckApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66; @@ -46,7 +46,7 @@ class DefaultHealthCheckApi { /** * Test date echo string. * - * @param date the date + * @param date the date * @return the string */ @GetMapping("/test/date/echo/{date}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/HelloController.java index f5351936e..e4ad5b090 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66; @@ -44,7 +44,7 @@ class HelloController { /** * Ping response entity. * - * @param possiblyInjectedByAspect the possibly injected by aspect + * @param possiblyInjectedByAspect the possibly injected by aspect * @return the response entity */ @Operation(summary = "Check server status", description = "Check server status, will return 200 with simple string if alive. Do nothing else.") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java index 39b64bddd..828c28eff 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/SpringDocApp66Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/UndocumentedClass.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/UndocumentedClass.java index 85e133dea..af620926c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/UndocumentedClass.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app66/UndocumentedClass.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app66; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java index 3dd8f832a..880765241 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app67; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java index 4bc3c0dbf..035536bd2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app67/SpringDocApp67Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app67; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/HelloController.java index a3e473485..52bac9e39 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; @@ -42,7 +42,7 @@ class HelloController { /** * Gets tasks. * - * @param str the str + * @param str the str * @return the tasks */ @RequestMapping(value = "/tasks", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/PersonDTO.java index f238d47cb..11dc87cd8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java index fc36283cb..064f45142 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app69/SpringDocApp69Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app69; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java index 906770a6b..16b7883e5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java index 6d134378a..d1528bf4c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/HelloController.java index ef1f1428e..c97022274 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; @@ -45,7 +45,7 @@ class HelloController { /** * Test api type. * - * @param test the test + * @param test the test * @return the api type */ @CustomizedOperation diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java index 19940db3f..421209e4b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/SpringDocApp70Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedOperation.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedOperation.java index 62dbfd165..028809f5e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedOperation.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedOperation.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70.customizer; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedParameter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedParameter.java index 811717b4a..2575c8b29 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedParameter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedParameter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70.customizer; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedProperty.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedProperty.java index 0e43ed629..41cbeebc1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedProperty.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/CustomizedProperty.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70.customizer; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/OperationCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/OperationCustomizer.java index c79543eb6..4b47ef70d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/OperationCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/OperationCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70.customizer; @@ -39,8 +39,8 @@ class OperationCustomizer implements org.springdoc.core.customizers.OperationCus /** * Customize operation. * - * @param operation the operation - * @param handlerMethod the handler method + * @param operation the operation + * @param handlerMethod the handler method * @return the operation */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/ParameterCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/ParameterCustomizer.java index 97e2c69b8..5716cecef 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/ParameterCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/ParameterCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70.customizer; @@ -39,8 +39,8 @@ class ParameterCustomizer implements org.springdoc.core.customizers.ParameterCus /** * Customize parameter. * - * @param parameterModel the parameter model - * @param methodParameter the method parameter + * @param parameterModel the parameter model + * @param methodParameter the method parameter * @return the parameter */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/PropertyCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/PropertyCustomizer.java index bd4056588..363dc404c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/PropertyCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/customizer/PropertyCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70.customizer; @@ -53,8 +53,8 @@ class PropertyCustomizer implements org.springdoc.core.customizers.PropertyCusto /** * Customize schema. * - * @param property the property - * @param type the type + * @param property the property + * @param type the type * @return the schema */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/model/ApiType.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/model/ApiType.java index 8122e6b3e..3e1a5982c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/model/ApiType.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app70/model/ApiType.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app70.model; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/Dog.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/Dog.java index 15edf4069..41ac4ea60 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/Dog.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/Dog.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app71; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/HelloController.java index 62c58d4ce..e0fff727e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app71; @@ -38,7 +38,7 @@ class HelloController { /** * Persons string. * - * @param dog the dog + * @param dog the dog * @return the string */ @PostMapping("/persons") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java index 9be9c164f..cc043bfa7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app71/SpringDocApp71Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app71; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java index 3a97833ba..97dd009bd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/BlockingAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java index 2079aabdd..41e3d4ecb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/CacheAutoConfigurationTest1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java index 11bfec015..5dc6f7c0f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app72/GroupAutoConfigurationTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app72; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/HelloController.java index c2d6ec353..ca7d61ff5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app73; @@ -48,8 +48,8 @@ class HelloController { /** * Delete. * - * @param countryCode the country code - * @param id the id + * @param countryCode the country code + * @param id the id */ @DeleteMapping("/{id}") @ResponseStatus(HttpStatus.NO_CONTENT) @@ -61,7 +61,7 @@ public void delete(@Parameter(name = "country_code", in = ParameterIn.QUERY) Str * Get string. * * @param countryCode the country code - * @param id the id + * @param id the id * @return the string */ @GetMapping("/{id}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java index 7d51c391e..126052207 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app73/SpringDocApp73Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app73; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/HelloController.java index 1379be33a..98acb6669 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app74; @@ -43,7 +43,7 @@ class HelloController { /** * Post my request body string. * - * @param myRequestBody the my request body + * @param myRequestBody the my request body * @return the string */ @PostMapping("/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java index 238d0ec21..9acb32bdc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app74/SpringDocApp74Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app74; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/HelloController.java index da4f15d72..c6e3d696c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/PersonDTO.java index f50704efb..68803bd0d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/RestResponseEntityExceptionHandler.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/RestResponseEntityExceptionHandler.java index f481b5fe8..2f8eaf940 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/RestResponseEntityExceptionHandler.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/RestResponseEntityExceptionHandler.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; @@ -46,8 +46,8 @@ class RestResponseEntityExceptionHandler /** * Bad request response entity. * - * @param req the req - * @param exception the exception + * @param req the req + * @param exception the exception * @return the response entity */ @ResponseStatus(value = HttpStatus.OK) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java index 663f68f88..22129c046 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app75/SpringDocApp75Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app75; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/HelloController.java index bd1a4a97f..86b59211a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app76; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/SpringDocApp76Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/SpringDocApp76Test.java index 073191476..9408d6cc1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/SpringDocApp76Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app76/SpringDocApp76Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app76; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/HelloController.java index 9e072c0fa..a0d8cd12f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app77; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/SpringDocApp77Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/SpringDocApp77Test.java index c8032fb24..72016b44d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/SpringDocApp77Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app77/SpringDocApp77Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app77; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java index e977fdf89..252c5cd91 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app78; @@ -43,7 +43,7 @@ class HelloController { /** * Gets person 1. * - * @param str the str + * @param str the str * @return the person 1 */ @RequestMapping(value = "/person1", method = RequestMethod.GET) @@ -54,7 +54,7 @@ private CompletionStage> getPerson1(String str) { /** * Gets person 2. * - * @param str the str + * @param str the str * @return the person 2 */ @RequestMapping(value = "/person2", method = RequestMethod.GET) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/PersonDTO.java index 280e22b31..f7743d91f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app78; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java index be8a419fa..e344bbf24 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app78/SpringDocApp78Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app78; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/HelloController.java index 077c8536e..3fcbac6de 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app79; @@ -42,7 +42,7 @@ class HelloController { /** * Echo string. * - * @param text the text + * @param text the text * @return the string */ @GetMapping(produces = MediaType.TEXT_PLAIN_VALUE, path = "/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java index 1377e4759..c7f7677ac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app79/SpringDocApp79Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app79; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/HelloController.java index cdbda9a24..564639ccd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java index e210ed251..ba4041fb1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/HelloController.java index aa5d16e1c..eba1b18e9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app80; @@ -46,8 +46,8 @@ class HelloController { /** * Testpost 1 response entity. * - * @param dto the dto - * @return the response entity + * @param dto the dto + * @return the response entity * @throws URISyntaxException the uri syntax exception */ @RequestMapping(value = "/testpost1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @@ -58,8 +58,8 @@ public ResponseEntity testpost1(@RequestBody TestObject dto) throws /** * Testpost 2 response entity. * - * @param dto the dto - * @return the response entity + * @param dto the dto + * @return the response entity * @throws URISyntaxException the uri syntax exception */ @RequestMapping(value = "/testpost2", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @@ -70,7 +70,7 @@ public ResponseEntity testpost2(@RequestBody TestObject dto) throws /** * Hello response entity. * - * @return the response entity + * @return the response entity * @throws URISyntaxException the uri syntax exception */ @RequestMapping(value = "/hello", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java index 954b4a88b..e74efcf61 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/SpringDocApp80Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app80; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/TestObject.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/TestObject.java index 0cd8ecc1f..ffe33093c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/TestObject.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app80/TestObject.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app80; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/HelloController.java index cbf695ba8..153f87694 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app81; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java index d05f5977b..0291bf5d7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app81/SpringDocApp81Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app81; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/HelloController.java index 5172ba8e8..5b6d9c811 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; @@ -40,9 +40,9 @@ class HelloController { /** * Put response entity. * - * @param configuration the configuration - * @param second the second - * @param personDTO the person dto + * @param configuration the configuration + * @param second the second + * @param personDTO the person dto * @return the response entity */ @PutMapping(value = "/test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/PersonDTO.java index 97f98c040..462064b69 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java index e61d1eae8..3cafbd43c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app82/SpringDocApp82Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app82; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/HelloController.java index c4aa38cdc..8ec446315 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; @@ -48,9 +48,9 @@ class HelloController { /** * Put response entity. * - * @param config the config - * @param configuration the configuration - * @param aFile the a file + * @param config the config + * @param configuration the configuration + * @param aFile the a file * @return the response entity */ @RequestMapping(value = "/{config}", diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/PersonDTO.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/PersonDTO.java index a56295e75..d2300b59f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/PersonDTO.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/PersonDTO.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; @@ -54,9 +54,9 @@ public PersonDTO() { /** * Instantiates a new Person dto. * - * @param email the email - * @param firstName the first name - * @param lastName the last name + * @param email the email + * @param firstName the first name + * @param lastName the last name */ public PersonDTO(final String email, final String firstName, final String lastName) { this.email = email; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java index 6325d986d..80ac00458 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app83/SpringDocApp83Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app83; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/HelloController.java index c3918c93e..036817fd3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app84; @@ -50,7 +50,7 @@ public String persons() { /** * Persons string. * - * @param toto the toto + * @param toto the toto * @return the string */ @GetMapping("/persons1") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java index 22a65f3a8..3ef808edf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app84/SpringDocApp84Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app84; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/HelloController.java index b42ba38b8..7be3503c2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java index f193f7508..b2bf42d19 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app85/SpringDocApp85Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app85; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/HelloController.java index 9578d20ff..2bd8742b6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86; @@ -44,11 +44,11 @@ class HelloController { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java index 065a4a620..d3978d8e1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/SpringDocApp86Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/test/HelloController2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/test/HelloController2.java index 1e1a530a3..741aa1894 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/test/HelloController2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app86/test/HelloController2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app86.test; @@ -44,11 +44,11 @@ class HelloController2 { /** * Test. * - * @param header the header - * @param request the request - * @param response the response - * @param locale the locale - * @param hello the hello + * @param header the header + * @param request the request + * @param response the response + * @param locale the locale + * @param hello the hello */ @GetMapping("/test2") public void test(HttpSession header, HttpServletRequest request, HttpServletResponse response, Locale locale, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/HelloController.java index e22461209..8b37231f6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app87; @@ -49,7 +49,7 @@ class HelloController { * * @param cookie the cookie * @param itemId the item id - * @param item the item + * @param item the item * @return the response entity */ @PutMapping("/{itemId}") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java index 10f9e894a..0fc847229 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app87/SpringDocApp87Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app87; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/HelloController.java index 0b35d6d30..43652695d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app88; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java index 4a6a6a41e..74b785621 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app88/SpringDocApp88Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app88; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/HelloController.java index 8cfb08cd4..233c177ee 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app89; @@ -43,7 +43,7 @@ class HelloController { /** * Gets address. * - * @param id the id + * @param id the id * @return the address */ @Operation(summary = "Get Status") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java index 1a280cc1d..6bd65480f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app89/SpringDocApp89Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app89; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApi.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApi.java index a68771497..8db041eb9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApi.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApi.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; @@ -44,7 +44,7 @@ public interface MyApi { /** * Get string. * - * @param language the language + * @param language the language * @return the string */ @Operation(description = "Annotations from interfaces test") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApiController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApiController.java index 0b0f20f5e..530deee6a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApiController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/MyApiController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; @@ -40,7 +40,7 @@ class MyApiController implements MyApi { /** * Get string. * - * @param language the language + * @param language the language * @return the string */ public String get(String language) { @@ -51,7 +51,7 @@ public String get(String language) { /** * Gets code. * - * @param code the code + * @param code the code * @return the code */ @Operation(description = "Annotations from class with hidden parameter code") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java index 0e58cc04e..74a168e11 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/HelloController.java index 917a21704..311997419 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java index eea3cd9f3..dc437dcfe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocApp90Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocTestApp.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocTestApp.java index edfa88b49..a7b1723cd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocTestApp.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/SpringDocTestApp.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/User.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/User.java index 5285d7377..c7e627a5e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app90/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app90; @@ -35,8 +35,6 @@ * User */ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2019-11-30T09:49:26.034469-01:00[Atlantic/Azores]") - - class User { /** @@ -106,7 +104,7 @@ class User { /** * Id user. * - * @param id the id + * @param id the id * @return the user */ public User id(Long id) { @@ -140,7 +138,7 @@ public void setId(Long id) { /** * Username user. * - * @param username the username + * @param username the username * @return the user */ public User username(String username) { @@ -174,7 +172,7 @@ public void setUsername(String username) { /** * First name user. * - * @param firstName the first name + * @param firstName the first name * @return the user */ public User firstName(String firstName) { @@ -208,7 +206,7 @@ public void setFirstName(String firstName) { /** * Last name user. * - * @param lastName the last name + * @param lastName the last name * @return the user */ public User lastName(String lastName) { @@ -242,7 +240,7 @@ public void setLastName(String lastName) { /** * Email user. * - * @param email the email + * @param email the email * @return the user */ public User email(String email) { @@ -276,7 +274,7 @@ public void setEmail(String email) { /** * Password user. * - * @param password the password + * @param password the password * @return the user */ public User password(String password) { @@ -310,7 +308,7 @@ public void setPassword(String password) { /** * Phone user. * - * @param phone the phone + * @param phone the phone * @return the user */ public User phone(String phone) { @@ -344,7 +342,7 @@ public void setPhone(String phone) { /** * User status user. * - * @param userStatus the user status + * @param userStatus the user status * @return the user */ public User userStatus(Integer userStatus) { @@ -378,7 +376,7 @@ public void setUserStatus(Integer userStatus) { /** * Equals boolean. * - * @param o the o + * @param o the o * @return the boolean */ @Override @@ -435,7 +433,8 @@ public String toString() { /** * Convert the given object to string with each line indented by 4 spaces * (except the first line). - * @param o the o + * + * @param o the o * @return the string */ private String toIndentedString(Object o) { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Advice.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Advice.java index e2b311cb6..305ec0bc8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Advice.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Advice.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app91; @@ -49,8 +49,8 @@ class Advice { /** * Bad request response entity. * - * @param req the req - * @param exception the exception + * @param req the req + * @param exception the exception * @return the response entity */ @ExceptionHandler(TypeMismatchException.class) @@ -80,8 +80,8 @@ public ResponseEntity badRequest(HttpServletRequest req, Exception exc /** * Internal server error response entity. * - * @param req the req - * @param exception the exception + * @param req the req + * @param exception the exception * @return the response entity */ @ExceptionHandler(Exception.class) diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/ApiError.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/ApiError.java index 266139103..f91465957 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/ApiError.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/ApiError.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app91; @@ -67,9 +67,9 @@ class ApiError { /** * Instantiates a new Api error. * - * @param status the status - * @param errorCode the error code - * @param message the message + * @param status the status + * @param errorCode the error code + * @param message the message */ public ApiError(int status, String errorCode, String message) { this.status = status; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Greeting.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Greeting.java index 448a59c42..e348894fb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Greeting.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/Greeting.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app91; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/GreetingController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/GreetingController.java index eb5093235..f5a2b4702 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/GreetingController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/GreetingController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app91; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/SpringDocApp91Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/SpringDocApp91Test.java index be13c4450..0c3af882c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/SpringDocApp91Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app91/SpringDocApp91Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app91; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/HelloController.java index d84ac0882..36b97ee1e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app92; @@ -42,7 +42,7 @@ class HelloController { /** * Index string. * - * @param test the test + * @param test the test * @return the string */ @GetMapping diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/ParameterCustomizer.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/ParameterCustomizer.java index 8385d851c..c02a47c0e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/ParameterCustomizer.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/ParameterCustomizer.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app92; @@ -40,8 +40,8 @@ class ParameterCustomizer implements org.springdoc.core.customizers.ParameterCus /** * Customize parameter. * - * @param parameterModel the parameter model - * @param methodParameter the method parameter + * @param parameterModel the parameter model + * @param methodParameter the method parameter * @return the parameter */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/SpringDocApp92Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/SpringDocApp92Test.java index af4afcb39..cdeed134d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/SpringDocApp92Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app92/SpringDocApp92Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app92; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseClientModel.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseClientModel.java index e19822f3c..2f02883e3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseClientModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseController.java index 88bdc0393..54a5efa09 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/BaseController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app93; @@ -33,13 +33,13 @@ /** * The type Base controller. * - * @param the type parameter + * @param the type parameter */ public abstract class BaseController { /** * Get t client model. * - * @param param the param + * @param param the param * @return the t client model */ @Operation diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificClientModel.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificClientModel.java index 132a4334f..9852449fd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificClientModel.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificClientModel.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificController.java index f5854fce0..f6b7efafe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpecificController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpringDocApp93Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpringDocApp93Test.java index e3f138de5..ee7369f6b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpringDocApp93Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app93/SpringDocApp93Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app93; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/Greeting.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/Greeting.java index d14d9896c..5700f4cdf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/Greeting.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/Greeting.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app94; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java index 90a78859c..5724ab012 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app94/SpringDocApp94Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app94; @@ -102,8 +102,8 @@ public OpenApiBuilderCustomizer customOpenAPI() { /** * Default test handler mapping request mapping handler mapping. * - * @param greetingController the greeting controller - * @return the request mapping handler mapping + * @param greetingController the greeting controller + * @return the request mapping handler mapping * @throws NoSuchMethodException the no such method exception */ @Bean @@ -122,12 +122,12 @@ public RequestMappingHandlerMapping defaultTestHandlerMapping(GreetingController * Open api resource open api web mvc resource. * * @param openAPIBuilderObjectFactory the open api builder object factory - * @param requestBuilder the request builder - * @param responseBuilder the response builder - * @param operationParser the operation parser - * @param springDocConfigProperties the spring doc config properties - * @param springDocProviders the spring doc providers - * @param springDocCustomizers the spring doc customizers + * @param requestBuilder the request builder + * @param responseBuilder the response builder + * @param operationParser the operation parser + * @param springDocConfigProperties the spring doc config properties + * @param springDocProviders the spring doc providers + * @param springDocCustomizers the spring doc customizers * @return the open api web mvc resource */ @Bean(name = "openApiResource") @@ -142,7 +142,7 @@ public OpenApiWebMvcResource openApiResource(ObjectFactory openA /** * Sets application context. * - * @param applicationContext the application context + * @param applicationContext the application context * @throws BeansException the beans exception */ @Override diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/HelloController.java index 686725a6f..380de86fd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app95; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/SpringDocApp95Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/SpringDocApp95Test.java index e2fd97ecf..9db49a619 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/SpringDocApp95Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app95/SpringDocApp95Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app95; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/HelloController.java index c130d2c11..a28f520bd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app96; @@ -43,7 +43,7 @@ class HelloController { /** * Test 1 string. * - * @param test the test + * @param test the test * @return the string */ @PostMapping("/api1") @@ -54,7 +54,7 @@ String test1(@RequestBody @Min(2) int test) { /** * Test 2 string. * - * @param test the test + * @param test the test * @return the string */ @PostMapping("/api2") @@ -65,7 +65,7 @@ String test2(@RequestBody String test) { /** * Test 3 string. * - * @param test the test + * @param test the test * @return the string */ @PostMapping("/api3") diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/SpringDocApp96Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/SpringDocApp96Test.java index c169ae6bd..d687c7202 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/SpringDocApp96Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app96/SpringDocApp96Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app96; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/HelloController.java index b17b89a8d..c4d6f733f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/SpringDocApp97Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/SpringDocApp97Test.java index d99c7cadd..48cc6643e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/SpringDocApp97Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/SpringDocApp97Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV1.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV1.java index 44ef3060b..7275bb50e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV1.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV1.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV2.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV2.java index 5d9453388..1bfd7ec0a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV2.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV2.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV3.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV3.java index f6955323e..96eca6716 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV3.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app97/StudentV3.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app97; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/HelloController.java index 5f7c8e19e..17025150e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app98; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/IgnoredAnnotationParameter.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/IgnoredAnnotationParameter.java index dafbf0a85..839fd01ce 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/IgnoredAnnotationParameter.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/IgnoredAnnotationParameter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app98; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/SpringDocApp98Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/SpringDocApp98Test.java index a5cf82342..bdd46549a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/SpringDocApp98Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app98/SpringDocApp98Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app98; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/HelloController.java index aea7efbe0..46922b45f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app99; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/SpringDocApp99Test.java b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/SpringDocApp99Test.java index 98f3e942d..f5f3ac74c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/SpringDocApp99Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/java/test/org/springdoc/api/v31/app99/SpringDocApp99Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app99; diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app102.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app102.json index 83c8687ea..9ed338d4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app102.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app102.json @@ -41,6 +41,7 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { + "minLength": 1, "type": "string" } }, @@ -157,4 +158,4 @@ } } } -} +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app105-4.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app105-4.json index bb0a3df90..9b586f2bb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app105-4.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app105-4.json @@ -38,14 +38,12 @@ "description": "the name", "required": true, "schema": { + "minLength": 1, "type": "string" } } ], "responses": { - "200": { - "description": "OK" - }, "400": { "description": "the map", "content": { @@ -58,6 +56,9 @@ } } } + }, + "200": { + "description": "OK" } } } @@ -75,12 +76,12 @@ "implicit": { "authorizationUrl": "http://petstore.swagger.io/oauth/dialog", "scopes": { - "read:pets": "read your pets", - "write:pets": "modify pets in your account" + "write:pets": "modify pets in your account", + "read:pets": "read your pets" } } } } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json index 18cacc1db..4fccd911d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json @@ -47,12 +47,12 @@ "required": true }, "responses": { - "500": { - "description": "the response entity", + "200": { + "description": "the person", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/Person" } } } @@ -77,12 +77,12 @@ } } }, - "200": { - "description": "the person", + "500": { + "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "$ref": "#/components/schemas/Problem" } } } @@ -145,12 +145,15 @@ } ], "responses": { - "500": { - "description": "the response entity", + "200": { + "description": "the list", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -175,15 +178,12 @@ } } }, - "200": { - "description": "the list", + "500": { + "description": "the response entity", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Problem" } } } @@ -232,20 +232,6 @@ }, "components": { "schemas": { - "Problem": { - "type": "object", - "properties": { - "logRef": { - "type": "string", - "description": "The Log ref." - }, - "message": { - "type": "string", - "description": "The Message." - } - }, - "description": "The type Problem." - }, "ErrorMessage": { "type": "object", "properties": { @@ -265,22 +251,16 @@ ], "type": "object", "properties": { - "id": { + "age": { + "maximum": 30, + "minimum": 18, "type": "integer", - "description": "The Id.", - "format": "int64" - }, - "firstName": { - "maxLength": 2147483647, - "minLength": 2, - "type": "string", - "description": "The First name." + "description": "The Age.", + "format": "int32" }, - "lastName": { - "maxLength": 10, - "minLength": 0, + "creditCardNumber": { "type": "string", - "description": "The Last name." + "description": "The Credit card number." }, "email": { "pattern": ".+@.+\\..+", @@ -289,22 +269,43 @@ }, "email1": { "type": "string", + "format": "email", "description": "The Email 1." }, - "age": { - "maximum": 30, - "minimum": 18, + "firstName": { + "maxLength": 2147483647, + "minLength": 2, + "type": "string", + "description": "The First name." + }, + "id": { "type": "integer", - "description": "The Age.", - "format": "int32" + "description": "The Id.", + "format": "int64" }, - "creditCardNumber": { + "lastName": { + "maxLength": 10, + "minLength": 0, "type": "string", - "description": "The Credit card number." + "description": "The Last name." } }, "description": "The type Person." + }, + "Problem": { + "type": "object", + "properties": { + "logRef": { + "type": "string", + "description": "The Log ref." + }, + "message": { + "type": "string", + "description": "The Message." + } + }, + "description": "The type Problem." } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json index 853585c74..e9b03a249 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json @@ -178,22 +178,16 @@ ], "type": "object", "properties": { - "id": { + "age": { + "maximum": 30, + "minimum": 18, "type": "integer", - "description": "The Id.", - "format": "int64" - }, - "firstName": { - "maxLength": 2147483647, - "minLength": 2, - "type": "string", - "description": "The First name." + "description": "The Age.", + "format": "int32" }, - "lastName": { - "maxLength": 10, - "minLength": 0, + "creditCardNumber": { "type": "string", - "description": "The Last name." + "description": "The Credit card number." }, "email": { "pattern": ".+@.+\\..+", @@ -202,22 +196,29 @@ }, "email1": { "type": "string", + "format": "email", "description": "The Email 1." }, - "age": { - "maximum": 30, - "minimum": 18, + "firstName": { + "maxLength": 2147483647, + "minLength": 2, + "type": "string", + "description": "The First name." + }, + "id": { "type": "integer", - "description": "The Age.", - "format": "int32" + "description": "The Id.", + "format": "int64" }, - "creditCardNumber": { + "lastName": { + "maxLength": 10, + "minLength": 0, "type": "string", - "description": "The Credit card number." + "description": "The Last name." } }, "description": "The type Person." } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json index 06e588d36..000c7bf1e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json @@ -80,12 +80,12 @@ "required": true }, "responses": { - "500": { - "description": "the response entity", + "200": { + "description": "the person", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/Person" } } } @@ -110,12 +110,12 @@ } } }, - "200": { - "description": "the person", + "500": { + "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Person" + "$ref": "#/components/schemas/Problem" } } } @@ -183,12 +183,15 @@ } ], "responses": { - "500": { - "description": "the response entity", + "200": { + "description": "the list", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "type": "array", + "items": { + "$ref": "#/components/schemas/Person" + } } } } @@ -213,15 +216,12 @@ } } }, - "200": { - "description": "the list", + "500": { + "description": "the response entity", "content": { "*/*": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/Person" - } + "$ref": "#/components/schemas/Problem" } } } @@ -232,20 +232,6 @@ }, "components": { "schemas": { - "Problem": { - "type": "object", - "properties": { - "logRef": { - "type": "string", - "description": "The Log ref." - }, - "message": { - "type": "string", - "description": "The Message." - } - }, - "description": "The type Problem." - }, "ErrorMessage": { "type": "object", "properties": { @@ -265,22 +251,16 @@ ], "type": "object", "properties": { - "id": { + "age": { + "maximum": 30, + "minimum": 18, "type": "integer", - "description": "The Id.", - "format": "int64" - }, - "firstName": { - "maxLength": 2147483647, - "minLength": 2, - "type": "string", - "description": "The First name." + "description": "The Age.", + "format": "int32" }, - "lastName": { - "maxLength": 10, - "minLength": 0, + "creditCardNumber": { "type": "string", - "description": "The Last name." + "description": "The Credit card number." }, "email": { "pattern": ".+@.+\\..+", @@ -289,22 +269,43 @@ }, "email1": { "type": "string", + "format": "email", "description": "The Email 1." }, - "age": { - "maximum": 30, - "minimum": 18, + "firstName": { + "maxLength": 2147483647, + "minLength": 2, + "type": "string", + "description": "The First name." + }, + "id": { "type": "integer", - "description": "The Age.", - "format": "int32" + "description": "The Id.", + "format": "int64" }, - "creditCardNumber": { + "lastName": { + "maxLength": 10, + "minLength": 0, "type": "string", - "description": "The Credit card number." + "description": "The Last name." } }, "description": "The type Person." + }, + "Problem": { + "type": "object", + "properties": { + "logRef": { + "type": "string", + "description": "The Log ref." + }, + "message": { + "type": "string", + "description": "The Message." + } + }, + "description": "The type Problem." } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app119.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app119.json index 9d39d7138..4efd0553c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app119.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app119.json @@ -34,6 +34,9 @@ ], "type": "object", "properties": { + "params": { + "$ref": "#/components/schemas/JsonRequest" + }, "file1": { "type": "string", "description": "This is file1", @@ -43,11 +46,13 @@ "type": "string", "description": "This is file2", "format": "binary" - }, - "params": { - "$ref": "#/components/schemas/JsonRequest" } } + }, + "encoding": { + "params": { + "contentType": "application/json" + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app121.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app121.json index c315da65e..5f11af1f5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app121.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app121.json @@ -41,6 +41,7 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { + "minLength": 1, "type": "string" } }, @@ -148,38 +149,16 @@ }, "components": { "schemas": { - "Nested": { - "type": "object", - "properties": { - "param1": { - "type": "string", - "description": "The Param 1." - }, - "param2": { - "type": "integer", - "description": "The Param 2." - } - }, - "description": "The type Nested." - }, "InheritedRequestParams": { "required": [ "childParam" ], "type": "object", "properties": { - "stringParam": { - "type": "string", - "description": "The String param." - }, - "stringParam1": { - "type": "string", - "description": "The String param 1.", - "deprecated": true - }, - "stringParam2": { + "childParam": { + "minLength": 1, "type": "string", - "description": "The String param 2." + "description": "parameter from child of RequestParams" }, "intParam": { "type": "integer", @@ -204,12 +183,35 @@ "$ref": "#/components/schemas/Nested" } }, - "childParam": { + "stringParam": { "type": "string", - "description": "parameter from child of RequestParams" + "description": "The String param." + }, + "stringParam1": { + "type": "string", + "description": "The String param 1.", + "deprecated": true + }, + "stringParam2": { + "type": "string", + "description": "The String param 2." } }, "description": "The type Inherited request params." + }, + "Nested": { + "type": "object", + "properties": { + "param1": { + "type": "string", + "description": "The Param 1." + }, + "param2": { + "type": "integer", + "description": "The Param 2." + } + }, + "description": "The type Nested." } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app14.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app14.json index 44127638b..433ad8c2c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app14.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app14.json @@ -54,6 +54,7 @@ "description": "the name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -67,4 +68,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app171.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app171.json index a64303bed..18bd68708 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app171.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app171.json @@ -42,23 +42,23 @@ }, "components": { "schemas": { - "PersonProjection" : { - "type" : "object", - "properties" : { - "email" : { - "type" : "string", - "description" : "The Email." + "PersonProjection": { + "type": "object", + "properties": { + "email": { + "type": "string", + "description": "The Email." }, - "firstName" : { - "type" : "string", - "description" : "The First name." + "firstName": { + "type": "string", + "description": "The First name." }, - "lastName" : { - "type" : "string", - "description" : "The Last name." + "lastName": { + "type": "string", + "description": "The Last name." } }, - "description" : "The type PersonProjection dto interface." + "description": "The type PersonProjection dto interface." } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app18.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app18.json index 8e2d55683..829f26e61 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app18.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app18.json @@ -32,6 +32,7 @@ "description": "the name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -50,6 +51,42 @@ } } }, + "/persons7": { + "get": { + "tags": [ + "hello-controller" + ], + "summary": "Persons 7 string.", + "description": "Persons 7 string.", + "operationId": "persons7", + "parameters": [ + { + "name": "age", + "in": "query", + "description": "the age", + "required": true, + "schema": { + "minimum": 0, + "exclusiveMinimum": true, + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "the string", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + }, "/persons6": { "get": { "tags": [ @@ -65,6 +102,7 @@ "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -168,6 +206,7 @@ "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -201,6 +240,7 @@ "description": "persons name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -221,4 +261,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app19.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app19.json index 3dd1c963f..dd2dc29cd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app19.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app19.json @@ -49,24 +49,23 @@ } } }, - "/persons3": { + "/persons2": { "post": { "tags": [ "hello-controller" ], - "summary": "Persons 3 string.", - "description": "Persons 3 string.", - "operationId": "persons3", + "summary": "Persons 2 string.", + "description": "Persons 2 string.", + "operationId": "persons2", "requestBody": { - "description": "requestBody inside operation annotation", + "description": "requestBody description outside", "content": { "application/json": { "schema": { "type": "string" } } - }, - "required": true + } }, "responses": { "200": { @@ -82,23 +81,25 @@ } } }, - "/persons2": { + "/persons3": { "post": { "tags": [ "hello-controller" ], - "summary": "Persons 2 string.", - "description": "Persons 2 string.", - "operationId": "persons2", + "summary": "Persons 3 string.", + "description": "Persons 3 string.", + "operationId": "persons3", "requestBody": { - "description": "requestBody description outside", + "description": "requestBody inside operation annotation", "content": { "application/json": { "schema": { + "minLength": 1, "type": "string" } } - } + }, + "required": true }, "responses": { "200": { @@ -116,4 +117,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app21.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app21.json index b1ba1592c..2a345c798 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app21.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app21.json @@ -26,6 +26,7 @@ "description": "the name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -62,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app23.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app23.json index 4065f7c35..5da3d64e8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app23.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app23.json @@ -32,6 +32,7 @@ "description": "the name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -59,4 +60,4 @@ } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app24.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app24.json index fefdd6375..aa7195855 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app24.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app24.json @@ -38,6 +38,7 @@ "description": "the name", "required": true, "schema": { + "minLength": 1, "type": "string" } } @@ -86,4 +87,4 @@ } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app102.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app102.json index c5b2139dd..debffb3ed 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app102.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app102.json @@ -41,7 +41,8 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } }, { @@ -143,6 +144,7 @@ "schemas": { "Nested": { "type": "object", + "description": "The type Nested.", "properties": { "param1": { "type": "string", @@ -152,8 +154,7 @@ "type": "integer", "description": "The Param 2." } - }, - "description": "The type Nested." + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app104.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app104.json index bed3c58af..ce4a0ed16 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app104.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app104.json @@ -72,7 +72,6 @@ "components": { "schemas": { "Design": { - "type": "object", "description": "The type Design." } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app105-4.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app105-4.json index c5a35a361..437cc19b9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app105-4.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app105-4.json @@ -38,14 +38,12 @@ "description": "the name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], "responses": { - "200": { - "description": "OK" - }, "400": { "description": "the map", "content": { @@ -58,6 +56,9 @@ } } } + }, + "200": { + "description": "OK" } } } @@ -75,12 +76,12 @@ "implicit": { "authorizationUrl": "http://petstore.swagger.io/oauth/dialog", "scopes": { - "read:pets": "read your pets", - "write:pets": "modify pets in your account" + "write:pets": "modify pets in your account", + "read:pets": "read your pets" } } } } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app108.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app108.json index 7d44281a6..57d340a88 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app108.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app108.json @@ -55,33 +55,31 @@ "schemas": { "ActionResultVoid": { "type": "object", + "description": "The type Action result.", "properties": { + "value": { + "description": "The Value." + }, + "success": { + "type": "boolean", + "description": "The Success." + }, "errorCode": { "type": "string", "description": "The Error code." }, - "errorValue": { - "type": "object", - "description": "The Error value." - }, "message": { "type": "string", "description": "The Message." }, - "success": { - "type": "boolean", - "description": "The Success." + "errorValue": { + "description": "The Error value." }, "targetUrl": { "type": "string", "description": "The Target url." - }, - "value": { - "type": "object", - "description": "The Value." } - }, - "description": "The type Action result." + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json index 4c8e48984..d1f5d5c8f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json @@ -47,12 +47,12 @@ "required": true }, "responses": { - "500": { + "415": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } @@ -67,12 +67,12 @@ } } }, - "415": { + "500": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } @@ -138,19 +138,19 @@ "description": "the last name", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], "responses": { - "500": { + "415": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } @@ -165,12 +165,12 @@ } } }, - "415": { + "500": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } @@ -206,9 +206,9 @@ "description": "the last name", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], @@ -232,8 +232,22 @@ }, "components": { "schemas": { + "ErrorMessage": { + "type": "object", + "description": "The type Error message.", + "properties": { + "errors": { + "type": "array", + "description": "The Errors.", + "items": { + "type": "string" + } + } + } + }, "Problem": { "type": "object", + "description": "The type Problem.", "properties": { "logRef": { "type": "string", @@ -243,68 +257,55 @@ "type": "string", "description": "The Message." } - }, - "description": "The type Problem." - }, - "ErrorMessage": { - "type": "object", - "properties": { - "errors": { - "type": "array", - "description": "The Errors.", - "items": { - "type": "string" - } - } - }, - "description": "The type Error message." + } }, "Person": { - "required": [ - "lastName" - ], "type": "object", + "description": "The type Person.", "properties": { "id": { "type": "integer", - "description": "The Id.", - "format": "int64" + "format": "int64", + "description": "The Id." }, "firstName": { - "maxLength": 2147483647, - "minLength": 2, "type": "string", - "description": "The First name." + "description": "The First name.", + "maxLength": 2147483647, + "minLength": 2 }, "lastName": { - "maxLength": 10, - "minLength": 0, "type": "string", - "description": "The Last name." + "description": "The Last name.", + "maxLength": 10, + "minLength": 0 }, "email": { - "pattern": ".+@.+\\..+", "type": "string", - "description": "The Email." + "description": "The Email.", + "pattern": ".+@.+\\..+" }, "email1": { "type": "string", + "format": "email", "description": "The Email 1." }, "age": { - "maximum": 30, - "minimum": 18, "type": "integer", + "format": "int32", "description": "The Age.", - "format": "int32" + "maximum": 30, + "minimum": 18 }, "creditCardNumber": { "type": "string", "description": "The Credit card number." } }, - "description": "The type Person." + "required": [ + "lastName" + ] } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json index f55f690ec..8eec94cc9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json @@ -108,9 +108,9 @@ "description": "the last name", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], @@ -146,9 +146,9 @@ "description": "the last name", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], @@ -173,51 +173,52 @@ "components": { "schemas": { "Person": { - "required": [ - "lastName" - ], "type": "object", + "description": "The type Person.", "properties": { "id": { "type": "integer", - "description": "The Id.", - "format": "int64" + "format": "int64", + "description": "The Id." }, "firstName": { - "maxLength": 2147483647, - "minLength": 2, "type": "string", - "description": "The First name." + "description": "The First name.", + "maxLength": 2147483647, + "minLength": 2 }, "lastName": { - "maxLength": 10, - "minLength": 0, "type": "string", - "description": "The Last name." + "description": "The Last name.", + "maxLength": 10, + "minLength": 0 }, "email": { - "pattern": ".+@.+\\..+", "type": "string", - "description": "The Email." + "description": "The Email.", + "pattern": ".+@.+\\..+" }, "email1": { "type": "string", + "format": "email", "description": "The Email 1." }, "age": { - "maximum": 30, - "minimum": 18, "type": "integer", + "format": "int32", "description": "The Age.", - "format": "int32" + "maximum": 30, + "minimum": 18 }, "creditCardNumber": { "type": "string", "description": "The Credit card number." } }, - "description": "The type Person." + "required": [ + "lastName" + ] } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json index a14264c5e..f316cd0a1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json @@ -80,12 +80,12 @@ "required": true }, "responses": { - "500": { + "415": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } @@ -100,12 +100,12 @@ } } }, - "415": { + "500": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } @@ -138,9 +138,9 @@ "description": "the last name", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], @@ -176,19 +176,19 @@ "description": "the last name", "required": true, "schema": { + "type": "string", "maxLength": 10, - "minLength": 0, - "type": "string" + "minLength": 0 } } ], "responses": { - "500": { + "415": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/Problem" + "$ref": "#/components/schemas/ErrorMessage" } } } @@ -203,12 +203,12 @@ } } }, - "415": { + "500": { "description": "the response entity", "content": { "*/*": { "schema": { - "$ref": "#/components/schemas/ErrorMessage" + "$ref": "#/components/schemas/Problem" } } } @@ -232,8 +232,22 @@ }, "components": { "schemas": { + "ErrorMessage": { + "type": "object", + "description": "The type Error message.", + "properties": { + "errors": { + "type": "array", + "description": "The Errors.", + "items": { + "type": "string" + } + } + } + }, "Problem": { "type": "object", + "description": "The type Problem.", "properties": { "logRef": { "type": "string", @@ -243,68 +257,55 @@ "type": "string", "description": "The Message." } - }, - "description": "The type Problem." - }, - "ErrorMessage": { - "type": "object", - "properties": { - "errors": { - "type": "array", - "description": "The Errors.", - "items": { - "type": "string" - } - } - }, - "description": "The type Error message." + } }, "Person": { - "required": [ - "lastName" - ], "type": "object", + "description": "The type Person.", "properties": { "id": { "type": "integer", - "description": "The Id.", - "format": "int64" + "format": "int64", + "description": "The Id." }, "firstName": { - "maxLength": 2147483647, - "minLength": 2, "type": "string", - "description": "The First name." + "description": "The First name.", + "maxLength": 2147483647, + "minLength": 2 }, "lastName": { - "maxLength": 10, - "minLength": 0, "type": "string", - "description": "The Last name." + "description": "The Last name.", + "maxLength": 10, + "minLength": 0 }, "email": { - "pattern": ".+@.+\\..+", "type": "string", - "description": "The Email." + "description": "The Email.", + "pattern": ".+@.+\\..+" }, "email1": { "type": "string", + "format": "email", "description": "The Email 1." }, "age": { - "maximum": 30, - "minimum": 18, "type": "integer", + "format": "int32", "description": "The Age.", - "format": "int32" + "maximum": 30, + "minimum": 18 }, "creditCardNumber": { "type": "string", "description": "The Credit card number." } }, - "description": "The type Person." + "required": [ + "lastName" + ] } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app119.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app119.json index 063cfb38f..daee6fc5f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app119.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app119.json @@ -31,10 +31,6 @@ "schema": { "type": "object", "properties": { - "params": { - "$ref": "#/components/schemas/JsonRequest", - "description": "the json request" - }, "file1": { "type": "string", "format": "binary", @@ -44,11 +40,20 @@ "type": "string", "format": "binary", "description": "This is file2" + }, + "params": { + "$ref": "#/components/schemas/JsonRequest", + "description": "the json request" } }, "required": [ "params" ] + }, + "encoding": { + "params": { + "contentType": "application/json" + } } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app121.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app121.json index ee3fc16e2..40a973f41 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app121.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app121.json @@ -41,7 +41,8 @@ "description": "parameter from child of RequestParams", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } }, { @@ -154,7 +155,8 @@ "properties": { "childParam": { "type": "string", - "description": "parameter from child of RequestParams" + "description": "parameter from child of RequestParams", + "minLength": 1 }, "intParam": { "type": "integer", @@ -215,3 +217,4 @@ } } } + \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app126.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app126.json index 57be66520..2359a2278 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app126.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app126.json @@ -67,23 +67,21 @@ }, "parameters": { "type": "object", - "additionalProperties": { - "type": "object" - }, + "additionalProperties": {}, "description": "Optional, additional attributes of the problem. Implementations can choose to ignore this in favor of concrete,\n typed fields." }, - "status": { - "type": "integer", - "format": "int32", - "description": "The HTTP status code generated by the origin server for this\n occurrence of the problem." + "detail": { + "type": "string", + "description": "A human readable explanation specific to this occurrence of the problem." }, "title": { "type": "string", "description": "A short, human-readable summary of the problem type. It SHOULD NOT\n change from occurrence to occurrence of the problem, except for\n purposes of localisation." }, - "detail": { - "type": "string", - "description": "A human readable explanation specific to this occurrence of the problem." + "status": { + "type": "integer", + "format": "int32", + "description": "The HTTP status code generated by the origin server for this\n occurrence of the problem." } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app14.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app14.json index cae257649..1c0c724dd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app14.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app14.json @@ -17,28 +17,6 @@ } ], "paths": { - "/test": { - "get": { - "tags": [ - "hello-controller" - ], - "summary": "Demo 2 http entity.", - "description": "Demo 2 http entity.", - "operationId": "demo2", - "responses": { - "200": { - "description": "the http entity", - "content": { - "*/*": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, "/persons": { "get": { "tags": [ @@ -54,7 +32,8 @@ "description": "the name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -64,7 +43,29 @@ } } } + }, + "/test": { + "get": { + "tags": [ + "hello-controller" + ], + "summary": "Demo 2 http entity.", + "description": "Demo 2 http entity.", + "operationId": "demo2", + "responses": { + "200": { + "description": "the http entity", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app150.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app150.json index af4081757..ea9038414 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app150.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app150.json @@ -17,24 +17,24 @@ } ], "paths": { - "/test/": { + "/test4": { "get": { "tags": [ "hello-controller" ], - "summary": "Test.", - "description": "Test.", - "operationId": "test", + "summary": "Test 4.", + "description": "Test 4.", + "operationId": "test4", "parameters": [ { - "name": "toto", + "name": "localDate", "in": "query", - "description": "the toto", + "description": "the local date", "required": false, "schema": { - "type": "integer", - "format": "int32", - "default": 1 + "type": "string", + "format": "date", + "default": "2021-03-08" } } ], @@ -45,23 +45,29 @@ } } }, - "/test1": { + "/test3": { "get": { "tags": [ "hello-controller" ], - "summary": "Test 1.", - "description": "Test 1.", - "operationId": "test1", + "summary": "Test 3.", + "description": "Test 3.", + "operationId": "test3", "parameters": [ { "name": "toto", "in": "query", "description": "the toto", - "required": true, + "required": false, "schema": { - "type": "boolean", - "default": false + "type": "array", + "default": [ + "users", + "123" + ], + "items": { + "type": "string" + } } } ], @@ -72,29 +78,23 @@ } } }, - "/test3": { + "/test1": { "get": { "tags": [ "hello-controller" ], - "summary": "Test 3.", - "description": "Test 3.", - "operationId": "test3", + "summary": "Test 1.", + "description": "Test 1.", + "operationId": "test1", "parameters": [ { "name": "toto", "in": "query", "description": "the toto", - "required": false, + "required": true, "schema": { - "type": "array", - "items": { - "type": "string" - }, - "default": [ - "users", - "123" - ] + "type": "boolean", + "default": false } } ], @@ -105,23 +105,24 @@ } } }, - "/test4": { + "/test/": { "get": { "tags": [ "hello-controller" ], - "summary": "Test 4.", - "description": "Test 4.", - "operationId": "test4", + "summary": "Test.", + "description": "Test.", + "operationId": "test", "parameters": [ { - "name": "localDate", + "name": "toto", "in": "query", - "description": "the local date", + "description": "the toto", "required": false, "schema": { - "type": "string", - "format": "date" + "type": "integer", + "format": "int32", + "default": 1 } } ], @@ -134,4 +135,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app162.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app162.json index 9df83bcf3..935dd0c9b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app162.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app162.json @@ -324,7 +324,7 @@ }, "inner": { "$ref": "#/components/schemas/JavadocOnlyStaticInnerRestDto", - "description": "This is the private #inner field's javadoc.\n\n This javadoc description is ignored by the REST documentation:\n the $ref can't have a description as any sibling elements of a $ref are ignored." + "description": "This is the private #inner field's javadoc.\n This javadoc description is ignored by the REST documentation:\n the $ref can't have a description as any sibling elements of a $ref are ignored." } } }, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app170.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app170.json index f95d8ba43..1d8da4881 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app170.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app170.json @@ -25,14 +25,12 @@ "content": { "*/*": { "schema": { - "oneOf": [ - { - "$ref": "#/components/schemas/Cat" - }, - { - "$ref": "#/components/schemas/Dog" + "type": "object", + "properties": { + "Animal": { + "$ref": "#/components/schemas/Animal" } - ] + } } } } @@ -44,7 +42,6 @@ "components": { "schemas": { "Animal": { - "type": "object", "description": "Represents an Animal class." }, "Cat": { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app171.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app171.json index f862b1ea4..591f7dd03 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app171.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app171.json @@ -42,23 +42,23 @@ }, "components": { "schemas": { - "PersonProjection" : { - "type" : "object", - "properties" : { - "email" : { - "type" : "string", - "description" : "The Email." + "PersonProjection": { + "type": "object", + "properties": { + "email": { + "type": "string", + "description": "The Email." }, - "firstName" : { - "type" : "string", - "description" : "The First name." + "firstName": { + "type": "string", + "description": "The First name." }, - "lastName" : { - "type" : "string", - "description" : "The Last name." + "lastName": { + "type": "string", + "description": "The Last name." } }, - "description" : "The type PersonProjection dto interface." + "description": "The type PersonProjection dto interface." } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app18.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app18.json index af987cb87..3fcc325b6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app18.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app18.json @@ -32,7 +32,43 @@ "description": "the name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 + } + } + ], + "responses": { + "200": { + "description": "the string", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + }, + "/persons7": { + "get": { + "tags": [ + "hello-controller" + ], + "summary": "Persons 7 string.", + "description": "Persons 7 string.", + "operationId": "persons7", + "parameters": [ + { + "name": "age", + "in": "query", + "description": "the age", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "exclusiveMinimum": 0 } } ], @@ -65,7 +101,8 @@ "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -98,9 +135,9 @@ "description": "the age", "required": true, "schema": { - "maximum": 0, "type": "integer", - "format": "int32" + "format": "int32", + "maximum": 0 } } ], @@ -133,9 +170,9 @@ "description": "the age", "required": true, "schema": { - "minimum": 0, "type": "integer", - "format": "int32" + "format": "int32", + "minimum": 0 } } ], @@ -168,7 +205,8 @@ "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -201,7 +239,8 @@ "description": "persons name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -221,4 +260,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app19.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app19.json index 615738628..05f18e453 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app19.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app19.json @@ -49,24 +49,23 @@ } } }, - "/persons3": { + "/persons2": { "post": { "tags": [ "hello-controller" ], - "summary": "Persons 3 string.", - "description": "Persons 3 string.", - "operationId": "persons3", + "summary": "Persons 2 string.", + "description": "Persons 2 string.", + "operationId": "persons2", "requestBody": { - "description": "requestBody inside operation annotation", + "description": "requestBody description outside", "content": { "application/json": { "schema": { "type": "string" } } - }, - "required": true + } }, "responses": { "200": { @@ -82,23 +81,25 @@ } } }, - "/persons2": { + "/persons3": { "post": { "tags": [ "hello-controller" ], - "summary": "Persons 2 string.", - "description": "Persons 2 string.", - "operationId": "persons2", + "summary": "Persons 3 string.", + "description": "Persons 3 string.", + "operationId": "persons3", "requestBody": { - "description": "requestBody description outside", + "description": "requestBody inside operation annotation", "content": { "application/json": { "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } - } + }, + "required": true }, "responses": { "200": { @@ -116,4 +117,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app2.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app2.json index efe180514..d3ec70ab7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app2.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app2.json @@ -57,9 +57,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -132,9 +130,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -169,9 +165,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -213,9 +207,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -266,9 +258,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -313,9 +303,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -355,9 +343,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -397,9 +383,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -436,9 +420,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -488,15 +470,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } }, - "404": { - "description": "Pet not found", + "200": { + "description": "successful operation", "content": { "application/xml": { "schema": { @@ -510,8 +490,8 @@ } } }, - "200": { - "description": "successful operation", + "404": { + "description": "Pet not found", "content": { "application/xml": { "schema": { @@ -577,9 +557,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -632,9 +610,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -708,9 +684,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -751,9 +725,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -799,9 +771,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -853,15 +823,13 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } }, - "404": { - "description": "Order not found", + "200": { + "description": "successful operation", "content": { "application/xml": { "schema": { @@ -875,8 +843,8 @@ } } }, - "200": { - "description": "successful operation", + "404": { + "description": "Order not found", "content": { "application/xml": { "schema": { @@ -917,9 +885,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -945,9 +911,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -1002,9 +966,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } @@ -1070,9 +1032,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app21.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app21.json index 75ef58948..b38e15f4b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app21.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app21.json @@ -26,7 +26,8 @@ "description": "the name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -54,12 +55,12 @@ "implicit": { "authorizationUrl": "http://personstore.swagger.io/oauth/dialog", "scopes": { - "write:persons": "modify persons in your account", - "read:persons": "read your persons" + "read:persons": "read your persons", + "write:persons": "modify persons in your account" } } } } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app23.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app23.json index 88155203a..bbe23f4d1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app23.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app23.json @@ -32,7 +32,8 @@ "description": "the name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -59,4 +60,4 @@ } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app24.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app24.json index 7575323f0..7a11db8b8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app24.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app24.json @@ -38,7 +38,8 @@ "description": "the name", "required": true, "schema": { - "type": "string" + "type": "string", + "minLength": 1 } } ], @@ -74,16 +75,16 @@ } }, "securitySchemes": { - "basicScheme": { - "type": "http", - "scheme": "basic" - }, "Authorization": { "type": "apiKey", "description": "A core-auth Bearer token", "name": "Authorization", "in": "header" + }, + "basicScheme": { + "type": "http", + "scheme": "basic" } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json index c8b7aeb38..52c639196 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app26.json @@ -78,7 +78,6 @@ "description": "The type My model.", "properties": { "thing": { - "type": "object", "description": "Hello", "oneOf": [ { diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app51.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app51.json index 420aff299..64db87928 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app51.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app51.json @@ -31,9 +31,7 @@ "application/json": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } }, @@ -46,9 +44,7 @@ "*/*": { "schema": { "type": "object", - "additionalProperties": { - "type": "object" - } + "additionalProperties": {} } } } diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app6.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app6.json index 8ef6012de..54d9ca1cb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app6.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app6.json @@ -31,7 +31,6 @@ "content": { "application/json": { "schema": { - "type": "string", "oneOf": [ { "type": "string" diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app60.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app60.json index 7415af483..feb69644d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app60.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app60.json @@ -61,9 +61,7 @@ "*/*": { "schema": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -106,9 +104,7 @@ "*/*": { "schema": { "type": "array", - "items": { - "type": "object" - } + "items": {} } } } @@ -118,4 +114,4 @@ } }, "components": {} -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app75.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app75.json index 8e5e05b43..a610efb78 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app75.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app75.json @@ -17,14 +17,14 @@ } ], "paths": { - "/test3/{uuid}": { + "/test1/{uuid}": { "post": { "tags": [ "hello-controller" ], "summary": "Example api that realize an ECHO operation", "description": "The result of the echo is the input value of the api", - "operationId": "postMyRequestBody3", + "operationId": "postMyRequestBody1", "parameters": [ { "name": "uuid", @@ -39,14 +39,11 @@ ], "responses": { "200": { - "description": "the response entity", + "description": "Successful Operation", "content": { - "*/*": { + "application/json": { "schema": { - "type": "array", - "items": { - "type": "object" - } + "$ref": "#/components/schemas/PersonDTO" } } } @@ -108,14 +105,14 @@ } } }, - "/test1/{uuid}": { + "/test3/{uuid}": { "post": { "tags": [ "hello-controller" ], "summary": "Example api that realize an ECHO operation", "description": "The result of the echo is the input value of the api", - "operationId": "postMyRequestBody1", + "operationId": "postMyRequestBody3", "parameters": [ { "name": "uuid", @@ -130,11 +127,12 @@ ], "responses": { "200": { - "description": "Successful Operation", + "description": "the response entity", "content": { - "application/json": { + "*/*": { "schema": { - "$ref": "#/components/schemas/PersonDTO" + "type": "array", + "items": {} } } } @@ -157,6 +155,7 @@ "schemas": { "PersonDTO": { "type": "object", + "description": "The type Person dto.", "properties": { "email": { "type": "string", @@ -170,9 +169,8 @@ "type": "string", "description": "The Last name." } - }, - "description": "The type Person dto." + } } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app87.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app87.json index d97ae618f..dbb394174 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app87.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app87.json @@ -74,9 +74,8 @@ "components": { "schemas": { "Item": { - "type": "object", "description": "The type Item." } } } -} \ No newline at end of file +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/pom.xml index a6b7c7394..d3b7a7475 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/pom.xml @@ -2,12 +2,19 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-kotlin-webflux-tests + ${project.artifactId} + + org.springdoc + springdoc-openapi-starter-webflux-api + ${project.version} + test + com.fasterxml.jackson.module jackson-module-kotlin @@ -23,23 +30,11 @@ kotlinx-coroutines-reactor test - - org.springdoc - springdoc-openapi-starter-webflux-api - ${project.version} - test - org.springframework.boot spring-boot-starter-reactor-netty test - - io.netty - netty-resolver-dns-native-macos - osx-aarch_64 - test - @@ -89,4 +84,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index 9fe19c31c..3a452543e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -47,7 +47,7 @@ @WebFluxTest @ActiveProfiles("test") -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractSpringDocTest { protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractSpringDocTest.class); diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java index 80235f9a7..27ca37ac7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v30/app21/SpringDocApp21Test.java @@ -23,6 +23,7 @@ */ package test.org.springdoc.api.v30.app21; + import test.org.springdoc.api.v30.AbstractSpringDocTest; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index 672cf2501..dfbac974f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt index aef52b178..e3fb2d363 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt @@ -16,5 +16,6 @@ class ExampleController { fun test(@RequestParam name: String) = Greeting("Hello $name") @GetMapping("/test-with-default") - fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = Greeting("Hello $name") + fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = + Greeting("Hello $name") } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/SystemStatusController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/SystemStatusController.kt index db37e9b41..4ef0399a4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/SystemStatusController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/SystemStatusController.kt @@ -29,31 +29,31 @@ enum class SystemStatus(val status: String) { } data class PersonDTO( - @Deprecated ("no-email") val email: String, + @Deprecated("no-email") val email: String, val firstName: String, val lastName: String ) data class SystemStatusResponse( - @Deprecated ("will be removed in next version") + @Deprecated("will be removed in next version") val systemStatus: SystemStatus, - @Deprecated ("") - val emptyTest:String, + @Deprecated("") + val emptyTest: String, - @Deprecated ("should be ignored") + @Deprecated("should be ignored") @Schema(description = "nonEmptyDesc") - val nonEmptyDesc:String + val nonEmptyDesc: String ) @RestController @RequestMapping("/status") class SystemStatusController { @GetMapping - suspend fun index() = SystemStatusResponse(SystemStatus.OK,"","") + suspend fun index() = SystemStatusResponse(SystemStatus.OK, "", "") @GetMapping("/foo") fun foo(personDTO: PersonDTO) = mono { - SystemStatusResponse(SystemStatus.OK,"","") + SystemStatusResponse(SystemStatus.OK, "", "") } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt index 64afa35d6..b8ee2aecb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt index 8a473d3e5..fed623f06 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt @@ -29,7 +29,7 @@ class SpringDocApp7Test : AbstractKotlinSpringDocTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v30.app7"]) - open class DemoApplication{ + open class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt index 9778adba4..3b79e3bf7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt index ad52fde72..2a8754f43 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt @@ -27,12 +27,12 @@ import org.springframework.context.support.GenericApplicationContext import org.springframework.test.context.TestPropertySource import test.org.springdoc.api.v30.AbstractKotlinSpringDocTest -@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED+"=false"]) +@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED + "=false"]) class SpringDocApp8Test : AbstractKotlinSpringDocTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v30.app8"]) - class DemoApplication{ + class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt index efb1e34de..c50aff21f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt @@ -9,16 +9,17 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/api/demo") class DocumentsApiController { - @GetMapping - suspend fun getDocuments( request: DemoRequest - ): DemoDto = DemoDto(42) + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) } data class DemoDto( - var id: Long, + var id: Long, ) -class DemoRequest ( +class DemoRequest( @field:Schema(required = true, defaultValue = "a default value") val requiredNullableDefault: String?, @@ -32,25 +33,37 @@ class DemoRequest ( @field:Schema(required = true) val requiredNoNullableNoDefault: String, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNullableDefault1: String?, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNullableNoDefault1: String?, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNoNullableDefault1: String, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNoNullableNoDefault1: String, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNullableDefault2: String?, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) val noRequiredNullableNoDefault2: String?, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNoNullableDefault2: String, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) @@ -69,4 +82,4 @@ class DemoRequest ( val noRequiredNoNullableNoDefault: String, -) + ) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt index 853824584..3c6df4a11 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt @@ -16,5 +16,6 @@ class ExampleController { fun test(@RequestParam name: String) = Greeting("Hello $name") @GetMapping("/test-with-default") - fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = Greeting("Hello $name") + fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = + Greeting("Hello $name") } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/SystemStatusController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/SystemStatusController.kt index 145911386..8a7ae875d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/SystemStatusController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/SystemStatusController.kt @@ -29,31 +29,31 @@ enum class SystemStatus(val status: String) { } data class PersonDTO( - @Deprecated ("no-email") val email: String, + @Deprecated("no-email") val email: String, val firstName: String, val lastName: String ) data class SystemStatusResponse( - @Deprecated ("will be removed in next version") + @Deprecated("will be removed in next version") val systemStatus: SystemStatus, - @Deprecated ("") - val emptyTest:String, + @Deprecated("") + val emptyTest: String, - @Deprecated ("should be ignored") + @Deprecated("should be ignored") @Schema(description = "nonEmptyDesc") - val nonEmptyDesc:String + val nonEmptyDesc: String ) @RestController @RequestMapping("/status") class SystemStatusController { @GetMapping - suspend fun index() = SystemStatusResponse(SystemStatus.OK,"","") + suspend fun index() = SystemStatusResponse(SystemStatus.OK, "", "") @GetMapping("/foo") fun foo(personDTO: PersonDTO) = mono { - SystemStatusResponse(SystemStatus.OK,"","") + SystemStatusResponse(SystemStatus.OK, "", "") } } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt index bc0852278..995b224d7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt index 40917aa41..160119159 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt @@ -29,7 +29,7 @@ class SpringDocApp7Test : AbstractKotlinSpringDocTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v31.app7"]) - open class DemoApplication{ + open class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt index 074eed409..5b1fe7071 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt index 57e83ac3a..83b156683 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt @@ -27,12 +27,12 @@ import org.springframework.context.support.GenericApplicationContext import org.springframework.test.context.TestPropertySource import test.org.springdoc.api.v31.AbstractKotlinSpringDocTest -@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED+"=false"]) +@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED + "=false"]) class SpringDocApp8Test : AbstractKotlinSpringDocTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v31.app8"]) - class DemoApplication{ + class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt index 1957c6f9e..a925a5ab8 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt @@ -9,16 +9,17 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/api/demo") class DocumentsApiController { - @GetMapping - suspend fun getDocuments( request: DemoRequest - ): DemoDto = DemoDto(42) + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) } data class DemoDto( - var id: Long, + var id: Long, ) -class DemoRequest ( +class DemoRequest( @field:Schema(required = true, defaultValue = "a default value") val requiredNullableDefault: String?, @@ -32,25 +33,37 @@ class DemoRequest ( @field:Schema(required = true) val requiredNoNullableNoDefault: String, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNullableDefault1: String?, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNullableNoDefault1: String?, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNoNullableDefault1: String, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNoNullableNoDefault1: String, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNullableDefault2: String?, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) val noRequiredNullableNoDefault2: String?, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNoNullableDefault2: String, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) @@ -69,4 +82,4 @@ class DemoRequest ( val noRequiredNoNullableNoDefault: String, -) + ) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.0.1/app6.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.0.1/app6.json index dd4d0a41c..9d4f7b3f3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.0.1/app6.json +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.0.1/app6.json @@ -42,7 +42,7 @@ "properties": { "data": { "type": "string", - "description":"Some description about a byte array.", + "description": "Some description about a byte array.", "format": "byte" } } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.1.0/app6.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.1.0/app6.json index 21c36b6fc..3370fc7a6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.1.0/app6.json +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webflux-tests/src/test/resources/results/3.1.0/app6.json @@ -42,7 +42,7 @@ "properties": { "data": { "type": "string", - "description":"Some description about a byte array.", + "description": "Some description about a byte array.", "format": "byte" } } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/pom.xml index 6083259e1..61d098f41 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/pom.xml @@ -2,20 +2,22 @@ springdoc-openapi-tests org.springdoc - 2.8.5 + 2.8.13 4.0.0 springdoc-openapi-kotlin-webmvc-tests + ${project.artifactId} - com.fasterxml.jackson.module - jackson-module-kotlin + org.springdoc + springdoc-openapi-starter-webmvc-api + ${project.version} test - org.springdoc - springdoc-openapi-starter-webmvc-api + com.fasterxml.jackson.module + jackson-module-kotlin test @@ -28,11 +30,6 @@ spring-boot-starter-web test - - org.springframework.boot - spring-boot-starter-test - test - @@ -69,6 +66,12 @@ spring + + -java-parameters + + -Xemit-jvm-type-annotations + + @@ -110,4 +113,4 @@ - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/AbstractKotlinSpringDocMVCTest.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/AbstractKotlinSpringDocMVCTest.kt index ca3efc3a7..127784ef9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/AbstractKotlinSpringDocMVCTest.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/AbstractKotlinSpringDocMVCTest.kt @@ -47,45 +47,46 @@ import java.nio.file.Paths @TestPropertySource(properties = ["springdoc.api-docs.version=openapi_3_0"]) abstract class AbstractKotlinSpringDocMVCTest { - @Autowired - val mockMvc: MockMvc? = null + @Autowired + val mockMvc: MockMvc? = null - private val logger = LoggerFactory.getLogger(AbstractKotlinSpringDocMVCTest::class.java) + private val logger = + LoggerFactory.getLogger(AbstractKotlinSpringDocMVCTest::class.java) - @Test - fun testApp() { - var result: String? = null - try { - val response = mockMvc!!.perform(MockMvcRequestBuilders.get("/v3/api-docs")) - .andExpect(MockMvcResultMatchers.status().isOk).andReturn() + @Test + fun testApp() { + var result: String? = null + try { + val response = mockMvc!!.perform(MockMvcRequestBuilders.get("/v3/api-docs")) + .andExpect(MockMvcResultMatchers.status().isOk).andReturn() - result = response.response.contentAsString - val className = javaClass.simpleName - val testNumber = className.replace("[^0-9]".toRegex(), "") + result = response.response.contentAsString + val className = javaClass.simpleName + val testNumber = className.replace("[^0-9]".toRegex(), "") - val expected = getContent("results/3.0.1/app$testNumber.json") - JSONAssert.assertEquals(expected, result, true) - } catch (e: AssertionError) { - logger.error(result) - throw e - } - } + val expected = getContent("results/3.0.1/app$testNumber.json") + JSONAssert.assertEquals(expected, result, true) + } catch (e: AssertionError) { + logger.error(result) + throw e + } + } - companion object { - @Throws(Exception::class) - fun getContent(fileName: String): String { - try { - val path = Paths.get( - AbstractKotlinSpringDocMVCTest::class.java.classLoader.getResource( - fileName - )!!.toURI() - ) - val fileBytes = Files.readAllBytes(path) - return String(fileBytes, StandardCharsets.UTF_8) - } catch (e: Exception) { - throw RuntimeException("Failed to read file: $fileName", e) - } + companion object { + @Throws(Exception::class) + fun getContent(fileName: String): String { + try { + val path = Paths.get( + AbstractKotlinSpringDocMVCTest::class.java.classLoader.getResource( + fileName + )!!.toURI() + ) + val fileBytes = Files.readAllBytes(path) + return String(fileBytes, StandardCharsets.UTF_8) + } catch (e: Exception) { + throw RuntimeException("Failed to read file: $fileName", e) + } - } - } + } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt index f6a934d51..a27e4bcda 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app10/ExampleController.kt @@ -16,5 +16,6 @@ class ExampleController { fun test(@RequestParam name: String) = Greeting("Hello $name") @GetMapping("/test-with-default") - fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = Greeting("Hello $name") + fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = + Greeting("Hello $name") } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/ExampleController.kt index 9d76259b1..f71929d81 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app11/ExampleController.kt @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RestController @RestController class ExampleController { - @Operation( - summary = "foo api", - description = """ + @Operation( + summary = "foo api", + description = """ this api is foo #### Custom exception case @@ -21,76 +21,76 @@ class ExampleController { | 403 | NO_PERMISSION |This request is only available to administrators. | | | | 400 | STORE_NOT_FOUND |Store not found. | | | """ - ) - @GetMapping("/foo/trim-kotlin-indent") - fun readFoo(@RequestParam name: String?) = FooResponse("Hello ${name ?: "world"}") + ) + @GetMapping("/foo/trim-kotlin-indent") + fun readFoo(@RequestParam name: String?) = FooResponse("Hello ${name ?: "world"}") } data class FooResponse( - val name: String, + val name: String, ) @RestController class ExampleController2 { - @GetMapping("/foo/trim-kotlin-indent/schema") - fun readFoo( + @GetMapping("/foo/trim-kotlin-indent/schema") + fun readFoo( @RequestBody request: FooRequestWithSchema, - ) = FooResponseWithSchema( - name = "Hello ${request.age ?: "world"}", - subFoo = SubFooResponseWithSchema(subName = "sub foo name"), - ) + ) = FooResponseWithSchema( + name = "Hello ${request.age ?: "world"}", + subFoo = SubFooResponseWithSchema(subName = "sub foo name"), + ) } @Schema( - name = "foo request", - description = """ + name = "foo request", + description = """ foo request class description with kotlin indent """ ) data class FooRequestWithSchema( - @Schema( - name = "age", - description = """ + @Schema( + name = "age", + description = """ foo request field with kotlin indent """ - ) - val age: Int, + ) + val age: Int, ) @Schema( - name = "foo response", - description = """ + name = "foo response", + description = """ foo response class description with kotlin indent """ ) data class FooResponseWithSchema( - @Schema( - name = "name", - description = """ + @Schema( + name = "name", + description = """ foo response fields with kotlin indent """ - ) - val name: String, - val subFoo: SubFooResponseWithSchema + ) + val name: String, + val subFoo: SubFooResponseWithSchema ) @Schema( - name = "sub foo response", - description = """ + name = "sub foo response", + description = """ sub foo response class description with kotlin indent """ ) data class SubFooResponseWithSchema( - @Schema( - name = "subName", - description = """ + @Schema( + name = "subName", + description = """ sub foo response fields with kotlin indent """ - ) - val subName: String, + ) + val subName: String, ) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/SpringDocApp13Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/SpringDocApp13Test.kt index de0d251ee..a8988a901 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/SpringDocApp13Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/SpringDocApp13Test.kt @@ -28,6 +28,6 @@ class SpringDocApp13Test : AbstractKotlinSpringDocMVCTest() { @SpringBootApplication class DemoApplication { } - + } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/TestController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/TestController.kt index e9feb4c50..72b6f7d0e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/TestController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app13/TestController.kt @@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.RestController @Schema(description = "Generic description") data class KeyValue( - val key: String, - val value: String, + val key: String, + val value: String, ) @Schema @@ -38,13 +38,12 @@ data class SomeDTO( ) - @RestController @RequestMapping("/test") class TestController { - @PostMapping("/test") - fun create(@RequestBody some: SomeDTO) { + @PostMapping("/test") + fun create(@RequestBody some: SomeDTO) { - } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app14/TestController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app14/TestController.kt index 3dcc3b1c5..75c887d8c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app14/TestController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app14/TestController.kt @@ -32,8 +32,14 @@ data class KeyValue( @Schema data class SomeDTO( - @Schema(description = "Description A", allOf = [KeyValue::class]) val field_a: KeyValue, - @Schema(description = "Description B", allOf = [KeyValue::class]) val field_b: KeyValue, + @Schema( + description = "Description A", + allOf = [KeyValue::class] + ) val field_a: KeyValue, + @Schema( + description = "Description B", + allOf = [KeyValue::class] + ) val field_b: KeyValue, ) @RestController diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app15/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app15/DemoController.kt new file mode 100644 index 000000000..ba1ff9b35 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app15/DemoController.kt @@ -0,0 +1,50 @@ +package test.org.springdoc.api.v30.app15 + +import io.swagger.v3.oas.annotations.media.Schema +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/api/demo") +class DocumentsApiController { + + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) +} + +data class DemoDto( + var id: Long, +) + +/** +field following test cases: +``` +| case required | 11true | 10true | 01false | 00false | N1false | N0true | +| :-------------------- | :----- | :----- | :------ | :------ | :----- | :------ | +| schema required value | true | true | false | false | none | none | +| field nullable | true | false | true | false | true | false | +``` + */ +class DemoRequest( + + @field:Schema(required = true) + val field11true: String?, + + @field:Schema(required = true) + val field10true: String, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field01false: String?, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field00false: String, + + @field:Schema + val fieldN1false: String?, + + @field:Schema + val fieldN0true: String, +) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app15/SpringDocApp15Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app15/SpringDocApp15Test.kt new file mode 100644 index 000000000..262fb37a3 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app15/SpringDocApp15Test.kt @@ -0,0 +1,9 @@ +package test.org.springdoc.api.v30.app15 + +import org.springframework.boot.autoconfigure.SpringBootApplication +import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest + +class SpringDocApp15Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app16/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app16/DemoController.kt new file mode 100644 index 000000000..92a6b6fa3 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app16/DemoController.kt @@ -0,0 +1,50 @@ +package test.org.springdoc.api.v30.app16 + +import io.swagger.v3.oas.annotations.media.Schema +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/api/demo") +class DocumentsApiController { + + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) +} + +data class DemoDto( + var id: Long, +) + +/** +field following test cases: +``` +| case required | 11true | 10true | 01false | 00false | N1false | N0true | +| :-------------------- | :----- | :----- | :------ | :------ | :----- | :------ | +| schema required value | true | true | false | false | none | none | +| field nullable | true | false | true | false | true | false | +``` + */ +class DemoRequest( + + @field:Schema(required = true) + val field11true: String?, + + @field:Schema(required = true) + val field10true: String, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field01false: String?, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field00false: String, + + @field:Schema + val fieldN1false: String?, + + @field:Schema + val fieldN0true: String, +) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app16/SpringDocApp16Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app16/SpringDocApp16Test.kt new file mode 100644 index 000000000..750e1213a --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app16/SpringDocApp16Test.kt @@ -0,0 +1,12 @@ +package test.org.springdoc.api.v30.app16 + +import org.springdoc.core.utils.Constants.SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.test.context.TestPropertySource +import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest + +@TestPropertySource(properties = ["$SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT=true"]) +class SpringDocApp16Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app17/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app17/DemoController.kt new file mode 100644 index 000000000..26114415f --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app17/DemoController.kt @@ -0,0 +1,58 @@ +package test.org.springdoc.api.v30.app17 + +import io.swagger.v3.oas.annotations.media.ArraySchema +import io.swagger.v3.oas.annotations.media.Schema +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotEmpty +import jakarta.validation.constraints.Size +import org.springframework.validation.annotation.Validated +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@Validated +@RestController +@RequestMapping("/api/demo") +class DocumentsApiController { + + @Valid + @GetMapping + suspend fun validOverrideAndOrder( + @Valid request: ChildBar + ): DemoDto = DemoDto(42) +} + +data class DemoDto( + var id: Long, +) + +@Schema(description = "ParentFoo Request") +open class ParentFoo( + @field:NotEmpty // use flat-param-object. to remove or merge annotations by use DelegatingMethodParameterCustomizer + @field:Size(min = 10, max = 20) + @field:ArraySchema(schema = Schema(description = "wrong: list[minItems = 10, maxItems = 20] wrong: string[minLength = 30, maxLength = 40]")) + open var fooList: List<@Size(min = 30, max = 40) String> = listOf() +) + +@Schema(description = "ChildBar Request") +data class ChildBar( + @field:Size(min = 11, max = 21) // should override parent + @field:ArraySchema(schema = Schema(description = "expect: list[minItems = 11, maxItems = 21] expect: string[minLength = 31, maxLength = 41]")) + override var fooList: List<@Size(min = 31, max = 41) String>, + + @field:Size(min = 12, max = 22) // genericType should work + @field:ArraySchema(schema = Schema(description = "expect: list[minItems = 12, maxItems = 22] expect: string[minLength = 32, maxLength = 42]")) + var barList: List<@Size(min = 32, max = 42) String> = listOf(), + + @field:DecimalMin("1") // will be override by min + @field:Min(2) + @field:Schema(description = "expect: minimum = 2") + var validOrder1: Long, + + @field:Min(2) // will be override by DecimalMin + @field:DecimalMin("1") + @field:Schema(description = "expect: minimum = 1") + var validOrder2: Long, +) : ParentFoo() diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app17/SpringDocApp17Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app17/SpringDocApp17Test.kt new file mode 100644 index 000000000..1b35f8d6c --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app17/SpringDocApp17Test.kt @@ -0,0 +1,51 @@ +package test.org.springdoc.api.v30.app17 + +import jakarta.validation.constraints.NotEmpty +import org.junit.jupiter.api.Assertions +import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer +import org.springdoc.core.extractor.DelegatingMethodParameter +import org.springdoc.core.utils.Constants.SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.context.annotation.Bean +import org.springframework.core.MethodParameter +import org.springframework.test.context.TestPropertySource +import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest + +@TestPropertySource(properties = ["$SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT=true"]) +class SpringDocApp17Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication { + + @Bean + fun optionalKotlinDelegatingMethodParameterCustomizer(): DelegatingMethodParameterCustomizer { + return object : DelegatingMethodParameterCustomizer { + override fun customizeList( + originalParameter: MethodParameter, + methodParameters: MutableList + ) { + val fieldNameSet = mutableSetOf() + methodParameters.forEachIndexed { index, it -> + if (it is DelegatingMethodParameter && it.isParameterObject && it.field != null) { + val field = it.field!! + if (fieldNameSet.contains(field.name)) { + val fieldAnnotations = field.annotations + Assertions.assertTrue(fieldAnnotations.any { it is NotEmpty }) + // remove parent field + methodParameters.removeAt(index) + } else fieldNameSet.add(field.name) + } + } + if (methodParameters.size > 1) { + methodParameters.sortBy { it.parameterIndex } + } + } + + override fun customize( + originalParameter: MethodParameter, + methodParameter: MethodParameter + ) { + } + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app2/SpringDocApp2Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app2/SpringDocApp2Test.kt index 8efd5fac7..1b49ed4fd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app2/SpringDocApp2Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app2/SpringDocApp2Test.kt @@ -23,7 +23,7 @@ import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest class SpringDocApp2Test : AbstractKotlinSpringDocMVCTest() { - @SpringBootApplication - class DemoApplication + @SpringBootApplication + class DemoApplication } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app5/ListController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app5/ListController.kt index be4ea76f1..90553eb0e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app5/ListController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app5/ListController.kt @@ -26,6 +26,6 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/test") class ListController { - @GetMapping("/") - fun foo(): List = listOf(1, 2, 3) + @GetMapping("/") + fun foo(): List = listOf(1, 2, 3) } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt index 351b60f88..fdc42068c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt index d4c6c38aa..d193d61a3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app7/SpringDocApp7Test.kt @@ -29,7 +29,7 @@ class SpringDocApp7Test : AbstractKotlinSpringDocMVCTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v30.app7"]) - class DemoApplication{ + class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt index 60058ec9d..97b859bbe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt index a6a17dca9..5937f3e66 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app8/SpringDocApp8Test.kt @@ -27,12 +27,12 @@ import org.springframework.context.support.GenericApplicationContext import org.springframework.test.context.TestPropertySource import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest -@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED+"=false"]) +@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED + "=false"]) class SpringDocApp8Test : AbstractKotlinSpringDocMVCTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v30.app8"]) - class DemoApplication{ + class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt index 7e3e12eda..685d8c478 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/DemoController.kt @@ -9,16 +9,17 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/api/demo") class DocumentsApiController { - @GetMapping - suspend fun getDocuments( request: DemoRequest - ): DemoDto = DemoDto(42) + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) } data class DemoDto( - var id: Long, + var id: Long, ) -class DemoRequest ( +class DemoRequest( @field:Schema(required = true, defaultValue = "a default value") val requiredNullableDefault: String?, @@ -32,25 +33,37 @@ class DemoRequest ( @field:Schema(required = true) val requiredNoNullableNoDefault: String, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNullableDefault1: String?, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNullableNoDefault1: String?, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNoNullableDefault1: String, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNoNullableNoDefault1: String, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNullableDefault2: String?, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) val noRequiredNullableNoDefault2: String?, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNoNullableDefault2: String, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) @@ -68,4 +81,4 @@ class DemoRequest ( @field:Schema val noRequiredNoNullableNoDefault: String, -) + ) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/SpringDocApp9Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/SpringDocApp9Test.kt index 070591c3c..10ba46b0d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/SpringDocApp9Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v30/app9/SpringDocApp9Test.kt @@ -3,7 +3,7 @@ package test.org.springdoc.api.v30.app9 import org.springframework.boot.autoconfigure.SpringBootApplication import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest -class SpringDocApp9Test: AbstractKotlinSpringDocMVCTest() { - @SpringBootApplication - class DemoApplication +class SpringDocApp9Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/AbstractKotlinSpringDocMVCTest.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/AbstractKotlinSpringDocMVCTest.kt index 3ef32aa6e..dcc6a839e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/AbstractKotlinSpringDocMVCTest.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/AbstractKotlinSpringDocMVCTest.kt @@ -45,45 +45,46 @@ import java.nio.file.Paths @ActiveProfiles("test") abstract class AbstractKotlinSpringDocMVCTest { - @Autowired - val mockMvc: MockMvc? = null + @Autowired + val mockMvc: MockMvc? = null - private val logger = LoggerFactory.getLogger(AbstractKotlinSpringDocMVCTest::class.java) + private val logger = + LoggerFactory.getLogger(AbstractKotlinSpringDocMVCTest::class.java) - @Test - fun testApp() { - var result: String? = null - try { - val response = mockMvc!!.perform(MockMvcRequestBuilders.get("/v3/api-docs")) - .andExpect(MockMvcResultMatchers.status().isOk).andReturn() + @Test + fun testApp() { + var result: String? = null + try { + val response = mockMvc!!.perform(MockMvcRequestBuilders.get("/v3/api-docs")) + .andExpect(MockMvcResultMatchers.status().isOk).andReturn() - result = response.response.contentAsString - val className = javaClass.simpleName - val testNumber = className.replace("[^0-9]".toRegex(), "") + result = response.response.contentAsString + val className = javaClass.simpleName + val testNumber = className.replace("[^0-9]".toRegex(), "") - val expected = getContent("results/3.1.0/app$testNumber.json") - JSONAssert.assertEquals(expected, result, true) - } catch (e: AssertionError) { - logger.error(result) - throw e - } - } + val expected = getContent("results/3.1.0/app$testNumber.json") + JSONAssert.assertEquals(expected, result, true) + } catch (e: AssertionError) { + logger.error(result) + throw e + } + } - companion object { - @Throws(Exception::class) - fun getContent(fileName: String): String { - try { - val path = Paths.get( - AbstractKotlinSpringDocMVCTest::class.java.classLoader.getResource( - fileName - )!!.toURI() - ) - val fileBytes = Files.readAllBytes(path) - return String(fileBytes, StandardCharsets.UTF_8) - } catch (e: Exception) { - throw RuntimeException("Failed to read file: $fileName", e) - } + companion object { + @Throws(Exception::class) + fun getContent(fileName: String): String { + try { + val path = Paths.get( + AbstractKotlinSpringDocMVCTest::class.java.classLoader.getResource( + fileName + )!!.toURI() + ) + val fileBytes = Files.readAllBytes(path) + return String(fileBytes, StandardCharsets.UTF_8) + } catch (e: Exception) { + throw RuntimeException("Failed to read file: $fileName", e) + } - } - } + } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt index 558f23c08..a6f6946c7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/ExampleController.kt @@ -16,5 +16,6 @@ class ExampleController { fun test(@RequestParam name: String) = Greeting("Hello $name") @GetMapping("/test-with-default") - fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = Greeting("Hello $name") + fun testWithDefault(@RequestParam(defaultValue = "world") name: String) = + Greeting("Hello $name") } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/ExampleController.kt index a1a1cab17..e9e8d77f7 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/ExampleController.kt @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RestController @RestController class ExampleController { - @Operation( - summary = "foo api", - description = """ + @Operation( + summary = "foo api", + description = """ this api is foo #### Custom exception case @@ -21,76 +21,76 @@ class ExampleController { | 403 | NO_PERMISSION |This request is only available to administrators. | | | | 400 | STORE_NOT_FOUND |Store not found. | | | """ - ) - @GetMapping("/foo/trim-kotlin-indent") - fun readFoo(@RequestParam name: String?) = FooResponse("Hello ${name ?: "world"}") + ) + @GetMapping("/foo/trim-kotlin-indent") + fun readFoo(@RequestParam name: String?) = FooResponse("Hello ${name ?: "world"}") } data class FooResponse( - val name: String, + val name: String, ) @RestController class ExampleController2 { - @GetMapping("/foo/trim-kotlin-indent/schema") - fun readFoo( + @GetMapping("/foo/trim-kotlin-indent/schema") + fun readFoo( @RequestBody request: FooRequestWithSchema, - ) = FooResponseWithSchema( - name = "Hello ${request.age ?: "world"}", - subFoo = SubFooResponseWithSchema(subName = "sub foo name"), - ) + ) = FooResponseWithSchema( + name = "Hello ${request.age ?: "world"}", + subFoo = SubFooResponseWithSchema(subName = "sub foo name"), + ) } @Schema( - name = "foo request", - description = """ + name = "foo request", + description = """ foo request class description with kotlin indent """ ) data class FooRequestWithSchema( - @Schema( - name = "age", - description = """ + @Schema( + name = "age", + description = """ foo request field with kotlin indent """ - ) - val age: Int, + ) + val age: Int, ) @Schema( - name = "foo response", - description = """ + name = "foo response", + description = """ foo response class description with kotlin indent """ ) data class FooResponseWithSchema( - @Schema( - name = "name", - description = """ + @Schema( + name = "name", + description = """ foo response fields with kotlin indent """ - ) - val name: String, - val subFoo: SubFooResponseWithSchema + ) + val name: String, + val subFoo: SubFooResponseWithSchema ) @Schema( - name = "sub foo response", - description = """ + name = "sub foo response", + description = """ sub foo response class description with kotlin indent """ ) data class SubFooResponseWithSchema( - @Schema( - name = "subName", - description = """ + @Schema( + name = "subName", + description = """ sub foo response fields with kotlin indent """ - ) - val subName: String, + ) + val subName: String, ) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/SpringDocApp13Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/SpringDocApp13Test.kt index c071c8a3a..9ac37d1ca 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/SpringDocApp13Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/SpringDocApp13Test.kt @@ -28,6 +28,6 @@ class SpringDocApp13Test : AbstractKotlinSpringDocMVCTest() { @SpringBootApplication class DemoApplication { } - + } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/TestController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/TestController.kt index 054b141b9..f128b053d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/TestController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/TestController.kt @@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.RestController @Schema(description = "Generic description") data class KeyValue( - val key: String, - val value: String, + val key: String, + val value: String, ) @Schema @@ -38,13 +38,12 @@ data class SomeDTO( ) - @RestController @RequestMapping("/test") class TestController { - @PostMapping("/test") - fun create(@RequestBody some: SomeDTO) { + @PostMapping("/test") + fun create(@RequestBody some: SomeDTO) { - } + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app14/TestController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app14/TestController.kt index feb0099a9..1058cb21a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app14/TestController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app14/TestController.kt @@ -32,8 +32,14 @@ data class KeyValue( @Schema data class SomeDTO( - @Schema(description = "Description A", allOf = [KeyValue::class]) val field_a: KeyValue, - @Schema(description = "Description B", allOf = [KeyValue::class]) val field_b: KeyValue, + @Schema( + description = "Description A", + allOf = [KeyValue::class] + ) val field_a: KeyValue, + @Schema( + description = "Description B", + allOf = [KeyValue::class] + ) val field_b: KeyValue, ) @RestController diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app15/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app15/DemoController.kt new file mode 100644 index 000000000..90b6a9a25 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app15/DemoController.kt @@ -0,0 +1,50 @@ +package test.org.springdoc.api.v31.app15 + +import io.swagger.v3.oas.annotations.media.Schema +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/api/demo") +class DocumentsApiController { + + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) +} + +data class DemoDto( + var id: Long, +) + +/** +field following test cases: +``` +| case required | 11true | 10true | 01false | 00false | N1false | N0true | +| :-------------------- | :----- | :----- | :------ | :------ | :----- | :------ | +| schema required value | true | true | false | false | none | none | +| field nullable | true | false | true | false | true | false | +``` + */ +class DemoRequest( + + @field:Schema(required = true) + val field11true: String?, + + @field:Schema(required = true) + val field10true: String, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field01false: String?, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field00false: String, + + @field:Schema + val fieldN1false: String?, + + @field:Schema + val fieldN0true: String, +) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app15/SpringDocApp15Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app15/SpringDocApp15Test.kt new file mode 100644 index 000000000..1459f93d7 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app15/SpringDocApp15Test.kt @@ -0,0 +1,9 @@ +package test.org.springdoc.api.v31.app15 + +import org.springframework.boot.autoconfigure.SpringBootApplication +import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest + +class SpringDocApp15Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app16/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app16/DemoController.kt new file mode 100644 index 000000000..e3759add4 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app16/DemoController.kt @@ -0,0 +1,50 @@ +package test.org.springdoc.api.v31.app16 + +import io.swagger.v3.oas.annotations.media.Schema +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/api/demo") +class DocumentsApiController { + + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) +} + +data class DemoDto( + var id: Long, +) + +/** +field following test cases: +``` +| case required | 11true | 10true | 01false | 00false | N1false | N0true | +| :-------------------- | :----- | :----- | :------ | :------ | :----- | :------ | +| schema required value | true | true | false | false | none | none | +| field nullable | true | false | true | false | true | false | +``` + */ +class DemoRequest( + + @field:Schema(required = true) + val field11true: String?, + + @field:Schema(required = true) + val field10true: String, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field01false: String?, + + @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) + val field00false: String, + + @field:Schema + val fieldN1false: String?, + + @field:Schema + val fieldN0true: String, +) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app16/SpringDocApp16Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app16/SpringDocApp16Test.kt new file mode 100644 index 000000000..62b8a076d --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app16/SpringDocApp16Test.kt @@ -0,0 +1,12 @@ +package test.org.springdoc.api.v31.app16 + +import org.springdoc.core.utils.Constants.SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.test.context.TestPropertySource +import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest + +@TestPropertySource(properties = ["$SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT=true"]) +class SpringDocApp16Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app17/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app17/DemoController.kt new file mode 100644 index 000000000..0da0747a0 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app17/DemoController.kt @@ -0,0 +1,58 @@ +package test.org.springdoc.api.v31.app17 + +import io.swagger.v3.oas.annotations.media.ArraySchema +import io.swagger.v3.oas.annotations.media.Schema +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotEmpty +import jakarta.validation.constraints.Size +import org.springframework.validation.annotation.Validated +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@Validated +@RestController +@RequestMapping("/api/demo") +class DocumentsApiController { + + @Valid + @GetMapping + suspend fun validOverrideAndOrder( + @Valid request: ChildBar + ): DemoDto = DemoDto(42) +} + +data class DemoDto( + var id: Long, +) + +@Schema(description = "ParentFoo Request") +open class ParentFoo( + @field:NotEmpty // use flat-param-object. to remove or merge annotations by use DelegatingMethodParameterCustomizer + @field:Size(min = 10, max = 20) + @field:ArraySchema(schema = Schema(description = "wrong: list[minItems = 10, maxItems = 20] wrong: string[minLength = 30, maxLength = 40]")) + open var fooList: List<@Size(min = 30, max = 40) String> = listOf() +) + +@Schema(description = "ChildBar Request") +data class ChildBar( + @field:Size(min = 11, max = 21) // should override parent + @field:ArraySchema(schema = Schema(description = "expect: list[minItems = 11, maxItems = 21] expect: string[minLength = 31, maxLength = 41]")) + override var fooList: List<@Size(min = 31, max = 41) String>, + + @field:Size(min = 12, max = 22) // genericType should work + @field:ArraySchema(schema = Schema(description = "expect: list[minItems = 12, maxItems = 22] expect: string[minLength = 32, maxLength = 42]")) + var barList: List<@Size(min = 32, max = 42) String> = listOf(), + + @field:DecimalMin("1") // will be override by min + @field:Min(2) + @field:Schema(description = "expect: minimum = 2") + var validOrder1: Long, + + @field:Min(2) // will be override by DecimalMin + @field:DecimalMin("1") + @field:Schema(description = "expect: minimum = 1") + var validOrder2: Long, +) : ParentFoo() diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app17/SpringDocApp17Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app17/SpringDocApp17Test.kt new file mode 100644 index 000000000..3af522ec7 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app17/SpringDocApp17Test.kt @@ -0,0 +1,51 @@ +package test.org.springdoc.api.v31.app17 + +import jakarta.validation.constraints.NotEmpty +import org.junit.jupiter.api.Assertions +import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer +import org.springdoc.core.extractor.DelegatingMethodParameter +import org.springdoc.core.utils.Constants.SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.context.annotation.Bean +import org.springframework.core.MethodParameter +import org.springframework.test.context.TestPropertySource +import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest + +@TestPropertySource(properties = ["$SPRINGDOC_DEFAULT_FLAT_PARAM_OBJECT=true"]) +class SpringDocApp17Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication { + + @Bean + fun optionalKotlinDelegatingMethodParameterCustomizer(): DelegatingMethodParameterCustomizer { + return object : DelegatingMethodParameterCustomizer { + override fun customizeList( + originalParameter: MethodParameter, + methodParameters: MutableList + ) { + val fieldNameSet = mutableSetOf() + methodParameters.forEachIndexed { index, it -> + if (it is DelegatingMethodParameter && it.isParameterObject && it.field != null) { + val field = it.field!! + if (fieldNameSet.contains(field.name)) { + val fieldAnnotations = field.annotations + Assertions.assertTrue(fieldAnnotations.any { it is NotEmpty }) + // remove parent field + methodParameters.removeAt(index) + } else fieldNameSet.add(field.name) + } + } + if (methodParameters.size > 1) { + methodParameters.sortBy { it.parameterIndex } + } + } + + override fun customize( + originalParameter: MethodParameter, + methodParameter: MethodParameter + ) { + } + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app18/HelloController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app18/HelloController.kt new file mode 100644 index 000000000..5f713bdad --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app18/HelloController.kt @@ -0,0 +1,41 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.api.v31.app18 + +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import java.util.* + + +@JvmInline +value class CarId(val value: UUID) + +data class CarIdsDTO( + val singleId: CarId, + val ids: List +) + +@RestController +@RequestMapping("/test") +class HelloController { + @GetMapping + suspend fun index(s: CarIdsDTO) = s + +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app18/SpringDocApp18Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app18/SpringDocApp18Test.kt new file mode 100644 index 000000000..5219dcae9 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app18/SpringDocApp18Test.kt @@ -0,0 +1,32 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.api.v31.app18 + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.test.context.TestPropertySource +import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest + +@TestPropertySource(properties = ["springdoc.api-docs.version=openapi_3_1"]) +class SpringDocApp18Test : AbstractKotlinSpringDocMVCTest() { + + @SpringBootApplication + class DemoApplication { + } + +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app19/SpringDocApp19Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app19/SpringDocApp19Test.kt new file mode 100644 index 000000000..5eb9f83a0 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app19/SpringDocApp19Test.kt @@ -0,0 +1,57 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.api.v31.app19 + +import io.swagger.v3.oas.annotations.Parameter +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.Size +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController +import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest + + +class SpringDocApp19Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication +} + +@RestController +@RequestMapping +class HelloController { + + @PostMapping("euroMillions") + fun euroMillions( + @Parameter(description = "the numbers") + @RequestParam + @Size(min = 5, max = 5) + numbers: List<@Max(50) @Min(1) Int>, + + @Parameter(description = "the stars") + @RequestParam + @Size(min = 2, max = 2) + stars: List<@Max(12) @Min(1) Int> + ): ResponseEntity { + return ResponseEntity.ok("ok") + } +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app2/SpringDocApp2Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app2/SpringDocApp2Test.kt index a3ab6df6b..0c7bb099d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app2/SpringDocApp2Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app2/SpringDocApp2Test.kt @@ -23,7 +23,7 @@ import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest class SpringDocApp2Test : AbstractKotlinSpringDocMVCTest() { - @SpringBootApplication - class DemoApplication + @SpringBootApplication + class DemoApplication } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app20/SpringDocApp20Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app20/SpringDocApp20Test.kt new file mode 100644 index 000000000..0b05c7c62 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app20/SpringDocApp20Test.kt @@ -0,0 +1,68 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.api.v31.app20 + +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.media.Schema +import jakarta.validation.Valid +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import org.springdoc.core.annotations.ParameterObject +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController +import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest + + +class SpringDocApp20Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication +} +@RestController("/") +class FooController { + + @GetMapping("/foo") + fun getFoo(@Valid fooParameters: FooParameters): String { + return "Ok" + } +} + +@ParameterObject +data class FooParameters( + @RequestParam(name = "bar", required = false, defaultValue = DEFAULT_BAR.toString()) + @field:Parameter(schema = Schema( + minimum = "1", + type = "integer", + defaultValue = DEFAULT_BAR.toString() + ) + ) + @field:Min(1) + val bar: Int = DEFAULT_BAR, + @RequestParam(name = "baz", required = false, defaultValue = DEFAULT_BAZ.toString()) + @field:Parameter(schema = Schema(minimum = "1", maximum = "200", type = "integer", defaultValue = DEFAULT_BAZ.toString())) + @field:Min(1) + @field:Max(200) + val baz: Int = DEFAULT_BAZ +) { + companion object { + const val DEFAULT_BAR = 1 + const val DEFAULT_BAZ = 20 + } +} \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app21/SpringDocApp21Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app21/SpringDocApp21Test.kt new file mode 100644 index 000000000..cb5ae006b --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app21/SpringDocApp21Test.kt @@ -0,0 +1,73 @@ +/* + * + * * Copyright 2019-2020 the original author or authors. + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * https://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package test.org.springdoc.api.v31.app21 + +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.enums.Explode +import io.swagger.v3.oas.annotations.media.ArraySchema +import io.swagger.v3.oas.annotations.media.Schema +import jakarta.validation.Valid +import org.springdoc.core.annotations.ParameterObject +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RestController +import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest + +class SpringDocApp21Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication +} + + +@RestController +class HelloController { + @GetMapping("/hello") + fun hello(@Valid baseSearchParameters: BaseSearchParameters) = + ResponseEntity.ok("Hello, World!") +} + +@ParameterObject +data class BaseSearchParameters( + val filters: Filters = Filters() +) + +@ParameterObject +data class Filters( + @field:Parameter( + description = "Description .", + explode = Explode.FALSE, + array = ArraySchema(schema = Schema(type = "string")) + ) + var brand: Set = emptySet(), + + @field:Parameter( + description = "Description ..", + explode = Explode.FALSE, + array = ArraySchema(schema = Schema(type = "string")) + ) + var service: Set = emptySet(), + + @field:Parameter( + description = "Description ...", + explode = Explode.FALSE, + array = ArraySchema(schema = Schema(type = "string")) + ) + var productGroup: Set = emptySet(), +) \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app5/ListController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app5/ListController.kt index a3eb0eebb..40426e577 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app5/ListController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app5/ListController.kt @@ -26,6 +26,6 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/test") class ListController { - @GetMapping("/") - fun foo(): List = listOf(1, 2, 3) + @GetMapping("/") + fun foo(): List = listOf(1, 2, 3) } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt index 7675ccc3f..964ef4139 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt index 908d27eb6..cd0328e72 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt @@ -29,7 +29,7 @@ class SpringDocApp7Test : AbstractKotlinSpringDocMVCTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v31.app7"]) - class DemoApplication{ + class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt index 6d78841cd..ab1a5403a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/ExampleController.kt @@ -9,8 +9,8 @@ data class Greeting(val greeting: String) @RestController interface ExampleController { - @GetMapping("/") - fun greet(@RequestParam name: String?): Greeting + @GetMapping("/") + fun greet(@RequestParam name: String?): Greeting @GetMapping("/test") fun test(@RequestParam @Parameter(required = true) name: String?): Greeting diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt index e1f7fd977..62142fed4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt @@ -27,12 +27,12 @@ import org.springframework.context.support.GenericApplicationContext import org.springframework.test.context.TestPropertySource import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest -@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED+"=false"]) +@TestPropertySource(properties = [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED + "=false"]) class SpringDocApp8Test : AbstractKotlinSpringDocMVCTest() { @SpringBootApplication @ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.v31.app8"]) - class DemoApplication{ + class DemoApplication { @Bean fun controller(applicationContext: GenericApplicationContext): ExampleController { return createProxy(ExampleController::class.java) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt index 89de59a98..36bc4cc33 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/DemoController.kt @@ -9,16 +9,17 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/api/demo") class DocumentsApiController { - @GetMapping - suspend fun getDocuments( request: DemoRequest - ): DemoDto = DemoDto(42) + @GetMapping + suspend fun getDocuments( + request: DemoRequest + ): DemoDto = DemoDto(42) } data class DemoDto( - var id: Long, + var id: Long, ) -class DemoRequest ( +class DemoRequest( @field:Schema(required = true, defaultValue = "a default value") val requiredNullableDefault: String?, @@ -32,25 +33,37 @@ class DemoRequest ( @field:Schema(required = true) val requiredNoNullableNoDefault: String, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNullableDefault1: String?, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNullableNoDefault1: String?, - @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.REQUIRED, + defaultValue = "a default value" + ) val requiredNoNullableDefault1: String, @field:Schema(requiredMode = Schema.RequiredMode.REQUIRED) val requiredNoNullableNoDefault1: String, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNullableDefault2: String?, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) val noRequiredNullableNoDefault2: String?, - @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, defaultValue = "a default value") + @field:Schema( + requiredMode = Schema.RequiredMode.NOT_REQUIRED, + defaultValue = "a default value" + ) val noRequiredNoNullableDefault2: String, @field:Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED) @@ -68,4 +81,4 @@ class DemoRequest ( @field:Schema val noRequiredNoNullableNoDefault: String, -) + ) diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/SpringDocApp9Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/SpringDocApp9Test.kt index 7c2a4b0fe..aa70fdfa5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/SpringDocApp9Test.kt +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/SpringDocApp9Test.kt @@ -3,7 +3,7 @@ package test.org.springdoc.api.v31.app9 import org.springframework.boot.autoconfigure.SpringBootApplication import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest -class SpringDocApp9Test: AbstractKotlinSpringDocMVCTest() { - @SpringBootApplication - class DemoApplication +class SpringDocApp9Test : AbstractKotlinSpringDocMVCTest() { + @SpringBootApplication + class DemoApplication } diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app13.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app13.json index 6bf07eb5b..f36b09e4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app13.json +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app13.json @@ -1,52 +1,59 @@ { - "openapi" : "3.1.0", - "info" : { - "title" : "OpenAPI definition", - "version" : "v0" + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" }, - "servers" : [ { - "url" : "http://localhost", - "description" : "Generated server url" - } ], - "paths" : { - "/test/test" : { - "post" : { - "tags" : [ "test-controller" ], - "operationId" : "create", - "requestBody" : { - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/SomeDTO" + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/test/test": { + "post": { + "tags": [ + "test-controller" + ], + "operationId": "create", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SomeDTO" } } }, - "required" : true + "required": true }, - "responses" : { - "200" : { - "description" : "OK" + "responses": { + "200": { + "description": "OK" } } } } }, - "components" : { - "schemas" : { - "KeyValue" : { - "required" : [ "key", "value" ], - "type" : "object", - "description" : "Generic description", - "properties" : { - "key" : { - "type" : "string" + "components": { + "schemas": { + "KeyValue": { + "required": [ + "key", + "value" + ], + "type": "object", + "description": "Generic description", + "properties": { + "key": { + "type": "string" }, - "value" : { - "type" : "string" + "value": { + "type": "string" } } }, - "SomeDTO" : { + "SomeDTO": { "required": [ "fieldA", "fieldB" diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app15.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app15.json new file mode 100644 index 000000000..e2035d0a9 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app15.json @@ -0,0 +1,89 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api/demo": { + "get": { + "tags": [ + "documents-api-controller" + ], + "operationId": "getDocuments", + "parameters": [ + { + "name": "request", + "in": "query", + "required": true, + "schema": { + "$ref": "#/components/schemas/DemoRequest" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/DemoDto" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "DemoRequest": { + "required": [ + "field10true", + "field11true", + "fieldN0true" + ], + "type": "object", + "properties": { + "field11true": { + "type": "string" + }, + "field10true": { + "type": "string" + }, + "field01false": { + "type": "string" + }, + "field00false": { + "type": "string" + }, + "fieldN1false": { + "type": "string" + }, + "fieldN0true": { + "type": "string" + } + } + }, + "DemoDto": { + "required": [ + "id" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + } + } + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app16.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app16.json new file mode 100644 index 000000000..b37922a5e --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app16.json @@ -0,0 +1,101 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api/demo": { + "get": { + "tags": [ + "documents-api-controller" + ], + "operationId": "getDocuments", + "parameters": [ + { + "name": "field11true", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "field10true", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "field01false", + "in": "query", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "field00false", + "in": "query", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "fieldN1false", + "in": "query", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "fieldN0true", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/DemoDto" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "DemoDto": { + "required": [ + "id" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + } + } + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app17.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app17.json new file mode 100644 index 000000000..214a5e5b1 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.0.1/app17.json @@ -0,0 +1,111 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api/demo": { + "get": { + "tags": [ + "documents-api-controller" + ], + "operationId": "validOverrideAndOrder", + "parameters": [ + { + "name": "fooList", + "in": "query", + "required": true, + "schema": { + "maxItems": 21, + "minItems": 11, + "type": "array", + "items": { + "maxLength": 41, + "minLength": 31, + "type": "string", + "description": "expect: list[minItems = 11, maxItems = 21] expect: string[minLength = 31, maxLength = 41]" + } + } + }, + { + "name": "barList", + "in": "query", + "required": false, + "schema": { + "maxItems": 22, + "minItems": 12, + "type": "array", + "items": { + "maxLength": 42, + "minLength": 32, + "type": "string", + "description": "expect: list[minItems = 12, maxItems = 22] expect: string[minLength = 32, maxLength = 42]" + } + } + }, + { + "name": "validOrder1", + "in": "query", + "description": "expect: minimum = 2", + "required": true, + "schema": { + "minimum": 2, + "exclusiveMinimum": false, + "type": "integer", + "description": "expect: minimum = 2", + "format": "int64" + } + }, + { + "name": "validOrder2", + "in": "query", + "description": "expect: minimum = 1", + "required": true, + "schema": { + "minimum": 1.0, + "exclusiveMinimum": false, + "type": "integer", + "description": "expect: minimum = 1", + "format": "int64" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/DemoDto" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "DemoDto": { + "required": [ + "id" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + } + } + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app13.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app13.json index 6bf07eb5b..f36b09e4d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app13.json +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app13.json @@ -1,52 +1,59 @@ { - "openapi" : "3.1.0", - "info" : { - "title" : "OpenAPI definition", - "version" : "v0" + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" }, - "servers" : [ { - "url" : "http://localhost", - "description" : "Generated server url" - } ], - "paths" : { - "/test/test" : { - "post" : { - "tags" : [ "test-controller" ], - "operationId" : "create", - "requestBody" : { - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/SomeDTO" + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/test/test": { + "post": { + "tags": [ + "test-controller" + ], + "operationId": "create", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SomeDTO" } } }, - "required" : true + "required": true }, - "responses" : { - "200" : { - "description" : "OK" + "responses": { + "200": { + "description": "OK" } } } } }, - "components" : { - "schemas" : { - "KeyValue" : { - "required" : [ "key", "value" ], - "type" : "object", - "description" : "Generic description", - "properties" : { - "key" : { - "type" : "string" + "components": { + "schemas": { + "KeyValue": { + "required": [ + "key", + "value" + ], + "type": "object", + "description": "Generic description", + "properties": { + "key": { + "type": "string" }, - "value" : { - "type" : "string" + "value": { + "type": "string" } } }, - "SomeDTO" : { + "SomeDTO": { "required": [ "fieldA", "fieldB" diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app15.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app15.json new file mode 100644 index 000000000..84fea23c2 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app15.json @@ -0,0 +1,89 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api/demo": { + "get": { + "tags": [ + "documents-api-controller" + ], + "operationId": "getDocuments", + "parameters": [ + { + "name": "request", + "in": "query", + "required": true, + "schema": { + "$ref": "#/components/schemas/DemoRequest" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/DemoDto" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "DemoRequest": { + "type": "object", + "properties": { + "field11true": { + "type": "string" + }, + "field10true": { + "type": "string" + }, + "field01false": { + "type": "string" + }, + "field00false": { + "type": "string" + }, + "fieldN1false": { + "type": "string" + }, + "fieldN0true": { + "type": "string" + } + }, + "required": [ + "field10true", + "field11true", + "fieldN0true" + ] + }, + "DemoDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + } + }, + "required": [ + "id" + ] + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app16.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app16.json new file mode 100644 index 000000000..e8bfb168d --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app16.json @@ -0,0 +1,101 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api/demo": { + "get": { + "tags": [ + "documents-api-controller" + ], + "operationId": "getDocuments", + "parameters": [ + { + "name": "field11true", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "field10true", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "field01false", + "in": "query", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "field00false", + "in": "query", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "fieldN1false", + "in": "query", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "fieldN0true", + "in": "query", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/DemoDto" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "DemoDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + } + }, + "required": [ + "id" + ] + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app17.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app17.json new file mode 100644 index 000000000..a77997d72 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app17.json @@ -0,0 +1,109 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/api/demo": { + "get": { + "tags": [ + "documents-api-controller" + ], + "operationId": "validOverrideAndOrder", + "parameters": [ + { + "name": "fooList", + "in": "query", + "required": true, + "schema": { + "type": "array", + "items": { + "type": "string", + "description": "expect: list[minItems = 11, maxItems = 21] expect: string[minLength = 31, maxLength = 41]", + "maxLength": 41, + "minLength": 31 + }, + "maxItems": 21, + "minItems": 11 + } + }, + { + "name": "barList", + "in": "query", + "required": false, + "schema": { + "type": "array", + "items": { + "type": "string", + "description": "expect: list[minItems = 12, maxItems = 22] expect: string[minLength = 32, maxLength = 42]", + "maxLength": 42, + "minLength": 32 + }, + "maxItems": 22, + "minItems": 12 + } + }, + { + "name": "validOrder1", + "in": "query", + "description": "expect: minimum = 2", + "required": true, + "schema": { + "type": "integer", + "format": "int64", + "description": "expect: minimum = 2", + "minimum": 2 + } + }, + { + "name": "validOrder2", + "in": "query", + "description": "expect: minimum = 1", + "required": true, + "schema": { + "type": "integer", + "format": "int64", + "description": "expect: minimum = 1", + "minimum": 1.0 + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/DemoDto" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "DemoDto": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + } + }, + "required": [ + "id" + ] + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app18.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app18.json new file mode 100644 index 000000000..7541112a1 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app18.json @@ -0,0 +1,69 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/test": { + "get": { + "tags": [ + "hello-controller" + ], + "operationId": "index", + "parameters": [ + { + "name": "s", + "in": "query", + "required": true, + "schema": { + "$ref": "#/components/schemas/CarIdsDTO" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/CarIdsDTO" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "CarIdsDTO": { + "type": "object", + "properties": { + "singleId": { + "type": "string", + "format": "uuid" + }, + "ids": { + "type": "array", + "items": { + "type": "string", + "format": "uuid" + } + } + }, + "required": [ + "ids", + "singleId" + ] + } + } + } +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app19.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app19.json new file mode 100644 index 000000000..3b6d85058 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app19.json @@ -0,0 +1,72 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/euroMillions": { + "post": { + "tags": [ + "hello-controller" + ], + "operationId": "euroMillions", + "parameters": [ + { + "name": "numbers", + "in": "query", + "description": "the numbers", + "required": true, + "schema": { + "type": "array", + "items": { + "type": "integer", + "format": "int32", + "maximum": 50, + "minimum": 1 + }, + "maxItems": 5, + "minItems": 5 + } + }, + { + "name": "stars", + "in": "query", + "description": "the stars", + "required": true, + "schema": { + "type": "array", + "items": { + "type": "integer", + "format": "int32", + "maximum": 12, + "minimum": 1 + }, + "maxItems": 2, + "minItems": 2 + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + } + }, + "components": {} +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app20.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app20.json new file mode 100644 index 000000000..a9bc1f5a4 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app20.json @@ -0,0 +1,59 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/foo": { + "get": { + "tags": [ + "foo-controller" + ], + "operationId": "getFoo", + "parameters": [ + { + "name": "bar", + "in": "query", + "required": false, + "schema": { + "type": "integer", + "default": 1, + "minimum": 1 + } + }, + { + "name": "baz", + "in": "query", + "required": false, + "schema": { + "type": "integer", + "default": 20, + "maximum": 200, + "minimum": 1 + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + } + }, + "components": {} +} diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app21.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app21.json new file mode 100644 index 000000000..eaf4954b4 --- /dev/null +++ b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app21.json @@ -0,0 +1,77 @@ +{ + "openapi": "3.1.0", + "info": { + "title": "OpenAPI definition", + "version": "v0" + }, + "servers": [ + { + "url": "http://localhost", + "description": "Generated server url" + } + ], + "paths": { + "/hello": { + "get": { + "tags": [ + "hello-controller" + ], + "operationId": "hello", + "parameters": [ + { + "name": "filters.brand", + "in": "query", + "description": "Description .", + "required": false, + "explode": false, + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + }, + { + "name": "filters.service", + "in": "query", + "description": "Description ..", + "required": false, + "explode": false, + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + }, + { + "name": "filters.productGroup", + "in": "query", + "description": "Description ...", + "required": false, + "explode": false, + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "type": "string" + } + } + } + } + } + } + } + }, + "components": {} +} diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/pom.xml b/springdoc-openapi-tests/springdoc-openapi-security-tests/pom.xml index 30183265d..76c6e9ba3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/pom.xml +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/pom.xml @@ -3,13 +3,17 @@ org.springdoc springdoc-openapi-tests - 2.8.5 + 2.8.13 springdoc-openapi-security-tests - - 2.1 - + ${project.artifactId} + + org.springdoc + springdoc-openapi-starter-webmvc-api + ${project.version} + test + org.springframework.security spring-security-web @@ -30,12 +34,6 @@ jakarta.servlet-api test - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${project.version} - test - io.jsonwebtoken jjwt @@ -47,4 +45,4 @@ test - \ No newline at end of file + diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java index e3aeff89b..864da38b3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30; @@ -54,7 +54,7 @@ @ActiveProfiles("test") @SpringBootTest @AutoConfigureMockMvc -@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0" ) +@TestPropertySource(properties = "springdoc.api-docs.version=openapi_3_0") public abstract class AbstractSpringDocTest { public static String className; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java index 9096ddb8f..cf0c64828 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -54,5 +54,5 @@ public String personsWithUser(@RequestBody() Person person, @AuthenticationPrincipal User user) { return "OK"; } - + } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/Person.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/Person.java index 694a8c714..ff7ec9745 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java index 3e89b712d..c904cd87c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app1; @@ -36,7 +36,7 @@ public class SpringDocApp1Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration","test.org.springdoc.api.v30.app1" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration", "test.org.springdoc.api.v30.app1" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/AuthorizationServerConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/AuthorizationServerConfig.java index c7ac5fb32..103c585e0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/AuthorizationServerConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/AuthorizationServerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -53,52 +53,46 @@ * @since 8.0.0 */ @Configuration -public class AuthorizationServerConfig -{ - @Bean - public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception - { - OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http); - return http.build(); - } +public class AuthorizationServerConfig { + @Bean + public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception { + OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http); + return http.build(); + } - @Bean - public RegisteredClientRepository registeredClientRepository() { - RegisteredClient registeredClient = RegisteredClient.withId(UUID.randomUUID().toString()) - .clientId("messaging-client") - .clientSecret("{noop}secret") - .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS) - .scope("message.read") - .scope("message.write") - .clientSettings(ClientSettings.builder().requireAuthorizationConsent(true).build()) - .build(); + @Bean + public RegisteredClientRepository registeredClientRepository() { + RegisteredClient registeredClient = RegisteredClient.withId(UUID.randomUUID().toString()) + .clientId("messaging-client") + .clientSecret("{noop}secret") + .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS) + .scope("message.read") + .scope("message.write") + .clientSettings(ClientSettings.builder().requireAuthorizationConsent(true).build()) + .build(); - return new InMemoryRegisteredClientRepository(registeredClient); - } + return new InMemoryRegisteredClientRepository(registeredClient); + } - @Bean - public OAuth2AuthorizationService authorizationService() - { - return new InMemoryOAuth2AuthorizationService(); - } + @Bean + public OAuth2AuthorizationService authorizationService() { + return new InMemoryOAuth2AuthorizationService(); + } - @Bean - public AuthorizationServerSettings authorizationServerSettings() - { - return AuthorizationServerSettings.builder().build(); - } + @Bean + public AuthorizationServerSettings authorizationServerSettings() { + return AuthorizationServerSettings.builder().build(); + } - @Bean - public JWKSource jwkSource() - { - RSAKey rsaKey = Jwks.generateRsa(); - JWKSet jwkSet = new JWKSet(rsaKey); - return (jwkSelector, securityContext) -> jwkSelector.select(jwkSet); - } + @Bean + public JWKSource jwkSource() { + RSAKey rsaKey = Jwks.generateRsa(); + JWKSet jwkSet = new JWKSet(rsaKey); + return (jwkSelector, securityContext) -> jwkSelector.select(jwkSet); + } - @Bean - public JwtDecoder jwtDecoder(JWKSource jwkSource) - { - return OAuth2AuthorizationServerConfiguration.jwtDecoder(jwkSource); - } + @Bean + public JwtDecoder jwtDecoder(JWKSource jwkSource) { + return OAuth2AuthorizationServerConfiguration.jwtDecoder(jwkSource); + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java index 6b33a3987..ffab9e01c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -36,11 +36,9 @@ */ @RestController @RequestMapping("/api") -public class HelloController -{ - @GetMapping("/hello") - public String hello() - { - return "Hello"; - } +public class HelloController { + @GetMapping("/hello") + public String hello() { + return "Hello"; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/Jwks.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/Jwks.java index 9c50c0699..4cb7a67fa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/Jwks.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/Jwks.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -38,21 +38,18 @@ * @author Joe Grandja * @since 0.1.0 */ -public final class Jwks -{ - private Jwks() - { - //final class constructor should be hidden - } +public final class Jwks { + private Jwks() { + //final class constructor should be hidden + } - public static RSAKey generateRsa() - { - KeyPair keyPair = KeyGeneratorUtils.generateRsaKey(); - RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); - RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); - return new RSAKey.Builder(publicKey) - .privateKey(privateKey) - .keyID(UUID.randomUUID().toString()) - .build(); - } + public static RSAKey generateRsa() { + KeyPair keyPair = KeyGeneratorUtils.generateRsaKey(); + RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); + RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); + return new RSAKey.Builder(publicKey) + .privateKey(privateKey) + .keyID(UUID.randomUUID().toString()) + .build(); + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/KeyGeneratorUtils.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/KeyGeneratorUtils.java index 83124d90a..82b62b299 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/KeyGeneratorUtils.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/KeyGeneratorUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -32,23 +32,21 @@ * @author Joe Grandja * @since 0.1.0 */ -public final class KeyGeneratorUtils -{ - private KeyGeneratorUtils() - { - //final class constructor should be hidden - } +public final class KeyGeneratorUtils { + private KeyGeneratorUtils() { + //final class constructor should be hidden + } - static KeyPair generateRsaKey() - { - KeyPair keyPair; - try { - KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); - keyPairGenerator.initialize(2048); - keyPair = keyPairGenerator.generateKeyPair(); - } catch (Exception ex) { - throw new IllegalStateException(ex); - } - return keyPair; - } + static KeyPair generateRsaKey() { + KeyPair keyPair; + try { + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(2048); + keyPair = keyPairGenerator.generateKeyPair(); + } + catch (Exception ex) { + throw new IllegalStateException(ex); + } + return keyPair; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java index ad08803bf..146ed33cf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app10; @@ -38,7 +38,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = {"springdoc.show-oauth2-endpoints=true", "springdoc.model-converters.deprecating-converter.enabled=false"}) +@TestPropertySource(properties = { "springdoc.show-oauth2-endpoints=true", "springdoc.model-converters.deprecating-converter.enabled=false" }) public class SpringDocApp10Test extends AbstractSpringDocTest { @BeforeAll diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/AuthorizationServerConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/AuthorizationServerConfig.java index ef3730e91..56c259d5a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/AuthorizationServerConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/AuthorizationServerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java index b1559a1d0..896e2c534 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/Jwks.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/Jwks.java index 0cc9d0e89..ab8312634 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/Jwks.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/Jwks.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/KeyGeneratorUtils.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/KeyGeneratorUtils.java index b613fbfb6..275a0b0fd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/KeyGeneratorUtils.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/KeyGeneratorUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java index de390071c..1299283d6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app11/SpringDocApp11Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/AuthorizationServerConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/AuthorizationServerConfig.java index aceb45ead..ca2578d66 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/AuthorizationServerConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/AuthorizationServerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java index 5eb93d79a..864d5c131 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/Jwks.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/Jwks.java index dec189f66..4155ca250 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/Jwks.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/Jwks.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/KeyGeneratorUtils.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/KeyGeneratorUtils.java index fd1206b08..9fc1e37aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/KeyGeneratorUtils.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/KeyGeneratorUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java index f01d3c04d..284896beb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app12/SpringDocApp12Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java index 78c639903..a928c73ef 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java index d7cf6a89b..5f983b10d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; @@ -36,7 +36,7 @@ public class SpringDocApp2Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration","test.org.springdoc.api.v30.app2" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration", "test.org.springdoc.api.v30.app2" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/User.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/User.java index aa1791a85..cdf8774f3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app2/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringOauth2Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringOauth2Test.java index 4a116c17e..06ae4c9c5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringOauth2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app3/SpringOauth2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java index a3afb7279..9bf327ae6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/Sample.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/Sample.java index fd1ef00ed..4a6d111aa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/Sample.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/Sample.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java index 115650f46..df2486c2c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app5; @@ -32,7 +32,7 @@ public class SpringDocApp5Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration","test.org.springdoc.api.v30.app5" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration", "test.org.springdoc.api.v30.app5" }) static class SpringDocTestApp {} } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java index f64b64c1a..b5ff12cf1 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; @@ -36,7 +36,7 @@ @TestPropertySource(properties = "springdoc.show-login-endpoint=true") public class SpringDocApp6Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration","test.org.springdoc.api.v30.app6" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration", "test.org.springdoc.api.v30.app6" }) static class SpringDocTestApp { @Bean MyUserDetailsService userDetailsService() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocConfig.java index 376d6bb0f..cff39cf7a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/SpringDocConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/controllers/MyController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/controllers/MyController.java index 5082f3c9b..7bc225b81 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/controllers/MyController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/controllers/MyController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6.controllers; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthenticationFilter.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthenticationFilter.java index 3ecb3625b..22fb1a326 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthenticationFilter.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthenticationFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6.security; @@ -47,6 +47,8 @@ import org.springframework.security.core.userdetails.User; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson; + public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilter { @@ -72,10 +74,7 @@ public JWTAuthenticationFilter(AuthenticationManager authenticationManager, long public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse res) throws AuthenticationException { try { - - UserCredentials credentials = - new ObjectMapper().readValue(req.getInputStream(), UserCredentials.class); - + UserCredentials credentials = cloneViaJson(req.getInputStream(),UserCredentials.class,new ObjectMapper()); return authenticationManager.authenticate( new UsernamePasswordAuthenticationToken(credentials.getUsername(), credentials.getPassword(), new ArrayList<>())); diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthorizationFilter.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthorizationFilter.java index f5dd4bc99..02dca8974 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthorizationFilter.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/JWTAuthorizationFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6.security; @@ -81,7 +81,7 @@ protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, * * @param request the {@link HttpServletRequest} containing a JWS. * @return a {@link UsernamePasswordAuthenticationToken} if the JWS is - * valid, {@code null} otherwise. + * valid, {@code null} otherwise. */ private UsernamePasswordAuthenticationToken getAuthentication(HttpServletRequest request) { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/MyUserDetailsService.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/MyUserDetailsService.java index 10edfafba..4ebfa7c01 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/MyUserDetailsService.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/MyUserDetailsService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6.security; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/WebSecurity.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/WebSecurity.java index f09ea0681..5e9ec33f4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/WebSecurity.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app6/security/WebSecurity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app6.security; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/AnotherPerson.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/AnotherPerson.java index fea638cdb..9530589f0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/AnotherPerson.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/AnotherPerson.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/CurrentUser.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/CurrentUser.java index 190d9d581..e014e179a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/CurrentUser.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/CurrentUser.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java index 36d80bf7a..2af67055b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/Person.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/Person.java index e164d2581..786e86ffb 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java index 89f5c95b8..d3b728b3e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; @@ -36,7 +36,7 @@ public class SpringDocApp7Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration","test.org.springdoc.api.v30.app7" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration", "test.org.springdoc.api.v30.app7" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/TheOtherPerson.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/TheOtherPerson.java index ed4fdf9af..43de14670 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/TheOtherPerson.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app7/TheOtherPerson.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java index 551114ff9..b87a0a143 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8; @@ -38,7 +38,7 @@ @TestPropertySource(properties = "springdoc.show-login-endpoint=true") public class SpringDocApp8Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration","test.org.springdoc.api.v30.app8" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v30.configuration", "test.org.springdoc.api.v30.app8" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/security/WebConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/security/WebConfig.java index e25024268..1ca9d2042 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/security/WebConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app8/security/WebConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app8.security; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java index 9dd8c2478..c902a3304 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; @@ -38,7 +38,7 @@ @TestPropertySource(properties = { "springdoc.show-login-endpoint=true", "springdoc.enable-spring-security=false" }) public class SpringDocApp9Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.v30.app9" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration", "test.org.springdoc.api.v30.app9" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/WebConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/WebConfig.java index 7fcccb97b..a81bf079d 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/WebConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/app9/WebConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/configuration/SecurityConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/configuration/SecurityConfiguration.java index 8766fd19e..80be422c4 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/configuration/SecurityConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v30/configuration/SecurityConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v30.configuration; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java index 7a98bdced..fb966e1dc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/AbstractSpringDocTest.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java index 20af408ac..5ead08b55 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -54,5 +54,5 @@ public String personsWithUser(@RequestBody() Person person, @AuthenticationPrincipal User user) { return "OK"; } - + } \ No newline at end of file diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/Person.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/Person.java index 3899a0646..cbf698814 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java index 594d788df..3f1ec4999 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app1/SpringDocApp1Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app1; @@ -36,7 +36,7 @@ public class SpringDocApp1Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration","test.org.springdoc.api.v31.app1" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration", "test.org.springdoc.api.v31.app1" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/AuthorizationServerConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/AuthorizationServerConfig.java index 91ddca9ec..00abe57bc 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/AuthorizationServerConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/AuthorizationServerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -53,52 +53,46 @@ * @since 8.0.0 */ @Configuration -public class AuthorizationServerConfig -{ - @Bean - public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception - { - OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http); - return http.build(); - } +public class AuthorizationServerConfig { + @Bean + public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception { + OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http); + return http.build(); + } - @Bean - public RegisteredClientRepository registeredClientRepository() { - RegisteredClient registeredClient = RegisteredClient.withId(UUID.randomUUID().toString()) - .clientId("messaging-client") - .clientSecret("{noop}secret") - .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS) - .scope("message.read") - .scope("message.write") - .clientSettings(ClientSettings.builder().requireAuthorizationConsent(true).build()) - .build(); + @Bean + public RegisteredClientRepository registeredClientRepository() { + RegisteredClient registeredClient = RegisteredClient.withId(UUID.randomUUID().toString()) + .clientId("messaging-client") + .clientSecret("{noop}secret") + .authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS) + .scope("message.read") + .scope("message.write") + .clientSettings(ClientSettings.builder().requireAuthorizationConsent(true).build()) + .build(); - return new InMemoryRegisteredClientRepository(registeredClient); - } + return new InMemoryRegisteredClientRepository(registeredClient); + } - @Bean - public OAuth2AuthorizationService authorizationService() - { - return new InMemoryOAuth2AuthorizationService(); - } + @Bean + public OAuth2AuthorizationService authorizationService() { + return new InMemoryOAuth2AuthorizationService(); + } - @Bean - public AuthorizationServerSettings authorizationServerSettings() - { - return AuthorizationServerSettings.builder().build(); - } + @Bean + public AuthorizationServerSettings authorizationServerSettings() { + return AuthorizationServerSettings.builder().build(); + } - @Bean - public JWKSource jwkSource() - { - RSAKey rsaKey = Jwks.generateRsa(); - JWKSet jwkSet = new JWKSet(rsaKey); - return (jwkSelector, securityContext) -> jwkSelector.select(jwkSet); - } + @Bean + public JWKSource jwkSource() { + RSAKey rsaKey = Jwks.generateRsa(); + JWKSet jwkSet = new JWKSet(rsaKey); + return (jwkSelector, securityContext) -> jwkSelector.select(jwkSet); + } - @Bean - public JwtDecoder jwtDecoder(JWKSource jwkSource) - { - return OAuth2AuthorizationServerConfiguration.jwtDecoder(jwkSource); - } + @Bean + public JwtDecoder jwtDecoder(JWKSource jwkSource) { + return OAuth2AuthorizationServerConfiguration.jwtDecoder(jwkSource); + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java index e9230407a..e4aa84908 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -36,11 +36,9 @@ */ @RestController @RequestMapping("/api") -public class HelloController -{ - @GetMapping("/hello") - public String hello() - { - return "Hello"; - } +public class HelloController { + @GetMapping("/hello") + public String hello() { + return "Hello"; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/Jwks.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/Jwks.java index 645258008..ee3352b84 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/Jwks.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/Jwks.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -38,21 +38,18 @@ * @author Joe Grandja * @since 0.1.0 */ -public final class Jwks -{ - private Jwks() - { - //final class constructor should be hidden - } +public final class Jwks { + private Jwks() { + //final class constructor should be hidden + } - public static RSAKey generateRsa() - { - KeyPair keyPair = KeyGeneratorUtils.generateRsaKey(); - RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); - RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); - return new RSAKey.Builder(publicKey) - .privateKey(privateKey) - .keyID(UUID.randomUUID().toString()) - .build(); - } + public static RSAKey generateRsa() { + KeyPair keyPair = KeyGeneratorUtils.generateRsaKey(); + RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); + RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); + return new RSAKey.Builder(publicKey) + .privateKey(privateKey) + .keyID(UUID.randomUUID().toString()) + .build(); + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/KeyGeneratorUtils.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/KeyGeneratorUtils.java index a441df246..f1e081e46 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/KeyGeneratorUtils.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/KeyGeneratorUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -32,23 +32,21 @@ * @author Joe Grandja * @since 0.1.0 */ -public final class KeyGeneratorUtils -{ - private KeyGeneratorUtils() - { - //final class constructor should be hidden - } +public final class KeyGeneratorUtils { + private KeyGeneratorUtils() { + //final class constructor should be hidden + } - static KeyPair generateRsaKey() - { - KeyPair keyPair; - try { - KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); - keyPairGenerator.initialize(2048); - keyPair = keyPairGenerator.generateKeyPair(); - } catch (Exception ex) { - throw new IllegalStateException(ex); - } - return keyPair; - } + static KeyPair generateRsaKey() { + KeyPair keyPair; + try { + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(2048); + keyPair = keyPairGenerator.generateKeyPair(); + } + catch (Exception ex) { + throw new IllegalStateException(ex); + } + return keyPair; + } } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java index 673c19076..90ff4d609 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app10/SpringDocApp10Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app10; @@ -38,7 +38,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.test.context.TestPropertySource; -@TestPropertySource(properties = {"springdoc.show-oauth2-endpoints=true", "springdoc.model-converters.deprecating-converter.enabled=false"}) +@TestPropertySource(properties = { "springdoc.show-oauth2-endpoints=true", "springdoc.model-converters.deprecating-converter.enabled=false" }) public class SpringDocApp10Test extends AbstractSpringDocTest { @BeforeAll diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/AuthorizationServerConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/AuthorizationServerConfig.java index 05d0e4b4a..68325aa54 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/AuthorizationServerConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/AuthorizationServerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java index 07a3cede7..bac9c5efe 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/Jwks.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/Jwks.java index 2ddf16cfc..588a8ca15 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/Jwks.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/Jwks.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/KeyGeneratorUtils.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/KeyGeneratorUtils.java index 1d98681ed..2b1c716ac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/KeyGeneratorUtils.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/KeyGeneratorUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java index ba8a0579b..7405cb42e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app11/SpringDocApp11Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app11; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/AuthorizationServerConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/AuthorizationServerConfig.java index 617ad3f45..d11e1cd6c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/AuthorizationServerConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/AuthorizationServerConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java index 3b09300dd..b9f9e5a8e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/Jwks.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/Jwks.java index 334e71f48..6e49babd6 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/Jwks.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/Jwks.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/KeyGeneratorUtils.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/KeyGeneratorUtils.java index 13e7a8ffe..b8ac87ce2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/KeyGeneratorUtils.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/KeyGeneratorUtils.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java index 1fcc97688..c692e2d3c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app12/SpringDocApp12Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app12; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java index c1d4ab916..81685f220 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java index 131afbc59..289f94616 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/SpringDocApp2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; @@ -36,7 +36,7 @@ public class SpringDocApp2Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration","test.org.springdoc.api.v31.app2" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration", "test.org.springdoc.api.v31.app2" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/User.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/User.java index d6dd32fbc..20afbc3d0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/User.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app2/User.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app2; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringOauth2Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringOauth2Test.java index 3bedbcc55..6df2af4e2 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringOauth2Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app3/SpringOauth2Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app3; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java index 1f1a196f1..71add6d16 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/Sample.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/Sample.java index 172d46177..758e0c14a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/Sample.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/Sample.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java index cb5136ff5..52a037926 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app5/SpringDocApp5Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app5; @@ -32,7 +32,7 @@ public class SpringDocApp5Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration","test.org.springdoc.api.v31.app5" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration", "test.org.springdoc.api.v31.app5" }) static class SpringDocTestApp {} } diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java index 799ba828a..bd021f510 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocApp6Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; @@ -36,7 +36,7 @@ @TestPropertySource(properties = "springdoc.show-login-endpoint=true") public class SpringDocApp6Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration","test.org.springdoc.api.v31.app6" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration", "test.org.springdoc.api.v31.app6" }) static class SpringDocTestApp { @Bean MyUserDetailsService userDetailsService() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocConfig.java index 1988aa243..6c25dcf2b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/SpringDocConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/controllers/MyController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/controllers/MyController.java index ae0e32f33..b124042a0 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/controllers/MyController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/controllers/MyController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6.controllers; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthenticationFilter.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthenticationFilter.java index fb22cbc27..3a013134b 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthenticationFilter.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthenticationFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6.security; @@ -47,6 +47,8 @@ import org.springframework.security.core.userdetails.User; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson; + public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilter { @@ -72,14 +74,10 @@ public JWTAuthenticationFilter(AuthenticationManager authenticationManager, long public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse res) throws AuthenticationException { try { - - UserCredentials credentials = - new ObjectMapper().readValue(req.getInputStream(), UserCredentials.class); - + UserCredentials credentials = cloneViaJson(req.getInputStream(), UserCredentials.class, new ObjectMapper()); return authenticationManager.authenticate( new UsernamePasswordAuthenticationToken(credentials.getUsername(), credentials.getPassword(), new ArrayList<>())); - } catch (IOException e) { throw new InternalAuthenticationServiceException("Error processing credentials", e); diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthorizationFilter.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthorizationFilter.java index 9efe60711..0440f6caa 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthorizationFilter.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/JWTAuthorizationFilter.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6.security; @@ -81,7 +81,7 @@ protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, * * @param request the {@link HttpServletRequest} containing a JWS. * @return a {@link UsernamePasswordAuthenticationToken} if the JWS is - * valid, {@code null} otherwise. + * valid, {@code null} otherwise. */ private UsernamePasswordAuthenticationToken getAuthentication(HttpServletRequest request) { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/MyUserDetailsService.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/MyUserDetailsService.java index 545a77545..2f9c3c434 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/MyUserDetailsService.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/MyUserDetailsService.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6.security; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/WebSecurity.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/WebSecurity.java index 96fac8801..edfe0306c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/WebSecurity.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app6/security/WebSecurity.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app6.security; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/AnotherPerson.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/AnotherPerson.java index a139a74bc..257a6ff3e 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/AnotherPerson.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/AnotherPerson.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/CurrentUser.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/CurrentUser.java index fe9848f24..4cd7dad01 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/CurrentUser.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/CurrentUser.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java index cbb673d1d..3ba83eccd 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/HelloController.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/Person.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/Person.java index 6539276f0..6310a22bf 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/Person.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/Person.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java index 1b2f4cff3..af4438f50 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/SpringDocApp7Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; @@ -36,7 +36,7 @@ public class SpringDocApp7Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration","test.org.springdoc.api.v31.app7" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration", "test.org.springdoc.api.v31.app7" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/TheOtherPerson.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/TheOtherPerson.java index a8c4372d0..88939fee9 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/TheOtherPerson.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app7/TheOtherPerson.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app7; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java index aae8f2b19..fc18fa9ac 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/SpringDocApp8Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8; @@ -38,7 +38,7 @@ @TestPropertySource(properties = "springdoc.show-login-endpoint=true") public class SpringDocApp8Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration","test.org.springdoc.api.v31.app8" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration", "test.org.springdoc.api.v31.app8" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/security/WebConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/security/WebConfig.java index dafe043eb..ff0ff474c 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/security/WebConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app8/security/WebConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app8.security; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java index c8692c60b..4048a9c50 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/SpringDocApp9Test.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; @@ -38,7 +38,7 @@ @TestPropertySource(properties = { "springdoc.show-login-endpoint=true", "springdoc.enable-spring-security=false" }) public class SpringDocApp9Test extends AbstractSpringDocTest { - @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration","test.org.springdoc.api.v31.app9" }) + @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.v31.configuration", "test.org.springdoc.api.v31.app9" }) static class SpringDocTestApp { @Bean public OpenAPI customOpenAPI() { diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/WebConfig.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/WebConfig.java index 0c93146f1..bb5d30d28 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/WebConfig.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/app9/WebConfig.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.app9; diff --git a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/configuration/SecurityConfiguration.java b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/configuration/SecurityConfiguration.java index 24132aaab..c9e98ffa3 100644 --- a/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/configuration/SecurityConfiguration.java +++ b/springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/v31/configuration/SecurityConfiguration.java @@ -21,7 +21,7 @@ * * * * * * * * * - * + * */ package test.org.springdoc.api.v31.configuration;